git-svn-id: https://svn.argeo.org/slc/trunk@2380 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

[gpl/argeo-slc.git] / org.argeo.slc.webapp / config.json

diff --git a/org.argeo.slc.webapp/config.json b/org.argeo.slc.webapp/config.json
index 9ba200ec7ecb317b6de45da8f18a5223e3139561..00f91d82d20049a74a5fcdbd154e73325f6490b4 100644 (file)
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -4,11 +4,11 @@
   "include" :\r
   [\r
     {\r
-      "path" : "src/main/webapp/qooxdoo-0.8-sdk/component/apiviewer/api.json",\r
+      "path" : "${QOOXDOO_PATH}/component/apiviewer/api.json",\r
       "as"   : "apiconf"\r
     },\r
     {\r
-      "path" : "src/main/webapp/qooxdoo-0.8-sdk/component/testrunner/testrunner.json",\r
+      "path" : "${QOOXDOO_PATH}/component/testrunner/testrunner.json",\r
       "as"   : "testrunner"\r
     }    \r
   ],\r
@@ -16,8 +16,7 @@
   "let" :\r
   {\r
     "APPLICATION"  : "org.argeo.ria",\r
-    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-0.8-sdk/framework",\r
-    "QOOXDOO_URI"  : "../qooxdoo-0.8-sdk/framework",\r
+    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-sdk",\r
     "QXTHEME"      : "qx.theme.Modern",\r
        "QXICONTHEME"  : ["Tango"],\r
     "API_EXCLUDE"  : ["qx.legacy.*"],\r
@@ -27,7 +26,7 @@
        "RIA_LIB_PATH" : "src/main/webapp/argeo-ria-lib",\r
        "RIA_LIB_URI"  : "../argeo-ria-lib",\r
        "CACHE"            : "cache" ,\r
-       "CUSTOM_PERSPECTIVE" : "org.argeo.slc.web.Perspective"\r
+       "CUSTOM_PACKAGE" : "org.argeo.slc.web"\r
   },\r
 \r
   "jobs" : \r
@@ -37,27 +36,23 @@
       "library" :\r
       [\r
         {\r
-          "manifest" : "${QOOXDOO_PATH}/Manifest.json",\r
-          "uri"      : "${QOOXDOO_URI}"\r
+          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"\r
         },\r
         {\r
-          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",\r
-          "uri"      : "${RIA_LIB_URI}/slc-web"\r
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json"\r
         },\r
         {\r
-          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",\r
-          "uri"      : "${RIA_LIB_URI}/slc"\r
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json"\r
         },\r
         {\r
-          "manifest" : "${ROOT}/Manifest.json",\r
-          "uri"      : ".."\r
+          "manifest" : "${ROOT}/Manifest.json"\r
         }\r
       ],\r
 \r
       "include" :\r
       [\r
         "${APPLICATION}.Application",\r
-        "${CUSTOM_PERSPECTIVE}",\r
+        "${CUSTOM_PACKAGE}.*",\r
         "${QXTHEME}"\r
       ],\r
 \r
@@ -71,7 +66,7 @@
         "qx.version"     : "${QXVERSION}",\r
         "qx.theme"       : "${QXTHEME}",\r
         "qx.application" : "${APPLICATION}.Application",\r
-               "ria.Perspective": "${CUSTOM_PERSPECTIVE}"\r
+        "ria.StartupPerspective":"org.argeo.slc.web.Perspective"               \r
       }\r
     },\r
 \r
@@ -85,7 +80,8 @@
       {\r
         "file" : "${ROOT}/script/${APPLICATION}.js",\r
         "locales" : "${LOCALES}",\r
-        "root" : "${ROOT}"\r
+        "root" : "${ROOT}",\r
+        "gzip" : false\r
       }\r
     },\r
 \r
@@ -111,13 +107,31 @@
 \r
       "compile-dist" :\r
       {\r
+                 "paths" :\r
+                 {\r
+               "file" : "${BUILD_PATH}/script/${APPLICATION}.js",\r
+                   "gzip"     : false\r
+                 },\r
+                 "uris" :\r
+                 {\r
+                   "script"   : "script",\r
+                   "resource" : "resource"\r
+                 },\r
+                 "code" :\r
+                 {\r
+                   "format"   : true,\r
+                   "locales"  : "${LOCALES}",\r
+                   "optimize" : ["variables", "basecalls", "privates", "strings"]\r
+                 }\r
+      /*\r
+      "file" : "${BUILD_PATH}/script/${APPLICATION}.js",\r
         "target" : "${BUILD_PATH}",\r
-        "file" : "${BUILD_PATH}/script/${APPLICATION}.js",\r
         "uri"  : "script/${APPLICATION}.js",\r
         "root" : "${BUILD_PATH}",\r
         "format" : "on",\r
         "locales" : "${LOCALES}",\r
         "optimize" : ["basecalls", "variables", "privates", "strings"]\r
+       */\r
       }\r
     },\r
 \r
@@ -164,9 +178,9 @@
 \r
       "let" :\r
       {\r
-        "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/../component/apiviewer",\r
+        "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/component/apiviewer",\r
         "BUILD_PATH" : "./target/site/argeo-ria-api/",\r
-        "API_INCLUDE" : ["${APPLICATION}.*", "${CUSTOM_PERSPECTIVE}"]\r
+        "API_INCLUDE" : ["${APPLICATION}.*", "${CUSTOM_PACKAGE}.*"]\r
       },\r
 \r
       "library" :\r
@@ -192,7 +206,7 @@
 \r
       "let" :\r
       {\r
-        "TESTRUNNER_ROOT" : "${QOOXDOO_PATH}/../component/testrunner",\r
+        "TESTRUNNER_ROOT" : "${QOOXDOO_PATH}/component/testrunner",\r
         "TEST_INCLUDE"    : "${APPLICATION}.test.*",\r
         "BUILD_PATH"      : "./target/site/argeo-ria-test/"\r
       },\r