Changeset: f92a101a32fe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f92a101a32fe Removed Files: .vscode/extraMakefile Modified Files: .vscode/monetdb-environment.bat .vscode/run_build.bat .vscode/run_install.bat .vscode/run_tests.bat Branch: configurable_working_set Log Message:
Migrate last definitions from extraMakefile to environment script and remove it. diffs (102 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile deleted file mode 100644 --- a/.vscode/extraMakefile +++ /dev/null @@ -1,15 +0,0 @@ -bits= $(BITS) -prefix = $(PREFIX) - -LIBICONV=C:\iconv -LIBZLIB=C:\zlib-1.2.11-win64-x86_64 -LIBZLIBFILE=zlib -LIBXML2=C:\libxml2 -LIBBZIP2=C:\bzip2-1.0.6 -LIBOPENSSL=C:\openssl -LIBPCRE=C:\Program Files\PCRE -LIBGEOS=C:\geos-3.4.2 -PYTHON2=C:\Python27 -PYTHON2_LIBDIR=C:\Python27\libs - - diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -36,9 +36,9 @@ set Path=%LIBPCRE%\bin;%Path% set Path=%LIBPCRE%\lib;%Path% rem OpenSSL -set OPENSSLDIR=C:\openssl -set Path=%OPENSSLDIR%\bin;%Path% -set Path=%OPENSSLDIR%\lib;%Path% +set LIBOPENSSL=C:\openssl +set Path=%LIBOPENSSL%\bin;%Path% +set Path=%LIBOPENSSL%\lib;%Path% rem libXML set LIBXML2=C:\libxml2 @@ -49,11 +49,12 @@ rem zlib set LIBZLIB=C:\zlib-1.2.11-win64-x86_64 set Path=%LIBZLIB%\bin;%Path% set Path=%LIBZLIB%\lib;%Path% +set LIBZLIBFILE=zlib rem bzip2 -set LIBBZ2=C:\bzip2-1.0.6 -set Path=%LIBBZ2%\bin;%Path% -set Path=%LIBBZ2%\lib;%Path% +set LIBBZIP2=C:\bzip2-1.0.6 +set Path=%LIBBZIP2%\bin;%Path% +set Path=%LIBBZIP2%\lib;%Path% rem iconv set LIBICONV=C:\iconv @@ -66,9 +67,9 @@ set Path=%PERLDIR%\bin;%Path% set Path=%PERLDIR%\lib;%Path% rem geos -set GEOSDIR=C:\geos-3.4.2 -set Path=%GEOSDIR%\bin;%Path% -set Path=%GEOSDIR%\lib;%Path% +set LIBGEOS=C:\geos-3.4.2 +set Path=%LIBGEOS%\bin;%Path% +set Path=%LIBGEOS%\lib;%Path% rem python3 set PYTHON3=C:\Python36 @@ -78,7 +79,7 @@ set PYTHON3_LIBDIR=%PYTHON3%\lib rem python2 set PYTHON2=C:\Python27 set Path=%PYTHON2%;%Path% -set PYTHON2_LIBDIR=%PYTHON2%\lib +set PYTHON2_LIBDIR=%PYTHON2%\libs rem Python module search path set PYTHONPATH=%PREFIX%\lib\site-packages;%PYTHONPATH% diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat --- a/.vscode/run_build.bat +++ b/.vscode/run_build.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" +nmake -nologo -f ..\NT\Makefile bits=%BITS% diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat --- a/.vscode/run_install.bat +++ b/.vscode/run_install.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install +nmake -nologo -f ..\NT\Makefile bits=%BITS% prefix=%PREFIX% install diff --git a/.vscode/run_tests.bat b/.vscode/run_tests.bat --- a/.vscode/run_tests.bat +++ b/.vscode/run_tests.bat @@ -1,6 +1,4 @@ rem call environment variables for Monetdb compilation and runtime call %~dp0/monetdb-environment.bat -echo %PATH% - Mtest.py -r _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
