diff options
| author | hackademix | 2018-07-03 17:36:36 +0200 |
|---|---|---|
| committer | hackademix | 2018-07-03 17:36:36 +0200 |
| commit | 849fd0c7a93e78a588c426706ecbd5bcaefa4248 (patch) | |
| tree | 586a8ca837bd837d779d728ae4baa2e0a30f9551 | |
| parent | e2a8c5768fb40cb8515eee2b6ff20bc18dbd8fc2 (diff) | |
| download | noscript-849fd0c7a93e78a588c426706ecbd5bcaefa4248.tar.gz noscript-849fd0c7a93e78a588c426706ecbd5bcaefa4248.tar.xz noscript-849fd0c7a93e78a588c426706ecbd5bcaefa4248.zip | |
Minor build script and code tree cleanup, including license info inside the XPI.
| -rw-r--r-- | build.sh | 11 | ||||
| -rw-r--r-- | html5_events/html5_events.pl (renamed from html5_events.pl) | 2 | ||||
| -rw-r--r-- | html5_events/html5_events.re (renamed from html5_events.re) | 0 |
3 files changed, 6 insertions, 7 deletions
@@ -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 fi -./html5_events.pl - -rm -rf $BUILD $XPI -cp -pR $SRC $BUILD +./html5_events/html5_events.pl +rm -rf "$BUILD" "$XPI" +cp -pR "$SRC" "$BUILD" +cp -p LICENSE.txt GPL.txt "$BUILD"/ if [[ $VER == *rc* ]]; then 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 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 SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi" @@ -56,5 +56,4 @@ else exit 3 fi echo "Created $XPI.xpi" - rm -rf "$BUILD" diff --git a/html5_events.pl b/html5_events/html5_events.pl index 1fb02fe..b2e8bee 100644 --- a/html5_events.pl +++ b/html5_events/html5_events.pl @@ -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 $HERE = dirname($0); -my $SOURCE_FILE = $HERE . '/src/xss/InjectionChecker.js'; +my $SOURCE_FILE = "$HERE/../src/xss/InjectionChecker.js"; sub create_re { diff --git a/html5_events.re b/html5_events/html5_events.re index b59716d..b59716d 100644 --- a/html5_events.re +++ b/html5_events/html5_events.re |