diff --git a/.local/build_osx.sh b/.local/build_osx.sh index a699877c256d4a23a7459c0c0cd701bbdcd8dd23..a624a079016c9271008af18881e57617147d058e 100755 --- a/.local/build_osx.sh +++ b/.local/build_osx.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.3.11 +VERSION=1.6.12 EXPECTED_ASSETS="cesium-desktop-v${VERSION}-osx-x64.zip" export EXPECTED_ASSETS diff --git a/install.sh b/install.sh index 489d4a6cb0780031b6083542d0461d48e3381444..9a3846860dd91158d93e914e7284316098be33c5 100755 --- a/install.sh +++ b/install.sh @@ -2,12 +2,11 @@ PROJECT_DIR=$(pwd) DOWNLOADS_DIR=${PROJECT_DIR}/downloads -NW_VERSION=0.42.2 -#NW_BASENAME=nwjs -NW_BASENAME=nwjs-sdk -CHROMIUM_MAJOR_VERSION=78 -CESIUM_DEFAULT_VERSION=1.6.7 -NODE_VERSION=10 +NW_VERSION=${NW_VERSION:-"0.76.0"} +NW_BASENAME=${NW_BASENAME:-"nwjs"} +CHROMIUM_MAJOR_VERSION=113 +CESIUM_DEFAULT_VERSION=1.6.12 +NODE_VERSION=19 # Check first arguments = version if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; diff --git a/package.json b/package.json index 6f5d11c61e32843adc7db203fbabd5c4db985239..f15804904922782527aedff0082ee2dd695ac07c 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,11 @@ "readmeFilename": "README.md", "dependencies": { "bs58": "^4.0.1", - "cli-color": "^2.0.0", - "js-yaml": "^3.13.1", + "cli-color": "^2.0.3", + "js-yaml": "^3.14.1", "co": "^4.6.0", "request": "^2.88.2", - "request-promise": "^4.2.5", + "request-promise": "^4.2.6", "stringstream": "^0.0.6" } } diff --git a/run.sh b/run.sh index de4ddc55b1846b5ac31f28b8d262015669827817..3a08334fe915e739bebf7b00a8c466eb08178842 100755 --- a/run.sh +++ b/run.sh @@ -1,13 +1,17 @@ #!/bin/bash +# Use SDK, to be able to debug +export NW_BASENAME="nwjs" + PROJECT_DIR=$(pwd) -VERSION=$1 +export VERSION=$1 + if [[ "${VERSION}" = "DEV" ]]; then # Installing default version ./install.sh [[ ! $? -eq 0 ]] && exit 1 - # Copying DEV files + # Then copying DEV files if [[ -d "${PROJECT_DIR}/../../www/dist" ]]; then echo "Copying DEV files..." mkdir -p ${PROJECT_DIR}/www/cesium diff --git a/src/package.json b/src/package.json index 4da52dea65063d98c8f9320cc1e8c83849360ba5..bc28c52e5e88e20340a22b429e8388ff63856809 100644 --- a/src/package.json +++ b/src/package.json @@ -15,11 +15,11 @@ }, "dependencies": { "bs58": "^4.0.1", - "cli-color": "^2.0.0", - "js-yaml": "^3.13.1", + "cli-color": "^2.0.3", + "js-yaml": "^3.14.1", "co": "^4.6.0", "request": "^2.88.2", - "request-promise": "^4.2.5", + "request-promise": "^4.2.6", "stringstream": "^0.0.6" } }