Avoid using java in nuveClient installation (#837)

lynckia · Apr 5, 2017 · 445a14b · 445a14b
1 parent b919915
commit 445a14b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,6 @@ addons:
       - libboost-thread-dev
       - libboost-system-dev
       - liblog4cxx10-dev
-      - openjdk-6-jre
       - curl
       - libboost-test-dev
       - yasm

diff --git a/nuve/installNuve.sh b/nuve/installNuve.sh
@@ -28,6 +28,7 @@ fi
 
 nvm use
 npm install --loglevel error amqp express mongojs$MONGO_VERSION aws-sdk log4js node-getopt body-parser
+npm install --loglevel error -g google-closure-compiler-js
 echo [nuve] Done, node_modules installed
 
 cd ../nuveClient/tools

diff --git a/nuve/nuveClient/tools/compile.sh b/nuve/nuveClient/tools/compile.sh
@@ -5,6 +5,6 @@ set -e
 mkdir ../dist || true
 mkdir ../build || true
 
-java -jar compiler.jar --js ../src/hmac-sha1.js --js ../src/N.js --js ../src/N.Base64.js --js ../src/N.API.js --js_output_file ../build/nuve.js
+google-closure-compiler-js ../src/hmac-sha1.js ../src/N.js ../src/N.Base64.js ../src/N.API.js > ../build/nuve.js
 
 ./compileDist.sh
diff --git a/nuve/nuveClient/tools/compileDist.sh b/nuve/nuveClient/tools/compileDist.sh
@@ -5,7 +5,7 @@ set -e
 mkdir ../dist || true
 mkdir ../build || true
 
-java -jar compiler.jar --js ../lib/xmlhttprequest.js --js_output_file ../dist/xmlhttprequest.js
+google-closure-compiler-js ../lib/xmlhttprequest.js > ../dist/xmlhttprequest.js
 
 TARGET=../dist/nuve.js
 

diff --git a/nuve/nuveClient/tools/compiler.jar b/nuve/nuveClient/tools/compiler.jar