Commit 51d96307 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Upgrade to NW v0.35.3

parent 8d7ffcd1
Pipeline #4238 failed
......@@ -8,9 +8,9 @@ export NVM_DIR="$HOME/.nvm"
NVER=`node -v`
CESIUM_TAG=
ADDON_VERSION=48
NW_VERSION=0.35.2
NW_VERSION=0.35.3
NW_RELEASE="v${NW_VERSION}"
NW="nwjs-${NW_RELEASE}-linux-x64"
NW="nwjs-sdk-${NW_RELEASE}-linux-x64"
NW_GZ="${NW}.tar.gz"
# Folders
......
set NW_VERSION=0.35.2
set NW_VERSION=0.35.3
set NW_RELEASE=v%NW_VERSION%
set NW=nwjs-%NW_RELEASE%-win-x64
set NW_GZ=%NW%.zip
......
......@@ -2,7 +2,7 @@
ROOT_DIR=$PWD
TEMP_DIR=$PWD/tmp
NV_VERSION=0.35.2
NV_VERSION=0.35.3
CHROMIUM_MAJOR_VERSION=71
CESIUM_DEFAULT_VERSION=1.2.9
......@@ -26,22 +26,38 @@ else
fi
fi
# Force nodejs version to 6
if [[ -d "$NVM_DIR" ]]; then
. $NVM_DIR/nvm.sh
nvm use 6
else
echo "nvm (Node version manager) not found (directory NVM_DIR not defined). Please install nvm, and retry"
exit -1
fi
mkdir -p $TEMP_DIR && cd $TEMP_DIR
# Install NW.js
if [[ ! -f $ROOT_DIR/src/nw/nw ]];
then
wget http://dl.nwjs.io/v${NV_VERSION}/nwjs-sdk-v${NV_VERSION}-linux-x64.tar.gz
tar xvzf nwjs-sdk-v${NV_VERSION}-linux-x64.tar.gz
mv nwjs-sdk-v${NV_VERSION}-linux-x64/* "$ROOT_DIR/src/nw"
rm nwjs-sdk-v${NV_VERSION}-linux-x64.tar.gz
rmdir nwjs-sdk-v${NV_VERSION}-linux-x64
#NV_BASENAME=nwjs
NV_BASENAME=nwjs-sdk
wget http://dl.nwjs.io/v${NV_VERSION}/${NV_BASENAME}-v${NV_VERSION}-linux-x64.tar.gz
tar xvzf ${NV_BASENAME}-v${NV_VERSION}-linux-x64.tar.gz
mv ${NV_BASENAME}-v${NV_VERSION}-linux-x64/* "$ROOT_DIR/src/nw"
rm ${NV_BASENAME}-v${NV_VERSION}-linux-x64.tar.gz
rmdir ${NV_BASENAME}-v${NV_VERSION}-linux-x64
rmdir nw
cd $ROOT_DIR/src/nw
npm install
# Check NW version
else
cd ${ROOT_DIR}/src/nw
npm install
NW_ACTUAL_VERSION=`./nw --version | grep nwjs | awk '{print $2}'`
echo "Using Chromium version: ${NW_ACTUAL_VERSION}"
CHROMIUM_ACTUAL_MAJOR_VERSION=`echo ${NW_ACTUAL_VERSION} | awk '{split($0, array, ".")} END{print array[1]}'`
......
......@@ -5,4 +5,4 @@ if [[ ! $? -eq 0 ]]; then
exit -1;
fi
./src/nw/nw
./src/nw/nw $2
......@@ -12,7 +12,7 @@ make)
[[ $? -eq 0 ]] && cp ../../src/nw/yarn.lock ./
[[ $? -eq 0 ]] && cp ../../src/nw/package.json ./
[[ $? -eq 0 ]] && cp ../../src/nw/cesium/node.js ./
[[ $? -eq 0 ]] && cp "../../downloads/cesium-v$TAG-web.zip" ./
#[[ $? -eq 0 ]] && cp "../../downloads/cesium-v$TAG-web.zip" ./
[[ $? -eq 0 ]] && echo ">> Starting Vagrant Ubuntu VM..."
[[ $? -eq 0 ]] && vagrant up
[[ $? -eq 0 ]] && echo ">> VM: building Cesium..."
......
Supports Markdown
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