diff --git a/doc/development_guide.md b/doc/development_guide.md index 0965ccd56a50356dbad51f6ae0eb5216d84242fe..162087e71b5d4a4206598e25d86509593e8cbe48 100644 --- a/doc/development_guide.md +++ b/doc/development_guide.md @@ -27,7 +27,7 @@ To build Cesium, you will have to: 3. Installing node build tools, as global dependencies: ```bash - npm install -g yarn gulp cordova @ionic/cli + npm install -g yarn gulp cordova @ionic/cli web-ext ``` ## Get the source code and dependencies diff --git a/gulpfile.js b/gulpfile.js index 11eca3f760a1b8a059134d97f0fe043347218244..2c83a78f8629b04562d5e2edd1d5e557b8f8955c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -269,9 +269,7 @@ function pluginSass() { function webClean() { return del([ - './dist/web/www', - './dist/web/ext', - './dist/web/build' + './dist/web/www' ]); } @@ -694,10 +692,17 @@ function webExtensionZip() { function webBuildSuccess(done) { var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version; - log(colors.green("Web artifacts created at: 'dist/web/build/cesium-v" + version + "-web.zip' and 'dist/web/build/cesium-v" + version + "-extension.zip'")); + log(colors.green("Web artifact created at: 'dist/web/build/cesium-v" + version + "-web.zip'")); done(); } +function webExtBuildSuccess(done) { + var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version; + log(colors.green("Web extension artifact created at: 'dist/web/build/cesium-v" + version + "-extension.zip'")); + done(); +} + + /* -------------------------------------------------------------------------- -- Define gulp public tasks --------------------------------------------------------------------------*/ @@ -757,7 +762,7 @@ gulp.task('webExtensionClean', [], webExtensionClean); gulp.task('webExtensionCopyFiles', ['webExtensionClean', 'webCleanUnusedDirectories'], webExtensionCopyFiles); gulp.task('webExtensionZip', ['webExtensionCopyFiles'], webExtensionZip); -gulp.task('webBuild', ['webZip', 'webExtensionZip'], webBuildSuccess); +gulp.task('webBuild', ['webZip'], webBuildSuccess); gulp.task('build:web', ['webBuild']); // = webBuild gulp.task('webExtBuild', ['webExtensionZip']); diff --git a/install.sh b/install.sh index a10f81b86e051359e37211e3ea2a8fdf2dc0eb71..50feafe4008a43c38496b0ab5e008470452c8336 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ if [ "_$CESIUM_DIR" = "_" ]; then fi latest_version() { - echo "v1.6.2-alpha" #lastest + echo "v1.6.2" #lastest } api_release_url() { diff --git a/scripts/release.sh b/scripts/release.sh index 827407987474e9ac4b1f8f55d996470c361a799a..72875bad9e5841668b94e9e8ffe2fe8bbe1d32ca 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -34,7 +34,7 @@ fi echo "Current Android version: $currentAndroid" # Check version format -if [[ ! $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ || ! $3 =~ ^[0-9]+$ ]]; then +if [[ ! $2 =~ ^[0-9]+.[0-9]+.[0-9]+(-(alpha|beta|rc)[-0-9]*)?$ || ! $3 =~ ^[0-9]+$ ]]; then echo "Wrong version format" echo "Usage:" echo " > ./release.sh [pre|rel] <version> <android-version> <release_description>" @@ -117,7 +117,7 @@ cd ${PROJECT_DIR} || exit 1 # Run web build gulp config --env default -gulp webBuild --release +gulp webBuild webExtBuild --release if [[ $? -ne 0 ]]; then exit 1 fi diff --git a/www/js/config.js b/www/js/config.js index 835f378d89226939d35596147afe4fd09fadd3f3..b324efb5d366d120a7dbd3389b803214a2c6c30f 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -98,7 +98,7 @@ angular.module("cesium.config", []) } }, "version": "1.6.2-alpha", - "build": "2020-04-13T18:04:09.778Z", + "build": "2020-04-13T18:21:09.482Z", "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" })