Changeset: d67f575acbe7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d67f575acbe7
Added Files:
        .vscode/monetdb-environment.bat
        .vscode/run_build.bat
        .vscode/run_install.bat
        .vscode/run_tests.bat
Modified Files:
        .vscode/tasks.json
Branch: configurable_working_set
Log Message:

"Add Windows specific development scripts and associated VS Code tasks."


diffs (167 lines):

diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/monetdb-environment.bat
@@ -0,0 +1,65 @@
+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;%Path%
+
+rem additional libraries and additional tools
+
+rem Look in Cygwin's bin as a default location for programs, e.g. Bison.
+rem When appropriate, Windows specific packages like the Python distributions 
are given priority over the possible Cygwin alternatives.
+set CYGWIN=C:\cygwin64
+set Path=%CYGWIN%\bin;%Path%
+
+rem PCRE
+set LIBPCRE=%ProgramFiles%\PCRE
+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%
+
+rem libXML
+set LIBXML2=C:\libxml2-2.9.3-win32-x86_64
+set Path=%LIBXML2%\bin;%Path%
+set Path=%LIBXML2%\lib;%Path%
+
+rem zlib
+set LIBZLIB=C:\zlib-1.2.11-win64-x86_64
+set Path=%LIBZLIB%\bin;%Path%
+set Path=%LIBZLIB%\lib;%Path%
+
+rem bzip2
+set LIBBZ2=C:\bzip2-1.0.6
+set Path=%LIBBZ2%\bin;%Path%
+set Path=%LIBBZ2%\lib;%Path%
+
+rem iconv
+set LIBICONV=C:\iconv-1.14-win32-x86_64
+set Path=%LIBICONV%\bin;%Path%
+set Path=%LIBICONV%\lib;%Path%
+
+rem perl
+set PERLDIR=C:\Perl64
+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%
+
+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%\lib
+
+rem Python module search path
+set PYTHONPATH=%PREFIX%\lib\site-packages;%PYTHONPATH%
diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_build.bat
@@ -0,0 +1,9 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+rem Set the environment variables for Visual Studio 2017 native x64.
+call "C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+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"
diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_install.bat
@@ -0,0 +1,9 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+rem Set the environment variables for Visual Studio 2017 native x64.
+call "C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+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
diff --git a/.vscode/run_tests.bat b/.vscode/run_tests.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_tests.bat
@@ -0,0 +1,6 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+echo %PATH%
+
+Mtest.py -r
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,19 +8,20 @@
             "type": "shell",
             "command": "cd ${workspaceFolder} && ./bootstrap && (test -d build 
|| mkdir build) && cd build && ../configure 
--prefix=/home/aris/Installations/default-env --enable-debug --enable-strict 
--disable-optimize",
             "group": "build",
-            "problemMatcher": [],
-            "windows": {
-                "command": ".\\run_bootstrap_and_configure.bat"
-            }
+            "problemMatcher": []
         },
         {
-            "label": "run make",
+            "label": "run build",
             "type": "shell",
             "command": "cd ${workspaceFolder}/build && make -j2",
             "group": {
                 "kind": "build",
                 "isDefault": true
             },
+            "presentation": {
+                "panel": "new"
+
+            },
             "problemMatcher": {
                 "base": "$gcc",
                 "fileLocation": [
@@ -37,8 +38,8 @@
                 }
             },
             "windows": {
-                "command": ".\\run_make.bat"
-            },
+                "command": "${workspaceFolder}\\.vscode\\run_build.bat"
+            }
         },
         {
             "label": "run install",
@@ -46,7 +47,7 @@
             "command": "cd ${workspaceFolder}/build && make -j2 install",
             "group": "test",
             "windows": {
-                "command": ".\\run_install.bat"
+                "command": "${workspaceFolder}\\.vscode\\run_install.bat"
             }
         },
         {
@@ -58,7 +59,7 @@
                 "isDefault": true
             },
             "windows": {
-                "command": ".\\run_test.bat"
+                "command": "${workspaceFolder}\\.vscode\\run_tests.bat"
             }
         }
     ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to