Changeset: 478ca659edc9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=478ca659edc9
Modified Files:
NT/mksqlwxs.py
monetdb5/NT/M5server.bat
Branch: Nov2019
Log Message:
Fixes to Windows installer.
Also install geos.dll since that is now needed; create parent
directory of dbfarm.
diffs (32 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -157,7 +157,8 @@ def main():
r'lib\libmonetdb5.pdb',
r'lib\libstream.pdb'])
id = comp(geom, id, 14,
- [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS']])
+ [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS'],
+ r'%s\bin\geos.dll' % makedefs['LIBGEOS']])
print(r' </Directory>')
print(r' <Directory Id="etc" Name="etc">')
id = comp(features, id, 14, [r'etc\.monetdb'])
diff --git a/monetdb5/NT/M5server.bat b/monetdb5/NT/M5server.bat
--- a/monetdb5/NT/M5server.bat
+++ b/monetdb5/NT/M5server.bat
@@ -23,12 +23,14 @@ if "%APPDATA%" == "" goto usevar
rem if the APPDATA variable does exist, put the database there
set MONETDBDIR=%APPDATA%\MonetDB5
set MONETDBFARM="--dbpath=%MONETDBDIR%\dbfarm\demo"
+mkdir "%MONETDBDIR%\dbfarm\demo"
goto skipusevar
:usevar
rem if the APPDATA variable does not exist, put the database in the
rem installation folder (i.e. default location, so no command line argument)
-set MONETDBDIR=%MONETDB%\var\MonetDB5
+set MONETDBDIR=%MONETDB%\var\monetdb5
set MONETDBFARM=
+mkdir "%MONETDB%\var\monetdb5\dbfarm"
:skipusevar
rem the SQL log directory used to be in %MONETDBDIR%, but we now
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
