Browse Source

Merge pull request #6862 from GordonSmith/HPCC-12874

HPCC-12874 Improved Visualization Build

Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 years ago
parent
commit
3405cfbd54
2 changed files with 5 additions and 6 deletions
  1. 4 5
      esp/build.sh
  2. 1 1
      esp/src/Visualization

+ 4 - 5
esp/build.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 #!/usr/bin/env bash
+echoerr() { echo "$@" 1>&2; }
 
 
 set -e
 set -e
 
 
@@ -26,7 +27,7 @@ rm -rf "$DISTDIR"
 echo " Done"
 echo " Done"
 
 
 if [ ! -d "$TOOLSDIR" ]; then
 if [ ! -d "$TOOLSDIR" ]; then
-    echo "Can't find Dojo build tools -- did you initialise submodules? (git submodule update --init --recursive)"
+    echoerr "ERROR:  Can't find Dojo build tools -- did you initialise submodules? (git submodule update --init --recursive)"
     exit 1
     exit 1
 fi
 fi
 
 
@@ -41,16 +42,14 @@ perl -pe "
 
 
 echo "Building: $SRCDIR/Visualization"
 echo "Building: $SRCDIR/Visualization"
 cd "$SRCDIR/Visualization/"
 cd "$SRCDIR/Visualization/"
-./build.sh
-mkdir -p "$DISTDIR/Visualization"
-cp -r "$SRCDIR/Visualization/build" "$DISTDIR/Visualization/widgets"
+./build.sh "$DISTDIR/Visualization/widgets"
 
 
 cd "$TOOLSDIR"
 cd "$TOOLSDIR"
 
 
 if which node >/dev/null; then
 if which node >/dev/null; then
     node ../../dojo/dojo.js baseUrl=../../dojo load=build --profile "$PROFILE" --releaseDir "$DISTDIR" ${*:2}
     node ../../dojo/dojo.js baseUrl=../../dojo load=build --profile "$PROFILE" --releaseDir "$DISTDIR" ${*:2}
 else
 else
-    echo "node.js is required to build ECL Watch - see https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager"
+    echoerr "ERROR:  node.js is required to build - see https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager"
     exit 1
     exit 1
 fi
 fi
 
 

+ 1 - 1
esp/src/Visualization

@@ -1 +1 @@
-Subproject commit f4193ed0c3960452b808a00f6f17e61ca0a51056
+Subproject commit 1074723616023d5e04f03576b390f01b51e57231