[Pkg-javascript-commits] [node-sqlite3] 01/06: New upstream version 3.1.4+ds

Jérémy Lal kapouer at moszumanska.debian.org
Wed Dec 21 10:42:19 UTC 2016


This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository node-sqlite3.

commit 826c8f97e645f4616d3c250b77df98ec00a60bd9
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Dec 21 11:37:26 2016 +0100

    New upstream version 3.1.4+ds
---
 .travis.yml                | 10 ++++++++++
 CHANGELOG.md               |  4 ++++
 appveyor.yml               |  6 ++++++
 package.json               | 10 +++++-----
 scripts/build-appveyor.bat | 11 +++++++++--
 scripts/build-local.bat    | 18 ++++++++++++------
 6 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64d73b7..429dd4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,13 @@ matrix:
      # Linux
      - os: linux
        compiler: clang
+       env: NODE_VERSION="6"
+       addons:
+         apt:
+            sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
+            packages: [ 'clang-3.5']
+     - os: linux
+       compiler: clang
        env: NODE_VERSION="5"
        addons:
          apt:
@@ -64,6 +71,9 @@ matrix:
        env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
      - os: osx
        compiler: clang
+       env: NODE_VERSION="6" # node abi 48
+     - os: osx
+       compiler: clang
        env: NODE_VERSION="5" # node abi 47
      - os: osx
        compiler: clang
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cd2f9f..2bcf12c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.4
+
+ - Added support for node v6
+
 ## 3.1.3
 
  - Upgrade to node-pre-gyp at 0.6.26 with better support for Electron
diff --git a/appveyor.yml b/appveyor.yml
index e930a96..1f63dab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,6 +28,12 @@ environment:
     - nodejs_version: 5.0.0
       platform: x86
       msvs_toolset: 12
+    - nodejs_version: 6.0.0
+      platform: x64
+      msvs_toolset: 12
+    - nodejs_version: 6.0.0
+      platform: x86
+      msvs_toolset: 12
     # custom visual studio 2015 builds
     - nodejs_version: 0.10.40
       platform: x86
diff --git a/package.json b/package.json
index dc226b3..f650dd7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "sqlite3",
     "description": "Asynchronous, non-blocking SQLite3 bindings",
-    "version": "3.1.3",
+    "version": "3.1.4",
     "homepage": "http://github.com/mapbox/node-sqlite3",
     "author": {
         "name": "MapBox",
@@ -37,15 +37,15 @@
         "url": "git://github.com/mapbox/node-sqlite3.git"
     },
     "dependencies": {
-        "nan": "~2.2.0",
-        "node-pre-gyp": "~0.6.25"
+        "nan": "~2.3.3",
+        "node-pre-gyp": "~0.6.28"
     },
     "bundledDependencies": [
         "node-pre-gyp"
     ],
     "devDependencies": {
-        "mocha": "~2.3.3",
-        "aws-sdk": "~2.1.26"
+        "mocha": "2.x",
+        "aws-sdk": "2.x"
     },
     "scripts": {
         "prepublish":"npm ls",
diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat
index bbe7473..eceb1c4 100644
--- a/scripts/build-appveyor.bat
+++ b/scripts/build-appveyor.bat
@@ -6,7 +6,7 @@ ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 SET PATH=%CD%;%PATH%
 SET msvs_version=2013
-IF "%msvs_toolset"=="14" SET msvs_version=2015
+IF "%msvs_toolset%"=="14" SET msvs_version=2015
 
 ECHO APPVEYOR^: %APPVEYOR%
 ECHO nodejs_version^: %nodejs_version%
@@ -59,10 +59,17 @@ ECHO deleting node ...
 SET NODE_EXE_PRG=%ProgramFiles%\nodejs\node.exe
 IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+IF EXIST "%ProgramFiles%\nodejs" ECHO copy custom node.exe to %ProgramFiles%\nodejs\ && COPY node.exe "%ProgramFiles%\nodejs\"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
 SET NODE_EXE_PRG=%ProgramFiles(x86)%\nodejs\node.exe
 IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+IF EXIST "%ProgramFiles(x86)%\nodejs" ECHO copy custom node.exe to %ProgramFiles(x86)%\nodejs\ && COPY node.exe "%ProgramFiles(x86)%\nodejs\"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+ECHO delete node.exe in current directory && DEL node.exe
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 :NODE_INSTALLED
 
@@ -72,7 +79,7 @@ ECHO available npm^:
 call where npm
 
 ECHO node^: && call node -v
-call node -e "console.log(process.argv,process.execPath)"
+call node -e "console.log('  - arch:',process.arch,'\n  - argv:',process.argv,'\n  - execPath:',process.execPath)"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO npm^: && CALL npm -v
diff --git a/scripts/build-local.bat b/scripts/build-local.bat
index 6c7e269..2f3b751 100644
--- a/scripts/build-local.bat
+++ b/scripts/build-local.bat
@@ -13,19 +13,22 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF EXIST node_modules ECHO deleting node_modules && RD /Q /S node_modules
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+GOTO VS2015
+
 ECHO                 ============================
 ECHO                           VS2013
 ECHO                 ============================
-SET nodejs_version=0.10.36
-SET platform=x64
+SET nodejs_version=4.4.2
+SET platform=x86
 SET msvs_toolset=12
 SET TOOLSET_ARGS=
 
 CALL scripts\build-appveyor.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+GOTO DONE
 
-
+:VS2015
 
 IF EXIST lib\binding ECHO deleting lib/binding && RD /Q /S lib\binding
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
@@ -35,10 +38,13 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO                 ============================
 ECHO                           VS2015
 ECHO                 ============================
-SET nodejs_version=0.12.7
-SET platform=x86
+SET nodejs_version=4.4.1
+ECHO SET nodejs_version^: %nodejs_version%
+SET platform=x64
+ECHO SET platform^: %platform%
 SET msvs_toolset=14
-SET TOOLSET_ARGS=--dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
+ECHO SET msvs_toolset^: %msvs_toolset%
+::SET TOOLSET_ARGS=--dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
 
 CALL scripts\build-appveyor.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-sqlite3.git



More information about the Pkg-javascript-commits mailing list