Changeset: 608b53ef90b0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=608b53ef90b0
Modified Files:
NT/mksqlwxs.py
Branch: Oct2020
Log Message:
Check for both old and new versions of the geom package.
Before we checked for the geom.mal file, but that doesn't exist
anymore, so now we check for the _geom.dll file. If either file
exists we enable the geom option.
diffs (29 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -88,6 +88,16 @@ def main():
print(r' <FileSearch Id="CheckFile2" Name="gdk.h"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
+ print(r' <Property Id="GEOMMALEXISTS">')
+ print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
+ print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
+ print(r' </DirectorySearch>')
+ print(r' </Property>')
+ print(r' <Property Id="GEOMLIBEXISTS">')
+ print(r' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
+ print(r' <FileSearch Id="CheckFile4" Name="_geom.dll"/>')
+ print(r' </DirectorySearch>')
+ print(r' </Property>')
print(r' <Property Id="PYAPI3EXISTS">')
print(r' <DirectorySearch Id="CheckFileDir5" Path="[INSTALLDIR]"
Depth="0">')
print(r' <FileSearch Id="CheckFile5"
Name="pyapi_locatepython3.bat"/>')
@@ -258,7 +268,7 @@ def main():
print(r' <Feature Id="GeomModule" Level="1000" AllowAdvertise="no"
Absent="allow" Title="Geom Module" Description="The GIS (Geographic Information
System) extension for MonetDB/SQL.">')
for f in geom:
print(r' <ComponentRef Id="{}"/>'.format(f))
- print(r' <Condition Level="1">GEOMEXISTS</Condition>')
+ print(r' <Condition Level="1">GEOMMALEXISTS OR
GEOMLIBEXISTS</Condition>')
print(r' </Feature>')
print(r' </Feature>')
print(r' <UIRef Id="WixUI_Mondo"/>')
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
