Skip to content

Commit 3d3ebc0

Browse files
committed
Fix make browser sed errors.
Add uglify-js as npm devDependencies. closes gh-111
1 parent 7568b4d commit 3d3ebc0

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ stamp-build
33
*~
44
gmon.out
55
v8.log
6+
node_modules/*

Makefile

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,34 +52,44 @@ browser:
5252
echo "nodeunit.reporter = reporter;" >> $(BUILDDIR)/browser/nodeunit.js
5353
echo "nodeunit.run = reporter.run;" >> $(BUILDDIR)/browser/nodeunit.js
5454
echo "return nodeunit; })();" >> $(BUILDDIR)/browser/nodeunit.js
55-
sed -i "/\@REMOVE_LINE_FOR_BROWSER/d" $(BUILDDIR)/browser/nodeunit.js
55+
cp $(BUILDDIR)/browser/nodeunit.js $(BUILDDIR)/browser/.nodeunit.js
56+
sed "/\@REMOVE_LINE_FOR_BROWSER/d" <$(BUILDDIR)/browser/.nodeunit.js > $(BUILDDIR)/browser/nodeunit.js
57+
rm $(BUILDDIR)/browser/.nodeunit.js
5658
# copy nodeunit.css
5759
cp share/nodeunit.css $(BUILDDIR)/browser/nodeunit.css
5860
# create nodeunit.min.js
59-
uglifyjs $(BUILDDIR)/browser/nodeunit.js > $(BUILDDIR)/browser/nodeunit.min.js
61+
node_modules/uglify-js/bin/uglifyjs $(BUILDDIR)/browser/nodeunit.js > $(BUILDDIR)/browser/nodeunit.min.js
6062
# create test scripts
6163
mkdir -p $(BUILDDIR)/browser/test
6264
cp test/test.html $(BUILDDIR)/browser/test/test.html
6365
# test-base.js
6466
echo "(function (exports) {" > $(BUILDDIR)/browser/test/test-base.js
6567
cat test/test-base.js >> $(BUILDDIR)/browser/test/test-base.js
6668
echo "})(this.test_base = {});" >> $(BUILDDIR)/browser/test/test-base.js
67-
sed -i "/\@REMOVE_LINE_FOR_BROWSER/d" $(BUILDDIR)/browser/test/test-base.js
69+
cp $(BUILDDIR)/browser/test/test-base.js $(BUILDDIR)/browser/.test-base.js
70+
sed "/\@REMOVE_LINE_FOR_BROWSER/d" <$(BUILDDIR)/browser/.test-base.js > $(BUILDDIR)/browser/test/test-base.js
71+
rm $(BUILDDIR)/browser/.test-base.js
6872
# test-runmodule.js
6973
echo "(function (exports) {" > $(BUILDDIR)/browser/test/test-runmodule.js
7074
cat test/test-runmodule.js >> $(BUILDDIR)/browser/test/test-runmodule.js
7175
echo "})(this.test_runmodule = {});" >> $(BUILDDIR)/browser/test/test-runmodule.js
72-
sed -i "/\@REMOVE_LINE_FOR_BROWSER/d" $(BUILDDIR)/browser/test/test-runmodule.js
76+
cp $(BUILDDIR)/browser/test/test-runmodule.js $(BUILDDIR)/browser/.test-runmodule.js
77+
sed "/\@REMOVE_LINE_FOR_BROWSER/d" <$(BUILDDIR)/browser/.test-runmodule.js > $(BUILDDIR)/browser/test/test-runmodule.js
78+
rm $(BUILDDIR)/browser/.test-runmodule.js
7379
# test-runtest.js
7480
echo "(function (exports) {" > $(BUILDDIR)/browser/test/test-runtest.js
7581
cat test/test-runtest.js >> $(BUILDDIR)/browser/test/test-runtest.js
7682
echo "})(this.test_runtest = {});" >> $(BUILDDIR)/browser/test/test-runtest.js
77-
sed -i "/\@REMOVE_LINE_FOR_BROWSER/d" $(BUILDDIR)/browser/test/test-runtest.js
83+
cp $(BUILDDIR)/browser/test/test-runtest.js $(BUILDDIR)/browser/.test-runtest.js
84+
sed "/\@REMOVE_LINE_FOR_BROWSER/d" <$(BUILDDIR)/browser/.test-runtest.js > $(BUILDDIR)/browser/test/test-runtest.js
85+
rm $(BUILDDIR)/browser/.test-runtest.js
7886
# test-testcase.js
7987
echo "(function (exports) {" > $(BUILDDIR)/browser/test/test-testcase.js
8088
cat test/test-testcase.js >> $(BUILDDIR)/browser/test/test-testcase.js
8189
echo "})(this.test_testcase = {});" >> $(BUILDDIR)/browser/test/test-testcase.js
82-
sed -i "/\@REMOVE_LINE_FOR_BROWSER/d" $(BUILDDIR)/browser/test/test-testcase.js
90+
cp $(BUILDDIR)/browser/test/test-testcase.js $(BUILDDIR)/browser/.test-testcase.js
91+
sed "/\@REMOVE_LINE_FOR_BROWSER/d" <$(BUILDDIR)/browser/.test-testcase.js > $(BUILDDIR)/browser/test/test-testcase.js
92+
rm $(BUILDDIR)/browser/.test-testcase.js
8393
# copy nodeunit.js to dist/browser/test to make it easier for me to host and
8494
# run on windows VMs with IE
8595
cp $(BUILDDIR)/browser/nodeunit.js $(BUILDDIR)/browser/test/nodeunit.js

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
{ "type" : "git"
4646
, "url" : "http://github.com/caolan/nodeunit.git"
4747
}
48+
, "devDependencies":
49+
{ "uglify-js": ">=1.1.0" }
4850
, "bugs" : { "web" : "http://github.com/caolan/nodeunit/issues" }
4951
, "licenses" :
5052
[ { "type" : "MIT"

0 commit comments

Comments
 (0)