Alternate version numbering for Chromium pre-releases.

This commit is contained in:
hackademix 2019-10-05 08:31:01 +02:00
parent 8a116734f8
commit 7cc3422b4f
1 changed files with 11 additions and 7 deletions

View File

@ -8,7 +8,12 @@ MANIFEST_OUT="$BUILD/manifest.json"
strip_rc_ver() { strip_rc_ver() {
MANIFEST="$1" MANIFEST="$1"
perl -pi.bak -e 's/("version":.*)rc\d+/$1/' "$MANIFEST" && rm -f "$MANIFEST".bak if [ "$2" = "rel" ]; then
replace='s/("version":.*)rc\d+/$1/'
else
replace='s/("version":.*)(\d+)rc(\d+)/{$1 . ($2 == "0" ? "0" : ($2-1) . ".999" . sprintf("%03d", $3))}/e'
fi
perl -pi.bak -e "$replace" "$MANIFEST" && rm -f "$MANIFEST".bak
} }
VER=$(grep '"version":' "$MANIFEST_IN" | sed -re 's/.*": "(.*?)".*/\1/') VER=$(grep '"version":' "$MANIFEST_IN" | sed -re 's/.*": "(.*?)".*/\1/')
@ -18,7 +23,7 @@ if [ "$1" == "tag" ]; then
exit 0 exit 0
fi fi
if [[ "$1" == "rel" ]]; then if [[ "$1" == "rel" ]]; then
strip_rc_ver "$MANIFEST_IN" strip_rc_ver "$MANIFEST_IN" rel
"$0" && "$0" bump "$0" && "$0" bump
exit exit
fi fi
@ -109,7 +114,9 @@ else
WEBEXT_OUT="$XPI_DIR" WEBEXT_OUT="$XPI_DIR"
fi fi
"$BUILD_CMD" $BUILD_OPTS --overwrite-dest --source-dir="$WEBEXT_IN" --artifacts-dir="$WEBEXT_OUT" --ignore-files=test/XSS_test.js COMMON_BUILD_OPTS=--ignore-files=test/XSS_test.js
"$BUILD_CMD" $BUILD_OPTS --overwrite-dest --source-dir="$WEBEXT_IN" --artifacts-dir="$WEBEXT_OUT" $COMMON_BUILD_OPTS
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi" SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
if [ -f "$SIGNED" ]; then if [ -f "$SIGNED" ]; then
mv "$SIGNED" "$XPI.xpi" mv "$SIGNED" "$XPI.xpi"
@ -127,7 +134,4 @@ ln -fs $XPI.xpi "$BASE/latest.xpi"
rm -rf "$CHROMIUM" rm -rf "$CHROMIUM"
strip_rc_ver "$MANIFEST_OUT" strip_rc_ver "$MANIFEST_OUT"
mv "$BUILD" "$CHROMIUM" mv "$BUILD" "$CHROMIUM"
webext build --source-dir="$CHROMIUM" --artifacts-dir="$CHROMIUM" web-ext build --source-dir="$CHROMIUM" --artifacts-dir="$CHROMIUM" --ignore-files=test/XSS_test.js $COMMON_BUILD_OPTS
for ext in zip crx; do
ln -fs "$CHROMIUM/noscript-$VER.zip" "$BASE/latest.$ext"
done