Skip to content

Commit 849fd0c

Browse files
committed
Minor build script and code tree cleanup, including license info inside the XPI.
1 parent e2a8c57 commit 849fd0c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

build.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') ] && "$TLD/gene
1515
cp -u "$TLD/tld.js" $LIB
1616
fi
1717

18-
./html5_events.pl
19-
20-
rm -rf $BUILD $XPI
21-
cp -pR $SRC $BUILD
18+
./html5_events/html5_events.pl
2219

20+
rm -rf "$BUILD" "$XPI"
21+
cp -pR "$SRC" "$BUILD"
22+
cp -p LICENSE.txt GPL.txt "$BUILD"/
2323

2424
if [[ $VER == *rc* ]]; then
2525
sed -re 's/^(\s+)"strict_min_version":.*$/\1"update_url": "https:\/\/secure.informaction.com\/update\/?v='$VER'",\n\0/' \
@@ -43,7 +43,7 @@ else
4343
fi
4444

4545
echo "Creating $XPI.xpi..."
46-
mkdir -p $XPI_DIR
46+
mkdir -p "$XPI_DIR"
4747

4848
"$BUILD_CMD" $BUILD_OPTS --source-dir=$(cygpath -w $BUILD) --artifacts-dir=$(cygpath -w $XPI_DIR) --ignore-files=test/XSS_test.js
4949
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
@@ -56,5 +56,4 @@ else
5656
exit 3
5757
fi
5858
echo "Created $XPI.xpi"
59-
6059
rm -rf "$BUILD"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
my $GECKO_URL = "https://hg.mozilla.org/mozilla-central/raw-file/tip/xpcom/ds/nsGkAtomList.h";
1313

1414
my $HERE = dirname($0);
15-
my $SOURCE_FILE = $HERE . '/src/xss/InjectionChecker.js';
15+
my $SOURCE_FILE = "$HERE/../src/xss/InjectionChecker.js";
1616

1717
sub create_re
1818
{

0 commit comments

Comments
 (0)