Skip to content

Commit c687ccb

Browse files
Sean CondonAndrea-Campanella
authored andcommitted
[ONOS-8033] No Visible Indication for Active Applications in ONOS
Also tidied up onos.service.ts a bit for unused methods Changed error message in Bazel build to point to new location under Bazel 1.0 Change-Id: Ie95f6fbb108386d3632cc8fa6656dc5b699023d9
1 parent 5bae505 commit c687ccb

File tree

11 files changed

+4980
-4412
lines changed

11 files changed

+4980
-4412
lines changed

web/gui2-fw-lib/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ genrule(
166166

167167
"""
168168
Install npm packages listed in package.json in web/gui2
169-
See bazel-genfiles/web/gui2/onos-gui2-npm-install.log for details of the 'npm install'
169+
See bazel-out/k8-fastbuild/bin/web/gui2/onos-gui2-npm-install.log for details of the 'npm install'
170170
"""
171171

172172
genrule(
@@ -200,7 +200,7 @@ genrule(
200200

201201
"""
202202
Run ng build to create outputs in production mode
203-
See bazel-genfiles/web/gui2/onos-gui2-ng-build-prod.log for details of the Angular CLI output
203+
See bazel-out/k8-fastbuild/bin/web/gui2/onos-gui2-ng-build-prod.log for details of the Angular CLI output
204204
"""
205205

206206
genrule(
@@ -235,7 +235,7 @@ genrule(
235235
" if [ $$? -eq 0 ]; then echo 'Successfully built GUI FW library';" +
236236
" else " +
237237
" echo 'Error running \'ng build gui2-fw-lib\' on \'//web/gui2-fw-lib:onos-gui2-fw-ng-build\'. \\\n" +
238-
" See bazel-genfiles/web/gui2-fw-lib/gui2-fw-ng-build-prod.log for more details' >&2;" +
238+
" See bazel-out/k8-fastbuild/bin/web/gui2-fw-lib/gui2-fw-ng-build-prod.log for more details' >&2;" +
239239
" exit 1;" +
240240
" fi;" +
241241
# see https://github.com/angular/angular-cli/issues/11071 - Angular CLI does not yet copy across assets
@@ -252,8 +252,8 @@ genrule(
252252

253253
"""
254254
Run 'ng test' to run Angular test and 'ng lint' for checkstyle
255-
See bazel-genfiles/web/gui2/onos-gui2-fw-ng-lint.log or
256-
bazel-genfiles/web/gui2/onos-gui2-fw-ng-test.log for details of the Angular CLI output
255+
See bazel-out/k8-fastbuild/bin/web/gui2/onos-gui2-fw-ng-lint.log or
256+
bazel-out/k8-fastbuild/bin/web/gui2/onos-gui2-fw-ng-test.log for details of the Angular CLI output
257257
"""
258258

259259
genrule(
@@ -296,7 +296,8 @@ genrule(
296296
" if [ $$? -eq 0 ]; then echo 'Successfully ran lint';" +
297297
" else " +
298298
" echo 'Error running \'ng lint\' on \'//web/gui2-fw-lib:_onos-gui2-fw-ng-test\'. \\\n" +
299-
" See bazel-genfiles/web/gui2-fw-lib/onos-gui2-fw-ng-lint.log for more details' >&2;" +
299+
" See bazel-out/k8-fastbuild/bin/web/gui2-fw-lib/onos-gui2-fw-ng-lint.log for more details' >&2;" +
300+
" cat ../../$(location onos-gui2-fw-ng-lint.log) >&2 ||" +
300301
" exit 1;" +
301302
" fi;" +
302303
" if [ -f /usr/bin/chromium-browser ]; then " + # Add to this for Mac and Chrome
@@ -316,7 +317,7 @@ genrule(
316317
" if [ $$? -eq 0 ]; then echo 'Successfully ran tests';" +
317318
" else " +
318319
" echo 'Error running \'ng test\' on \'//web/gui2-fw-lib:onos-gui2-fw-ng-test\'. \\\n" +
319-
" See bazel-genfiles/web/gui2-fw-lib/onos-gui2-fw-ng-test.log for more details' >&2;" +
320+
" See bazel-out/k8-fastbuild/bin/web/gui2-fw-lib/onos-gui2-fw-ng-test.log for more details' >&2;" +
320321
#" tail -n 100 ../../$(location onos-gui2-fw-ng-test.log) >&2;" +
321322
" exit 1;" +
322323
" fi;",

0 commit comments

Comments
 (0)