BUCK GUI: Excluded generated javascript files from genrule
Removed the NPM Lock file that generated.
Change-Id: Ia2d16f28a3a11056f8eaed2805684020b9d2c4eb
diff --git a/web/gui/BUCK b/web/gui/BUCK
index e15ce91..cacd7b7 100644
--- a/web/gui/BUCK
+++ b/web/gui/BUCK
@@ -46,11 +46,10 @@
genrule(
name = 'onos-tools-gui',
- srcs = ['src/main/webapp'],
+ srcs = glob(['src/main/webapp/**/*.js'], excludes = ['src/main/webapp/dist/*.js']),
bash = '$(location :onos-tools-gui-exe) '
+ '$(location //web/gui:node-release-v8.1.2) '
+ '$(location //web/gui:node-bin-v8.1.2) > $OUT',
- cmd_exe = '',
out = 'onos-tools-gui.log',
visibility = [ 'PUBLIC' ],
)
diff --git a/web/gui/onos-gui-build b/web/gui/onos-gui-build
index 98b5623..b0bb79f 100755
--- a/web/gui/onos-gui-build
+++ b/web/gui/onos-gui-build
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
ONOS_INSTALL_LOCATION=$2
echo ${ONOS_INSTALL_LOCATION}
@@ -8,9 +9,13 @@
cd $ONOS_ROOT/tools/gui
+# Ensure lock file is removed
+rm -f package-lock.json
+
# Install Project Dependencies
echo "Installing project dependencies"
npm install --loglevel=error
+rm -f package-lock.json
# Build the GUI Project
echo "Packaging JavaScript and CSS"
diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index a71a04e..844fd46 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -17,6 +17,7 @@
/*
ONOS GUI -- Main Application Module
*/
+
(function () {
'use strict';