Minor build script and code tree cleanup, including license info inside the XPI.

This commit is contained in:
hackademix 2018-07-03 17:36:36 +02:00
parent e2a8c5768f
commit 849fd0c7a9
3 changed files with 6 additions and 7 deletions

View File

@ -15,11 +15,11 @@ if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') ] && "$TLD/gene
cp -u "$TLD/tld.js" $LIB cp -u "$TLD/tld.js" $LIB
fi fi
./html5_events.pl ./html5_events/html5_events.pl
rm -rf $BUILD $XPI
cp -pR $SRC $BUILD
rm -rf "$BUILD" "$XPI"
cp -pR "$SRC" "$BUILD"
cp -p LICENSE.txt GPL.txt "$BUILD"/
if [[ $VER == *rc* ]]; then if [[ $VER == *rc* ]]; then
sed -re 's/^(\s+)"strict_min_version":.*$/\1"update_url": "https:\/\/secure.informaction.com\/update\/?v='$VER'",\n\0/' \ sed -re 's/^(\s+)"strict_min_version":.*$/\1"update_url": "https:\/\/secure.informaction.com\/update\/?v='$VER'",\n\0/' \
@ -43,7 +43,7 @@ else
fi fi
echo "Creating $XPI.xpi..." echo "Creating $XPI.xpi..."
mkdir -p $XPI_DIR mkdir -p "$XPI_DIR"
"$BUILD_CMD" $BUILD_OPTS --source-dir=$(cygpath -w $BUILD) --artifacts-dir=$(cygpath -w $XPI_DIR) --ignore-files=test/XSS_test.js "$BUILD_CMD" $BUILD_OPTS --source-dir=$(cygpath -w $BUILD) --artifacts-dir=$(cygpath -w $XPI_DIR) --ignore-files=test/XSS_test.js
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi" SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
@ -56,5 +56,4 @@ else
exit 3 exit 3
fi fi
echo "Created $XPI.xpi" echo "Created $XPI.xpi"
rm -rf "$BUILD" rm -rf "$BUILD"

View File

@ -12,7 +12,7 @@ my $HTML5_URL = "https://hg.mozilla.org/mozilla-central/raw-file/tip/parser/html
my $GECKO_URL = "https://hg.mozilla.org/mozilla-central/raw-file/tip/xpcom/ds/nsGkAtomList.h"; my $GECKO_URL = "https://hg.mozilla.org/mozilla-central/raw-file/tip/xpcom/ds/nsGkAtomList.h";
my $HERE = dirname($0); my $HERE = dirname($0);
my $SOURCE_FILE = $HERE . '/src/xss/InjectionChecker.js'; my $SOURCE_FILE = "$HERE/../src/xss/InjectionChecker.js";
sub create_re sub create_re
{ {