From fed33e76faee50e197fdf82216fe5b69cecc0407 Mon Sep 17 00:00:00 2001 From: Lukas Martini Date: Thu, 7 Apr 2011 19:42:50 +0200 Subject: [PATCH 1/3] Adding Makefile for easier execution --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 00000000000..e236a127f06 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +.PHONY: all debug tests + +all: + @cd bin && bash run.sh +debug: + @cd bin && bash runDebug.sh +tests: + @cd bin && bash runTests.sh From de967c1cd5e186f19caacb35ff471f8aa62a877c Mon Sep 17 00:00:00 2001 From: Lukas Martini Date: Thu, 7 Apr 2011 19:51:18 +0200 Subject: [PATCH 2/3] Revert "Adding Makefile for easier execution" This reverts commit fed33e76faee50e197fdf82216fe5b69cecc0407. --- Makefile | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index e236a127f06..00000000000 --- a/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -.PHONY: all debug tests - -all: - @cd bin && bash run.sh -debug: - @cd bin && bash runDebug.sh -tests: - @cd bin && bash runTests.sh From debbced1851e884354d6dbf68982199f85ad2c7c Mon Sep 17 00:00:00 2001 From: Lukas Martini Date: Thu, 7 Apr 2011 19:54:41 +0200 Subject: [PATCH 3/3] Fixing scripts to run from both bin/ and /. --- bin/generateJsDoc.sh | 6 +++++- bin/run.sh | 6 +++++- bin/runDebug.sh | 6 +++++- bin/runTests.sh | 8 ++++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/bin/generateJsDoc.sh b/bin/generateJsDoc.sh index aff696f832b..aa62a0d5bd8 100755 --- a/bin/generateJsDoc.sh +++ b/bin/generateJsDoc.sh @@ -4,7 +4,11 @@ if [ ! -x /usr/bin/java ]; then exit 1 fi -cd "../doc/jsdoc-toolkit" +if [ -d "../bin" ]; then + cd "../" +fi + +cd "doc/jsdoc-toolkit" JSRUN="jsrun.jar" RUNJS="app/run.js" diff --git a/bin/run.sh b/bin/run.sh index e9fbde6844b..2c42de8e94d 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -11,5 +11,9 @@ type -P node &>/dev/null || { exit 1 } -cd ../node +if [ -d "../bin" ]; then + cd "../" +fi + +cd "node" node server.js diff --git a/bin/runDebug.sh b/bin/runDebug.sh index 24630011d64..46eec8e8d01 100755 --- a/bin/runDebug.sh +++ b/bin/runDebug.sh @@ -11,5 +11,9 @@ node-inspector & echo "If you new to node-inspector, take a look at this video: http://youtu.be/AOnK3NVnxL8" -cd ../node +if [ -d "../bin" ]; then + cd "../" +fi + +cd "node" node --debug server.js diff --git a/bin/runTests.sh b/bin/runTests.sh index 68ebde89a2c..f22004e37be 100755 --- a/bin/runTests.sh +++ b/bin/runTests.sh @@ -6,5 +6,9 @@ type -P nodeunit &>/dev/null || { echo "Run: npm install nodeunit" >&2 exit 1 } - -nodeunit ../tests + +if [ -d "../bin" ]; then + cd "../" +fi + +nodeunit tests