commit 0a884ad26a785368a41ddfa4a7f064700320492f
author Sean Condon <sean@opennetworking.org> Mon Oct 28 17:57:21 2019 +0000
committer Sean Condon <sean@opennetworking.org> Mon Nov 04 21:07:45 2019 +0000
tree cc69b12de111186353b6f27be23c7072c34b6af0
parent 41ec14834cbd91539cc7c2357beaa22ca575b383

Upgrading NodeJS to 10.16 and GUI2 to Angular 8

Change-Id: I722ffd8438728e6658a0589aa12b087ad5da8864

web/gui2-topo-lib/BUILD

diff --git a/web/gui2-topo-lib/BUILD b/web/gui2-topo-lib/BUILD
index de0c531..4239b83 100644
--- a/web/gui2-topo-lib/BUILD
+++ b/web/gui2-topo-lib/BUILD
@@ -74,9 +74,7 @@
     name = "gui2-topo-lib-build",
     srcs = [
         "@nodejs//:bin/npm",
-        "@nodejs//:bin/node",
         "@nodejs//:bin/nodejs/bin/node",
-        "@nodejs//:bin/nodejs/bin/npm",
         "//web/gui2-fw-lib:onos-gui2-fw-npm-install",
         "//web/gui2-fw-lib:onos-gui2-fw-ng-build",
         "//web/gui2-fw-lib:gui2_fw_lib_ext_css",
@@ -91,7 +89,7 @@
     cmd = "ROOT=`pwd` &&" +
           " export HOME=. &&" +
           " export XDG_CONFIG_HOME=$(@D)/config &&" +
-          " NODE=$(location @nodejs//:bin/node) &&" +
+          " NODE=$(location @nodejs//:bin/nodejs/bin/node) &&" +
           " INSTALL_FILES=($(locations //web/gui2-fw-lib:onos-gui2-fw-npm-install)) &&" +  # An array of filenames - sorted by time created
           " TOPOLIB_FILES=($(locations //web/gui2-fw-lib:onos-gui2-fw-ng-build)) &&" +  # An array of filenames - sorted by time created
           " mkdir -p web/gui2-topo-lib &&" +
@@ -113,7 +111,7 @@
           "   exit 1;" +
           " fi;" +
           " cp README.md LICENSE dist/gui2-topo-lib && " +
-          " npm pack ./dist/gui2-topo-lib >> $$ROOT/$(location gui2-topo-lib.log) 2>&1 &&" +
+          " $$ROOT/$(location @nodejs//:bin/npm) pack ./dist/gui2-topo-lib >> $$ROOT/$(location gui2-topo-lib.log) 2>&1 &&" +
           " mv gui2-topo-lib-*.tgz $$ROOT/$(location gui2-topo-lib-ver.tgz) &&" +
           " touch $$ROOT/$(location gui2-topo-lib.log)",  # to get the log always as the 2nd file,
     message = "Angular Topo GUI2 build",
@@ -130,9 +128,7 @@
     name = "_gui2-topo-lib-test-genrule",
     srcs = [
         "@nodejs//:bin/npm",
-        "@nodejs//:bin/node",
         "@nodejs//:bin/nodejs/bin/node",
-        "@nodejs//:bin/nodejs/bin/npm",
         "//web/gui2-fw-lib:onos-gui2-fw-npm-install",
         "//web/gui2-fw-lib:onos-gui2-fw-ng-build",
         "//web/gui2-fw-lib:gui2_fw_lib_ext_css",
@@ -148,7 +144,7 @@
     cmd = " ROOT=`pwd` &&" +
           " export HOME=. &&" +
           " export XDG_CONFIG_HOME=$(@D)/config &&" +
-          " NODE=$(location @nodejs//:bin/node) &&" +
+          " NODE=$(location @nodejs//:bin/nodejs/bin/node) &&" +
           " INSTALL_FILES=($(locations //web/gui2-fw-lib:onos-gui2-fw-npm-install)) &&" +  # An array of filenames - sorted by time created
           " FWLIB_FILES=($(locations //web/gui2-fw-lib:onos-gui2-fw-ng-build)) &&" +  # An array of filenames - sorted by time created
           " mkdir -p web/gui2-topo-lib &&" +
@@ -163,7 +159,7 @@
           " chmod +x $$ROOT/web/gui2-topo-lib/node_modules/@angular/cli/bin/ng &&" +
           " export PATH=$$ROOT/$$(dirname $${NODE}):node_modules/@angular/cli/bin:$$PATH &&" +
           " node -v > ../../$(location gui2-topo-lib-ver.log) &&" +
-          " npm -v >> ../../$(location gui2-topo-lib-ver.log) &&" +
+          " $$ROOT/$(location @nodejs//:bin/npm) -v >> ../../$(location gui2-topo-lib-ver.log) &&" +
           " ng version >> ../../$(location gui2-topo-lib-ver.log) &&" +
           " ng lint gui2-topo-lib > ../../$(location gui2-topo-lib-lint.log)  2>&1 ||" +
           " if [ $$? -eq 0 ]; then echo 'Successfully ran lint';" +