Changeset: b91eea35a5c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b91eea35a5c9
Modified Files:
.vscode/monetdb-environment.bat
.vscode/run_build.bat
.vscode/run_install.bat
.vscode/settings.json
Branch: configurable_working_set
Log Message:
Small modifications. Doesn't fix the failing tests.
diffs (50 lines):
diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat
--- a/.vscode/monetdb-environment.bat
+++ b/.vscode/monetdb-environment.bat
@@ -22,7 +22,7 @@ set Path=%OPENSSLDIR%\bin;%Path%
set Path=%OPENSSLDIR%\lib;%Path%
rem libXML
-set LIBXML2=C:\libxml2-2.9.3-win32-x86_64
+set LIBXML2=C:\libxml2
set Path=%LIBXML2%\bin;%Path%
set Path=%LIBXML2%\lib;%Path%
@@ -37,7 +37,7 @@ set Path=%LIBBZ2%\bin;%Path%
set Path=%LIBBZ2%\lib;%Path%
rem iconv
-set LIBICONV=C:\iconv-1.14-win32-x86_64
+set LIBICONV=C:\iconv
set Path=%LIBICONV%\bin;%Path%
set Path=%LIBICONV%\lib;%Path%
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 HAVE_LIBBZ2=1 HAVE_MONETDB5=1 HAVE_SQL=1
HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1 HAVE_GEOM=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile"
+nmake -nologo -f ..\NT\Makefile
"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 "prefix=%PREFIX%" HAVE_LIBBZ2=1
HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1
HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install
+nmake -nologo -f ..\NT\Makefile HAVE_LIBXML=1 HAVE_LIBZ=1 HAVE_LIBBZ2=1
HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1
HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install
diff --git a/.vscode/settings.json b/.vscode/settings.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
{
"files.associations": {
"extraMakefile": "makefile",
+ "rules.msc": "makefile",
"configure.ag": "m4",
"Makefile.ag": "automake"
},
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
