Fix Build Errors

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>

esp/CMakeLists.txt

@@ -27,6 +27,17 @@ HPCC_ADD_SUBDIRECTORY (tools "CLIENTTOOLS")
 HPCC_ADD_SUBDIRECTORY (xslt "PLATFORM")
 
 if ( PLATFORM )
-    install ( CODE "message(\"Building ECL Watch\")\nexecute_process(COMMAND \"${CMAKE_CURRENT_SOURCE_DIR}/build.sh\" \"${CMAKE_CURRENT_BINARY_DIR}/tmp/files\" ERROR_QUIET)" COMPONENT Runtime)
-    Install ( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tmp/files" DESTINATION componentfiles COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN "CMakeLists.txt" EXCLUDE )
+    set(ECLWATCH_BUILD_DEST "${CMAKE_CURRENT_BINARY_DIR}/tmp/files")
+    set(ECLWATCH_BUILD_OUT "${CMAKE_CURRENT_BINARY_DIR}/eclwatch_build_out.txt")
+    set(ECLWATCH_BUILD_ERR "${CMAKE_CURRENT_BINARY_DIR}/eclwatch_build_err.txt")
+    install ( CODE "
+        message(\"Run Dojo build tool...\")
+        message(\"Dojo build:  Build Target - ${ECLWATCH_BUILD_DEST}\")
+        message(\"Dojo build:  Output log - ${ECLWATCH_BUILD_OUT}\")
+        message(\"Dojo build:  Error log - ${ECLWATCH_BUILD_ERR}\")
+        execute_process(COMMAND \"${CMAKE_CURRENT_SOURCE_DIR}/build.sh\" \"${ECLWATCH_BUILD_DEST}\" OUTPUT_FILE \"${ECLWATCH_BUILD_OUT}\" ERROR_FILE \"${ECLWATCH_BUILD_ERR}\")
+        execute_process(COMMAND \"tail\" \"--lines=4\" \"${ECLWATCH_BUILD_DEST}/build-report.txt\")
+        message(\"\")
+    " COMPONENT Runtime)
+    Install ( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tmp/files" DESTINATION componentfiles COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN "build-report.txt" EXCLUDE PATTERN "*.map" EXCLUDE  PATTERN "*.uncompressed.js" EXCLUDE)
 endif ( PLATFORM )

esp/src/eclwatch/dojoConfig.js

@@ -12,8 +12,8 @@ var dojoConfig = (function () {
             hash: hashNodes.length >= 2 ? hashNodes[1] : "",
             params: searchNodes.length >= 2 ? searchNodes[1] : "",
             basePath: "/esp/files",
-            resourcePath: "/esp/files",
-            scriptsPath: "/esp/files/scripts"
+            resourcePath: "/esp/files/eclwatch",
+            scriptsPath: "/esp/files/eclwatch"
         };
     }
 
@@ -33,6 +33,12 @@ var dojoConfig = (function () {
             return "<img src='" + this.getImageURL(name) + "'/>";
         },
         packages: [{
+            name: "d3",
+            location: urlInfo.basePath + "/d3"
+        }, {
+            name: "topojson",
+            location: urlInfo.basePath + "/topojson"
+        }, {
             name: "hpcc",
             location: urlInfo.scriptsPath
         }, {

esp/src/eclwatch/viz/DojoD3.js

@@ -6,8 +6,10 @@
   "dojo/dom-geometry",
   "dojo/Evented",
 
-  "d3/d3.v3.min"
-], function (declare, lang, dom, domConstruct, domGeom, Evented) {
+  "d3/d3"
+
+], function (declare, lang, dom, domConstruct, domGeom, Evented,
+    d3) {
     return declare([Evented], {
         constructor: function () {
         },

esp/src/eclwatch/viz/DojoD3BarChart.js

@@ -5,9 +5,13 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+
   "dojo/text!./templates/DojoD3BarChart.css"
+
 ], function (declare, lang,
     DojoD3, Mapping,
+    d3,
     css) {
     return declare([Mapping, DojoD3], {
         mapping: {

esp/src/eclwatch/viz/DojoD3Choropeth.js

@@ -7,13 +7,16 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+  "topojson/topojson",
+
   "dojo/text!./map/us.json",
   "dojo/text!./map/us_counties.json",
-  "dojo/text!./templates/DojoD3Choropeth.css",
+  "dojo/text!./templates/DojoD3Choropeth.css"
 
-  "d3/topojson.v1.min"
 ], function (declare, lang, arrayUtil, JSON,
     DojoD3, Mapping,
+    d3, topojson,
     us, us_counties, css) {
     return declare([Mapping, DojoD3], {
         mapping: {

esp/src/eclwatch/viz/DojoD3CooccurrenceGraph.js

@@ -6,9 +6,13 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+
   "dojo/text!./templates/DojoD3CooccurrenceGraph.css"
+
 ], function (declare, lang, arrayUtil,
     DojoD3, Mapping,
+    d3,
     css) {
     return declare([Mapping, DojoD3], {
         mapping:{

esp/src/eclwatch/viz/DojoD3Histogram.js

@@ -6,9 +6,13 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+
   "dojo/text!./templates/DojoD3Histogram.css"
+
 ], function (declare, lang, arrayUtil,
     DojoD3, Mapping,
+    d3,
     css) {
     return declare([Mapping, DojoD3], {
         mapping: {

esp/src/eclwatch/viz/DojoD3PieChart.js

@@ -6,9 +6,13 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+
   "dojo/text!./templates/DojoD3PieChart.css"
+
 ], function (declare, lang, arrayUtil,
     DojoD3, Mapping,
+    d3,
     css) {
     return declare([Mapping, DojoD3], {
         mapping:{

esp/src/eclwatch/viz/DojoD3ScatterChart.js

@@ -5,9 +5,13 @@ define([
   "./DojoD3",
   "./Mapping",
 
+  "d3/d3",
+
   "dojo/text!./templates/DojoD3ScatterChart.css"
+
 ], function (declare, lang,
     DojoD3, Mapping,
+    d3,
     css) {
     return declare([Mapping, DojoD3], {
         mapping: {

esp/src/eclwatch/viz/DojoSlider.js

@@ -22,7 +22,7 @@ define([
                 slider: {
                     display: "Slider Data",
                     fields: {
-                        label: "Label",
+                        label: "Label"
                     }
                 }
             });

esp/src/stub.htm

@@ -25,7 +25,7 @@
     <script src="/esp/files/CodeMirror2/lib/util/foldcode.js"></script>
     <script src="/esp/files/CodeMirror2/mode/ecl/ecl.js"></script>
     <script src="/esp/files/CodeMirror2/mode/xml/xml.js"></script>
-    <link href="/esp/files/css/ecl.css" rel="stylesheet">
+    <link href="/esp/files/eclwatch/css/ecl.css" rel="stylesheet">
     <link href="/esp/files/dijit/themes/claro/claro.css" media="screen" rel="stylesheet">
     <link href="/esp/files/dojox/grid/resources/Grid.css" rel="stylesheet">
     <link href="/esp/files/dojox/grid/enhanced/resources/claro/EnhancedGrid.css" rel="stylesheet">
@@ -36,9 +36,9 @@
     <link href="/esp/files/dojox/form/resources/UploaderFileList.css" rel="stylesheet">
     <link href="/esp/files/dgrid/css/dgrid.css" rel="stylesheet">
     <link href="/esp/files/dgrid/css/skins/claro.css" rel="stylesheet">
-    <link href="/esp/files/css/hpcc.css" rel="stylesheet">
+    <link href="/esp/files/eclwatch/css/hpcc.css" rel="stylesheet">
     <!-- load dojo and provide config via dojoConfig global -->
-    <script src="/esp/files/scripts/dojoConfig.js"></script>
+    <script src="/esp/files/eclwatch/dojoConfig.js"></script>
     <script src="/esp/files/dojo/dojo.js"></script>
     <script>
         require(["hpcc/stub"], function (stub) {

esp/src/topojson

@@ -1 +1 @@
-Subproject commit 2c5aa0150004cd86e0dbf67d8c8e43ae36fccd67
+Subproject commit 94d2786c3435c916c87ed043a57893d1a9fe9911