Changeset: 07d1a0092a02 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07d1a0092a02 Added Files: .vscode/extraMakefile Modified Files: .vscode/monetdb-environment.bat .vscode/run_build.bat .vscode/run_install.bat Branch: configurable_working_set Log Message:
The build, install and (nearly 100% of the) test tasks are working in Visual Studio Code. diffs (57 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile new file mode 100644 --- /dev/null +++ b/.vscode/extraMakefile @@ -0,0 +1,9 @@ +bits=$(BITS) +LIBICONV=$(LIBICONV) +LIBBZIP2=$(LIBBZIP2) +LIBOPENSSL=$(LIBOPENSSL) +LIBXML2=$(LIBXML2) +LIBPCRE=$(LIBPCRE) +LIBOPENSSL=$(LIBOPENSSL) +LIBZLIB=$(LIBZLIB) +LIBGEOS=$(LIBGEOS) diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -2,7 +2,7 @@ rem Set build variables for monetdb set SOURCE=%USERPROFILE%\Sources\monetdb set BUILD=%SOURCE%\build set PREFIX=%USERPROFILE%\monetdb-installation -set Path=%PREFIX%\bin;%PREFIX%\lib\monetdb;%PREFIX%\lib;%Path% +set Path=%PREFIX%\bin;%PREFIX%\lib;%PREFIX%\lib\monetdb5;%Path% rem Set Windows type. set BITS=64 @@ -74,12 +74,10 @@ set Path=%LIBGEOS%\lib;%Path% rem python3 set PYTHON3=C:\Python36 set Path=%PYTHON3%;%Path% -set PYTHON3_LIBDIR=%PYTHON3%\lib rem python2 set PYTHON2=C:\Python27 set Path=%PYTHON2%;%Path% -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 bits=%BITS% +nmake -nologo -f ..\NT\Makefile prefix=%PREFIX% "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" 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 bits=%BITS% prefix=%PREFIX% install +nmake -nologo -f ..\NT\Makefile prefix=%PREFIX% "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
