Merge pull request #3 from lib-ruby-parser/build-on-windows

build on windows

Author: iliabylich

.github/workflows/test.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  BUILD_ENV: release
 
 jobs:
   test:
@@ -16,11 +17,12 @@ jobs:
     strategy:
       matrix:
         node: [ '10', '12', '14', '15' ]
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     steps:
-      - name: set NPM_CONFIG_PREFIX
-        run: |
-          echo "NPM_CONFIG_PREFIX=$HOME/.npm-global" >> $GITHUB_ENV
+      - name: install wget
+        if: runner.os == 'Windows'
+        shell: bash
+        run: choco install wget --no-progress
 
       - name: checkout
         uses: actions/checkout@v2
@@ -37,29 +39,17 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - name: configure NPM_CONFIG_PREFIX
-        run: |
-          npm config set prefix $NPM_CONFIG_PREFIX
-          mkdir -p $NPM_CONFIG_PREFIX/bin
-          mkdir -p $NPM_CONFIG_PREFIX/lib
-          echo "$NPM_CONFIG_PREFIX/bin" >> $GITHUB_PATH
-
-      - name: install node-gyp
+      - name: build
+        shell: bash
         run: |
-          npm install -g node-gyp
-          echo $PATH
-          which node-gyp
-
-      - name: npm install
-        run: npm install --ignore-scripts
+          make setup
+          make download-cpp-bindings
+          make generate-node-bindings
 
-      - name: configure
-        run: |
-          make update-cpp-bindings
-          make generate-bindings
           make configure
+          make build
 
       - name: Run tests
+        shell: bash
         run: |
-          make build
           make test

Makefile

@@ -1,12 +1,32 @@
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-	PLATFORM = linux-x86_64
+ifeq ($(OS), Windows_NT)
+	DETECTED_OS = Windows
+else
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Linux)
+		DETECTED_OS = Linux
+	else
+		ifeq ($(UNAME_S), Darwin)
+			DETECTED_OS = Darwin
+		else
+			DETECTED_OS = Unknown
+		endif
+	endif
+endif
+
+ifeq ($(DETECTED_OS), Windows)
+	LIB_ASSET_NAME = lib-ruby-parser-x86_64-pc-windows-msvc.lib
+	LOCAL_LIB_NAME = lib-ruby-parser.lib
 endif
-ifeq ($(UNAME_S),Darwin)
-	PLATFORM = darwin-x86_64
+ifeq ($(DETECTED_OS), Linux)
+	LIB_ASSET_NAME = lib-ruby-parser-x86_64-unknown-linux-gnu.a
+	LOCAL_LIB_NAME = lib-ruby-parser.a
+endif
+ifeq ($(UNAME_S), Darwin)
+	LIB_ASSET_NAME = lib-ruby-parser-x86_64-apple-darwin.a
+	LOCAL_LIB_NAME = lib-ruby-parser.a
 endif
 
-VERSION = 3.0.0-3.3
+VERSION = 3.0.0-3.4
 
 ifndef BUILD_ENV
 	BUILD_ENV = debug
@@ -21,18 +41,22 @@ else
 endif
 
 ASSET_PREFIX = https://github.com/lib-ruby-parser/cpp-bindings/releases/download/v$(VERSION)
-LIB_RUBY_PARSER_H_URL = $(ASSET_PREFIX)/lib-ruby-parser.h
-LIB_RUBY_PARSER_A_URL = $(ASSET_PREFIX)/$(PLATFORM).a
+HEADER_URL = $(ASSET_PREFIX)/lib-ruby-parser.h
+LIB_URL = $(ASSET_PREFIX)/$(LIB_ASSET_NAME)
+
+setup:
+	npm install --ignore-scripts
+	npm install node-gyp --no-save
 
 configure:
-	node-gyp configure
+	node ./node_modules/node-gyp/bin/node-gyp.js configure
 
-generate-bindings:
+generate-node-bindings:
 	cd build-convert && cargo build
 
 .PHONY: build
 build:
-	node-gyp build $(NODE_GYP_FLAGS)
+	node ./node_modules/node-gyp/bin/node-gyp.js build $(NODE_GYP_FLAGS)
 
 GYP_OUTPUT = ./build/$(GYP_ENV)/ruby_parser.node
 test:
@@ -44,6 +68,6 @@ clean:
 
 # // cpp bindings files
 
-update-cpp-bindings:
-	wget $(LIB_RUBY_PARSER_H_URL) -O lib-ruby-parser.h
-	wget $(LIB_RUBY_PARSER_A_URL) -O lib-ruby-parser.a
+download-cpp-bindings:
+	wget -q $(HEADER_URL) -O lib-ruby-parser.h
+	wget -q $(LIB_URL) -O $(LOCAL_LIB_NAME)

binding.gyp

@@ -7,12 +7,21 @@
                 "<!@(node -p \"require('node-addon-api').include\")",
                 "."
             ],
-            "libraries": [ "../lib-ruby-parser.a" ],
             "cflags_cc": [ "-std=c++17" ],
             "xcode_settings": {
                 "OTHER_CFLAGS": [ "-std=c++17"],
             },
+            "msvs_settings": {
+                "VCCLCompilerTool": {
+                    "AdditionalOptions": ["/std:c++17"]
+                }
+            },
             "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
+            "conditions": [
+                ['OS=="mac"', { "libraries": ["../lib-ruby-parser.a"] }],
+                ['OS=="linux"', { "libraries": ["../lib-ruby-parser.a"] }],
+                ['OS=="win"', { "libraries": ["../lib-ruby-parser.lib"] }],
+            ]
         }
     ]
 }

build-convert/build.rs

@@ -15,8 +15,9 @@ fn relative_path(path: &str) -> String {
 
 fn build_comparison(node: &Node) -> String {
     format!(
-        "if constexpr (std::is_same_v<T, std::unique_ptr<lib_ruby_parser::{class_name}>>)
-                return convert(std::move(inner), env);",
+        "if constexpr (std::is_same_v<T, std::unique_ptr<lib_ruby_parser::{class_name}>>) {{
+                return convert(std::move(inner), env);
+            }}",
         class_name = node.struct_name
     )
 }
@@ -159,8 +160,6 @@ namespace lib_ruby_parser_node
         return std::visit([env](auto &&inner) -> Napi::Value {{
             using T = std::decay_t<decltype(inner)>;
             {comparisons}
-            else
-                static_assert(always_false_v<T>, \"non-exhaustive visitor!\");
         }}, node->inner);
     }}
 
@@ -169,8 +168,6 @@ namespace lib_ruby_parser_node
         return std::visit([env](auto &&inner) {{
             using T = std::decay_t<decltype(inner)>;
             {comparisons}
-            else
-                static_assert(always_false_v<T>, \"non-exhaustive visitor!\");
         }}, node.inner);
     }}
 
@@ -184,7 +181,7 @@ namespace lib_ruby_parser_node
 #endif // LIB_RUBY_PARSER_CONVERT_GEN_H
 ",
         converters = converters.join("\n    "),
-        comparisons = comparisons.join("\n            else "),
+        comparisons = comparisons.join("\n            "),
         ctor_definitions = ctor_definitions.join("\n    "),
         ctor_fn_definitions = ctor_fn_definitions.join("\n    "),
         init_exports = init_exports.join("\n        ")