ONOS-7200: Fixed GUI build times
Improved the selectiveness of the source file within the rule
Stopped the bash script from reinstalling NPM depenancies - This was likely left in by mistake when
there were NPM issues when this build step was first introduced
Change-Id: I5364fc8818e37659cdcf11bd19750f0ba1b85a10
diff --git a/web/gui/BUCK b/web/gui/BUCK
index b295c7f..0886623 100644
--- a/web/gui/BUCK
+++ b/web/gui/BUCK
@@ -49,7 +49,7 @@
genrule(
name = 'onos-tools-gui',
- srcs = glob(['src/main/webapp/**/*.js'], excludes = ['src/main/webapp/dist/*.js']),
+ srcs = glob(['src/main/webapp/*.js', 'src/main/webapp/app/**/*.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',
diff --git a/web/gui/onos-gui-build b/web/gui/onos-gui-build
index 0b43815..b6ea278 100755
--- a/web/gui/onos-gui-build
+++ b/web/gui/onos-gui-build
@@ -10,7 +10,6 @@
cd $ONOS_ROOT/tools/gui
# Ensure lock file is removed
-rm -rf node_modules
rm -f package-lock.json
# Install Project Dependencies