Commit 5992e972 by Mithgol

node-pre-gyp package testpackage (if NODE_WEBKIT is not empty)

This commit does also prepend `on Linux 64 bit:` to some comments (making it easier to understand what subplatform is targeted).

On Linux nw-gyp is installed earlier (in 64 bit mode) and thus we can refrain from its reinstallation for 32 bit, speeding things up.
parent 4f6db191
...@@ -47,10 +47,12 @@ script: ...@@ -47,10 +47,12 @@ script:
- make clean - make clean
- npm install --build-from-source --sqlite=/usr - npm install --build-from-source --sqlite=/usr
- npm test - npm test
# on Linux install nw-gyp for 64 bit if NODE_WEBKIT is not empty # on Linux 64 bit: install nw-gyp if NODE_WEBKIT is not empty
- if [ "$platform" = 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then npm install nw-gyp -g; fi; fi - if [ "$platform" = 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then npm install nw-gyp -g; fi; fi
# on Linux rebuild node-sqlite3 for 64 bit node-webkit target (if NODE_WEBKIT is not empty) # on Linux 64 bit: rebuild node-sqlite3 for 64 bit node-webkit target (if NODE_WEBKIT is not empty)
- if [ "$platform" = 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then nw-gyp rebuild --target=$NODE_WEBKIT --build-from-source; fi; fi - if [ "$platform" = 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then nw-gyp rebuild --target=$NODE_WEBKIT --build-from-source; fi; fi
# on Linux 64 bit: attempt node-pre-gyp package testpackage (if NODE_WEBKIT is not empty)
- if [ "$platform" = 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then node-pre-gyp package testpackage; fi; fi
- make clean - make clean
# node v0.8 and above provide pre-built 32 bit and 64 bit binaries # node v0.8 and above provide pre-built 32 bit and 64 bit binaries
# so here we use the 32 bit ones to also test 32 bit builds # so here we use the 32 bit ones to also test 32 bit builds
...@@ -66,10 +68,12 @@ script: ...@@ -66,10 +68,12 @@ script:
- npm test - npm test
# publish 32 bit build # publish 32 bit build
- if [[ $PUBLISH == true ]]; then node-pre-gyp package publish; fi; - if [[ $PUBLISH == true ]]; then node-pre-gyp package publish; fi;
# install nw-gyp in 32 bit environment if NODE_WEBKIT is not empty # install nw-gyp in 32 bit environment if NODE_WEBKIT is not empty (but on Linux it's installed earlier on 64 bit)
- if [ "$NODE_WEBKIT" != "" ]; then npm install nw-gyp -g; fi; - if [ "$platform" != 'linux' ]; then if [ "$NODE_WEBKIT" != "" ]; then npm install nw-gyp -g; fi; fi
# rebuild node-sqlite3 for 32 bit node-webkit target (if NODE_WEBKIT is not empty) # rebuild node-sqlite3 for 32 bit node-webkit target (if NODE_WEBKIT is not empty)
- if [ "$NODE_WEBKIT" != "" ]; then nw-gyp rebuild --target=$NODE_WEBKIT --build-from-source; fi; - if [ "$NODE_WEBKIT" != "" ]; then nw-gyp rebuild --target=$NODE_WEBKIT --build-from-source; fi;
# attempt node-pre-gyp package testpackage (if NODE_WEBKIT is not empty)
- if [ "$NODE_WEBKIT" != "" ]; then node-pre-gyp package testpackage; fi;
- make clean - make clean
# test source compile in 32 bit mode against external libsqlite3 # test source compile in 32 bit mode against external libsqlite3
- if [[ "$platform" == 'linux' ]]; then sudo apt-get -y install libsqlite3-dev:i386; CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source --sqlite=/usr; npm test; fi - if [[ "$platform" == 'linux' ]]; then sudo apt-get -y install libsqlite3-dev:i386; CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source --sqlite=/usr; npm test; fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment