Merge pull request #46 from launchql/16-latest-windows

16 latest windows

Author: pyramation

.gitignore

@@ -4,3 +4,4 @@ libs/
 npm-debug.log
 libpg_query/**/*.a
 libpg_query/**/*.h
+libpg_query/windows/*.lib

binding.gyp

@@ -8,14 +8,6 @@
         "src/sync.cc",
         "src/async.cc"
       ],
-      "actions": [
-        {
-          "outputs": ['libpg_query/include/pg_query.h'],
-          "inputs": [],
-          "action": ['script/buildAddon.sh'],
-          "action_name": 'prebuild_dependencies'
-        }
-      ],
       'cflags!': [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],
       'include_dirs': [
@@ -25,22 +17,58 @@
       'dependencies': ["<!(node -p \"require('node-addon-api').gyp\")"],
       'conditions': [
         ['OS=="linux"', {
-          "libraries": [ "-L<!(pwd)/libpg_query/linux", "-lpg_query" ]
+          "libraries": [ "-L<!(pwd)/libpg_query/linux", "-lpg_query" ],
+          "actions": [
+            {
+              "outputs": ['libpg_query/include/pg_query.h'],
+              "inputs": [],
+              "action": ['script/buildAddon.sh'],
+              "action_name": 'prebuild_dependencies'
+            }
+          ],
         }],
         ['OS=="mac"', {
           "libraries": [ "-L<!(pwd)/libpg_query/osx", "-lpg_query" ],
           "xcode_settings": {
             "CLANG_CXX_LIBRARY": "libc++",
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'MACOSX_DEPLOYMENT_TARGET': '10.7'
-          }
+          },
+          "actions": [
+            {
+              "outputs": ['libpg_query/include/pg_query.h'],
+              "inputs": [],
+              "action": ['script/buildAddon.sh'],
+              "action_name": 'prebuild_dependencies'
+            }
+          ],
         }],
         ['OS=="win"', {
+          "link_settings": {
+            "library_dirs": [
+              "../libpg_query/windows"
+            ],
+            "libraries": [
+              "../libpg_query/windows/pg_query.lib"
+            ],
+          },
           "msvs_settings": {
             "VCCLCompilerTool": {
-              "ExceptionHandling": 1
+              "ExceptionHandling": 0,
+              "AdditionalOptions": ["/EHsc"]
+            }
+          },
+          "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
+          "actions":[
+            {
+              "outputs": [
+                ""
+              ],
+              "inputs": [],
+              "action": ['../script/buildAddon.bat'],
+              "action_name": 'prebuild_dependencies'
             }
-          }
+          ]
         }]
       ]
     }

docker/readme.md

@@ -18,7 +18,7 @@ docker run \
 # build inside the docker image
 
 ```sh
-branch=15-latest
+branch=16-latest
 mkdir git_clone_dir && cd git_clone_dir
 git clone -b $branch --single-branch https://github.com/launchql/libpg-query-node
 cd libpg-query-node/
@@ -39,7 +39,7 @@ npm publish
 to build manually using `libpg_query`
 
 ```sh
-branch=15-latest
+branch=16-latest
 mkdir git_clone_dir && cd git_clone_dir
 git clone -b $branch --single-branch https://github.com/pganalyze/libpg_query.git
 cd libpg_query/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libpg-query",
-  "version": "16.0.1",
+  "version": "16.1.0",
   "description": "The real PostgreSQL query parser",
   "homepage": "https://github.com/launchql/libpg-query-node",
   "main": "index.js",

script/buildAddon.bat

@@ -0,0 +1,68 @@
+@echo off
+
+set commit=1ec38940e5c6f09a4c1d17a46d839a881c4f2db7
+set branch=16-latest
+
+setlocal enabledelayedexpansion
+
+rem Remember current's parent directory and create a new, unique, temporary directory
+set buildDir=%cd%
+set projectDir=%cd%\..
+set tmpDir=%temp%\tmpdir.libpg_query
+rmdir /s /q %tmpDir%
+md %tmpDir%
+
+
+rem Define the make target
+set makeTarget=build
+
+rem Change to the newly created temp directory
+cd /D %tmpDir%
+
+
+rem Clone the selected branch of the libpg_query Git repo
+git clone -b %branch% --single-branch https://github.com/pganalyze/libpg_query.git
+cd libpg_query
+
+rem Checkout the desired commit
+git checkout %commit%
+
+rem needed if being invoked from within gyp
+set MAKEFLAGS=
+set MFLAGS=
+
+rem set path with Windows Developer Command Prompt
+echo "please ensure you are running at Windows Developer Command Prompt environments"
+nmake /F Makefile.msvc clean
+nmake /F Makefile.msvc build
+
+
+rem Terminate if build fails
+if %errorlevel% NEQ 0 (
+    echo ERROR: 'nmake' command failed
+)
+
+rem Search for pg_query.obj (libpg_query.a), error if not found
+for /f "delims=" %%f in ('dir /b /s pg_query.lib') do set file=%%f
+if not defined file (
+    echo "ERROR: pg_query.lib not found"
+
+)
+
+rem Error if pg_query.h is missing
+for /f "delims=" %%f in ('dir /b /s pg_query.h') do set file=%%f
+if not defined file (
+    echo "ERROR: pg_query.h not found"
+
+)
+
+rem Copy pg_query.lib to windows dir
+copy /Y pg_query.lib "%projectDir%\libpg_query\windows\"
+
+rem Copy header
+copy /Y pg_query.h "%projectDir%\libpg_query\include\"
+
+rem Cleanup: revert to original directory
+cd /D %buildDir%
+
+exit /B 0