Update to latest node-cpp-skel (#114)

* node v12 + upgrades all around via node-cpp-skel

* wow, vtquery was really out of date

* add sanitize script

* add mason-versions.ini for mason-js

* port over common.gypi fixes too

* clang-tidy fixes

* fix sanitize script

* more clang tidy fixes

* clang format

Author: springmeyer

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          '*,-cert-err58-cpp'
+Checks:          '*,-cert-err58-cpp,-fuchsia*,-google-runtime-references'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '\/include\/'
 AnalyzeTemporaryDtors: false

.travis.yml

@@ -9,10 +9,6 @@ addons:
     packages: [ 'libstdc++-4.9-dev' ]
 
 install:
-  # set up the environment by installing mason and clang++
-  - ./scripts/setup.sh --config local.env
-  # put mason and clang++ on PATH
-  - source local.env
   - node -v
   - which node
   - clang++ -v
@@ -27,70 +23,70 @@ install:
 # For this reason, we disable the 'script' section below, since we prefer using 'before_script'.
 before_script:
   - npm test
-  # after successful tests, publish binaries if specified in commit message
-  - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
 
-# We set 'script' here to an empty array to prevent this section from automatically running 'npm test'
-# The reason we do this is mentioned above in the comment about the 'before_script' stage.
-# For reference, the default travis behavior which we override comes from https://github.com/travis-ci/travis-build/blob/e5a45cbf49e0d9e27398e76e5f25dd7706feb6aa/lib/travis/build/script/node_js.rb#L62-L69.
 script:
+  # after successful tests, publish binaries if specified in commit message
+  - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
 
 # the matrix allows you to specify different operating systems and environments to
 # run your tests and build binaries
 matrix:
   include:
-    # linux publishable node v8
+
+    ## ** Builds that are published **
+
+    # linux cfi build node v6/release
     - os: linux
-      env: BUILDTYPE=release
-      node_js: 8
-    # linux publishable node v8/debug
+      env: BUILDTYPE=release TOOLSET=cfi CXXFLAGS="-fsanitize=cfi -fvisibility=hidden" LDFLAGS="-fsanitize=cfi"
+      node_js: 10
+    # linux publishable node v12/release
     - os: linux
-      env: BUILDTYPE=debug
-      node_js: 8
-    # linux publishable node v10
+      env: BUILDTYPE=release
+      node_js: 12
+    # linux publishable node v10/release
     - os: linux
       env: BUILDTYPE=release
       node_js: 10
     # linux publishable node v10/debug
     - os: linux
       env: BUILDTYPE=debug
       node_js: 10
-    # osx publishable node v8
+    # osx publishable node v10/release
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.3
       env: BUILDTYPE=release
-      node_js: 8
-    # osx publishable node v10
+      node_js: 10
+    # osx publishable node v12/release
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.3
       env: BUILDTYPE=release
-      node_js: 10
-    # Sanitizer build node v10/Debug
+      node_js: 12
+    # linux sanitizer build node v6/debug
     - os: linux
       env: BUILDTYPE=debug TOOLSET=asan
-      sudo: required # workaround https://github.com/mapbox/node-cpp-skel/issues/93
       node_js: 10
+      sudo: required
       # Overrides `install` to set up custom asan flags
       install:
-        - ./scripts/setup.sh --config local.env
-        # put mason and clang++ on PATH
-        - source local.env
-        # Note: to build without stopping on errors remove the -fno-sanitize-recover=all flag
-        # You might want to do this if there are multiple errors and you want to see them all before fixing
-        - export CXXFLAGS="${MASON_SANITIZE_CXXFLAGS} -fno-sanitize-recover=all"
-        - export LDFLAGS="${MASON_SANITIZE_LDFLAGS}"
-        - make ${BUILDTYPE}
-      # Overrides `script` to disable asan LD_PRELOAD before publishing
+        - make sanitize
+      # Overrides `before_script` (tests are already run in `make sanitize`)
+      before_script:
+    # osx sanitizer build node v6/debug
+    - os: osx
+      env: BUILDTYPE=debug TOOLSET=asan
+      node_js: 10
+      sudo: required
+      # Overrides `install` to set up custom asan flags
+      install:
+        - make sanitize
+      # Overrides `before_script` (tests are already run in `make sanitize`)
       before_script:
-        - export LD_PRELOAD=${MASON_LLVM_RT_PRELOAD}
-        - export ASAN_OPTIONS=fast_unwind_on_malloc=0:${ASAN_OPTIONS}
-        - npm test
-        - unset LD_PRELOAD
-        # after successful tests, publish binaries if specified in commit message
-        - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
+
+    ## ** Builds that do not get published **
+
     # g++ build (default builds all use clang++)
     - os: linux
-      env: BUILDTYPE=debug CXX="g++-6" CC="gcc-6" CXXFLAGS="-Weffc++"
+      env: BUILDTYPE=debug CXX="g++-6" CC="gcc-6" LINK="g++-6" AR="ar" NM="nm"
       node_js: 10
       addons:
         apt:
@@ -103,23 +99,17 @@ matrix:
       install:
         - make ${BUILDTYPE}
       # Overrides `script` to disable publishing
-      before_script:
-        - npm test
+      script:
     # Coverage build
     - os: linux
       env: BUILDTYPE=debug CXXFLAGS="--coverage" LDFLAGS="--coverage"
       node_js: 10
       # Overrides `script` to publish coverage data to codecov
-      before_script:
-        - pip install --user codecov
-        - mason install llvm-cov ${MASON_LLVM_RELEASE}
-        - mason link llvm-cov ${MASON_LLVM_RELEASE}
-        - which llvm-cov
-        - curl -S -f https://codecov.io/bash -o codecov
-        - chmod +x codecov
       script:
-        - make coverage
-        - ./codecov -x "llvm-cov gcov" -Z
+        - export PATH=$(pwd)/mason_packages/.link/bin/:${PATH}
+        - which llvm-cov
+        - pip install --user codecov
+        - codecov --gcov-exec "llvm-cov gcov -l"
     # Clang format build
     - os: linux
       # can be generic since we don't need nodejs to run formatting
@@ -131,8 +121,10 @@ matrix:
         # will trigger the build to fail (idea here is to get us to pay attention
         # and get in the habit of running these locally before committing)
         - make format
-      # Overrides `script`, no need to run tests
+      # Overrides `before_script`, no need to run tests
       before_script:
+      # Overrides `script` to disable publishing
+      script:
     # Clang tidy build
     - os: linux
       env: CLANG_TIDY
@@ -144,5 +136,7 @@ matrix:
         # will trigger the build to fail (idea here is to get us to pay attention
         # and get in the habit of running these locally before committing)
         - make tidy
-      # Overrides `script`, no need to run tests
+      # Overrides `before_script`, no need to run tests
       before_script:
+      # Overrides `script` to disable publishing
+      script:

Makefile

@@ -1,32 +1,60 @@
-MODULE_NAME := $(shell node -e "console.log(require('./package.json').binary.module_name)")
+# This Makefile serves a few purposes:
+#
+# 1. It provides an interface to iterate quickly while developing the C++ code in src/
+# by typing `make` or `make debug`. To make iteration as fast as possible it calls out
+# directly to underlying build tools and skips running steps that appear to have already
+# been run (determined by the presence of a known file or directory). What `make` does is
+# the same as running `npm install --build-from-source` except that it is faster when
+# run a second time because it will skip re-running expensive steps.
+# Note: in rare cases (like if you hit `crtl-c` during an install) you might end up with
+# build deps only partially installed. In this case you should run `make distclean` to fully
+# restore your repo to is starting state and then running `make` again should start from
+# scratch, fixing any inconsistencies.
+#
+# 2. It provides a few commands that call out to external scripts like `make coverage` or
+# `make tidy`. These scripts can be called directly but this Makefile provides a more uniform
+# interface to call them.
+#
+# To learn more about the build system see https://github.com/mapbox/node-cpp-skel/blob/master/docs/extended-tour.md#builds
 
 # Whether to turn compiler warnings into errors
 export WERROR ?= true
 
+# the default target. This line means that
+# just typing `make` will call `make release`
 default: release
 
-node_modules:
-	# install deps but for now ignore our own install script
-	# so that we can run it directly in either debug or release
+node_modules/nan:
 	npm install --ignore-scripts
 
-release: node_modules
+mason_packages/headers: node_modules/nan
+	node_modules/.bin/mason-js install
+
+mason_packages/.link/include: mason_packages/headers
+	node_modules/.bin/mason-js link
+
+build-deps: mason_packages/.link/include
+
+release: build-deps
 	V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error
 	@echo "run 'make clean' for full rebuild"
 
-debug: node_modules
+debug: mason_packages/.link/include
 	V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error --debug
 	@echo "run 'make clean' for full rebuild"
 
-coverage:
+coverage: build-deps
 	./scripts/coverage.sh
 
-tidy:
+tidy: build-deps
 	./scripts/clang-tidy.sh
 
-format:
+format: build-deps
 	./scripts/clang-format.sh
 
+sanitize: build-deps
+	./scripts/sanitize.sh
+
 clean:
 	rm -rf lib/binding
 	rm -rf build
@@ -38,20 +66,23 @@ clean:
 distclean: clean
 	rm -rf node_modules
 	rm -rf mason_packages
-	# remove remains from running './scripts/setup.sh'
-	rm -rf .mason
-	rm -rf .toolchain
-	rm -f local.env
+
+# variable used in the `xcode` target below
+MODULE_NAME := $(shell node -e "console.log(require('./package.json').binary.module_name)")
 
 xcode: node_modules
 	./node_modules/.bin/node-pre-gyp configure -- -f xcode
-
 	@# If you need more targets, e.g. to run other npm scripts, duplicate the last line and change NPM_ARGUMENT
 	SCHEME_NAME="$(MODULE_NAME)" SCHEME_TYPE=library BLUEPRINT_NAME=$(MODULE_NAME) BUILDABLE_NAME=$(MODULE_NAME).node scripts/create_scheme.sh
 	SCHEME_NAME="npm test" SCHEME_TYPE=node BLUEPRINT_NAME=$(MODULE_NAME) BUILDABLE_NAME=$(MODULE_NAME).node NODE_ARGUMENT="`npm bin tape`/tape test/*.test.js" scripts/create_scheme.sh
 
 	open build/binding.xcodeproj
 
+testpack:
+	rm -f ./*tgz
+	npm pack
+	tar -ztvf *tgz
+
 docs:
 	npm run docs
 

binding.gyp

@@ -1,5 +1,13 @@
 # This file inherits default targets for Node addons, see https://github.com/nodejs/node-gyp/blob/master/addon.gypi
 {
+  # https://github.com/springmeyer/gyp/blob/master/test/make_global_settings/wrapper/wrapper.gyp
+  'make_global_settings': [
+    ['CXX', '<(module_root_dir)/mason_packages/.link/bin/clang++'],
+    ['CC', '<(module_root_dir)/mason_packages/.link/bin/clang'],
+    ['LINK', '<(module_root_dir)/mason_packages/.link/bin/clang++'],
+    ['AR', '<(module_root_dir)/mason_packages/.link/bin/llvm-ar'],
+    ['NM', '<(module_root_dir)/mason_packages/.link/bin/llvm-nm']
+  ],
   'includes': [ 'common.gypi' ], # brings in a default set of options that are inherited from gyp
   'variables': { # custom variables we use specific to this file
       'error_on_warnings%':'true', # can be overriden by a command line variable because of the % sign using "WERROR" (defined in Makefile)
@@ -34,18 +42,21 @@
   # - none: a trick to tell gyp not to run the compiler for a given target.
   'targets': [
     {
-      # This target:
-      # - doesnt build any code (why it's type "none", to tell gyp not to run the compiler)
-      # - runs a script to install mason packages
       'target_name': 'action_before_build',
       'type': 'none',
       'hard_dependency': 1,
       'actions': [
         {
           'action_name': 'install_deps',
-          'inputs': ['./scripts/install_deps.sh'],
+          'inputs': ['./node_modules/.bin/mason-js'],
           'outputs': ['./mason_packages'],
-          'action': ['./scripts/install_deps.sh']
+          'action': ['./node_modules/.bin/mason-js', 'install']
+        },
+        {
+          'action_name': 'link_deps',
+          'inputs': ['./node_modules/.bin/mason-js'],
+          'outputs': ['./mason_packages/.link'],
+          'action': ['./node_modules/.bin/mason-js', 'link']
         }
       ]
     },

common.gypi

@@ -12,7 +12,7 @@
       # More details at https://github.com/mapbox/mason/issues/319
       '-D_GLIBCXX_USE_CXX11_ABI=0'
     ],
-    'cflags_cc!': ['-std=gnu++0x', '-std=gnu++1y', '-fno-rtti', '-fno-exceptions'],
+    'cflags_cc!': ['-std=gnu++0x','-std=gnu++1y', '-fno-rtti', '-fno-exceptions'],
     'configurations': {
       'Debug': {
         'defines!': [
@@ -37,11 +37,20 @@
         'defines': [
           'NDEBUG'
         ],
+        'cflags': [
+         '-flto'
+        ],
+        'ldflags': [
+         '-flto',
+         '-fuse-ld=<(module_root_dir)/mason_packages/.link/bin/ld'
+        ],
         'xcode_settings': {
           'OTHER_CPLUSPLUSFLAGS!': [
             '-Os',
             '-O2'
           ],
+          'OTHER_LDFLAGS':[ '-flto' ],
+          'OTHER_CPLUSPLUSFLAGS': [ '-flto' ],
           'GCC_OPTIMIZATION_LEVEL': '3',
           'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO',
           'DEAD_CODE_STRIPPING': 'YES',

mason-versions.ini

@@ -0,0 +1,17 @@
+[headers]
+geometry=96d3505
+variant=1.1.4
+vtzero=1.0.1
+protozero=1.6.2
+spatial-algorithms=0.1.0
+boost=1.65.1
+cheap-ruler=2.5.3
+vector-tile=f4728da
+gzip-hpp=0.1.0
+protozero=1.6.3
+[compiled]
+clang++=7.0.0
+clang-tidy=7.0.0
+clang-format=7.0.0
+llvm-cov=7.0.0
+binutils=2.31