Closure compiler in javascript (#819)

lynckia · Mar 23, 2017 · 522b3f6 · 522b3f6
1 parent 1bd84a6
commit 522b3f6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/erizo_controller/erizoClient/tools/compile.bat b/erizo_controller/erizoClient/tools/compile.bat
diff --git a/erizo_controller/erizoClient/tools/compile.sh b/erizo_controller/erizoClient/tools/compile.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-java -jar compiler.jar --js ../lib/socket.io.js --js ../src/Events.js --js ../src/webrtc-stacks/FcStack.js --js ../src/webrtc-stacks/BowserStack.js --js ../src/webrtc-stacks/FirefoxStack.js --js ../src/webrtc-stacks/ChromeStableStack.js --js ../src/webrtc-stacks/ChromeCanaryStack.js --js ../src/Connection.js --js ../src/Stream.js --js ../src/Room.js --js ../src/utils/L.Logger.js --js ../src/utils/L.Base64.js --js ../src/utils/L.Resizer.js --js ../src/views/View.js --js ../src/views/VideoPlayer.js --js ../src/views/AudioPlayer.js --js ../src/views/Bar.js --js ../src/views/Speaker.js --js_output_file ../dist/erizo.js
+google-closure-compiler-js ../lib/socket.io.js ../src/Events.js ../src/webrtc-stacks/FcStack.js ../src/webrtc-stacks/BowserStack.js ../src/webrtc-stacks/FirefoxStack.js ../src/webrtc-stacks/ChromeStableStack.js ../src/webrtc-stacks/ChromeCanaryStack.js ../src/Connection.js ../src/Stream.js ../src/Room.js ../src/utils/L.Logger.js ../src/utils/L.Base64.js ../src/utils/L.Resizer.js ../src/views/View.js ../src/views/VideoPlayer.js ../src/views/AudioPlayer.js ../src/views/Bar.js ../src/views/Speaker.js > ../dist/erizo.js
diff --git a/erizo_controller/erizoClient/tools/compilefc.sh b/erizo_controller/erizoClient/tools/compilefc.sh
@@ -8,7 +8,7 @@ fi
 
 mkdir ../build
 
-java -jar compiler.jar --js ../src/Events.js --js ../src/webrtc-stacks/FcStack.js --js ../src/webrtc-stacks/ChromeStableStack.js --js ../src/webrtc-stacks/ChromeCanaryStack.js --js ../src/Connection.js --js ../src/Stream.js --js ../src/Room.js --js ../src/utils/L.Logger.js --js ../src/utils/L.Base64.js --js ../src/views/View.js --js ../src/views/VideoPlayer.js --js ../src/views/AudioPlayer.js --js ../src/views/Bar.js --js ../src/views/Speaker.js --js_output_file ../build/erizofc.js
+google-closure-compiler-js ../src/Events.js ../src/webrtc-stacks/FcStack.js ../src/webrtc-stacks/ChromeStableStack.js ../src/webrtc-stacks/ChromeCanaryStack.js ../src/Connection.js ../src/Stream.js ../src/Room.js ../src/utils/L.Logger.js ../src/utils/L.Base64.js ../src/views/View.js ../src/views/VideoPlayer.js ../src/views/AudioPlayer.js ../src/views/Bar.js ../src/views/Speaker.js > ../build/erizofc.js
 
 TARGET=../dist/erizofc.js
 

diff --git a/erizo_controller/erizoClient/tools/compiler.jar b/erizo_controller/erizoClient/tools/compiler.jar
diff --git a/erizo_controller/installErizo_controller.sh b/erizo_controller/installErizo_controller.sh
@@ -14,6 +14,7 @@ echo [erizo_controller] Installing node_modules for erizo_controller
 
 nvm use
 npm install --loglevel error amqp socket.io@0.9.16 log4js node-getopt
+npm install --loglevel error -g google-closure-compiler-js
 
 echo [erizo_controller] Done, node_modules installed
 

diff --git a/scripts/installUbuntuDeps.sh b/scripts/installUbuntuDeps.sh
@@ -69,7 +69,7 @@ install_apt_deps(){
   sudo apt-get install -qq software-properties-common -y
   sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   sudo apt-get update -y
-  sudo apt-get install -qq git make gcc-5 g++-5 libssl-dev cmake libglib2.0-dev pkg-config libboost-regex-dev libboost-thread-dev libboost-system-dev liblog4cxx10-dev rabbitmq-server mongodb openjdk-6-jre curl libboost-test-dev -y
+  sudo apt-get install -qq git make gcc-5 g++-5 libssl-dev cmake libglib2.0-dev pkg-config libboost-regex-dev libboost-thread-dev libboost-system-dev liblog4cxx10-dev rabbitmq-server mongodb curl libboost-test-dev -y
   sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
 
   sudo chown -R `whoami` ~/.npm ~/tmp/ || true