Permalink
Browse files

[BUG #6263] moved qx-oo jobs from framework/config.json to server/con…

…fig.json

- the old qx-oo jobs are available and run, as
  source (formerly qxoo-noopt)
  build  (formerly qxoo-build)
  api    (formerly qxoo-api)
  • Loading branch information...
1 parent de9758b commit 7f2dc2e276fd86e03f88273dfda4cb8153dd4be0 @thron7 thron7 committed Mar 27, 2012
Showing with 126 additions and 147 deletions.
  1. +1 −0 component/standalone/server/.gitignore
  2. +124 −30 component/standalone/server/config.json
  3. +1 −117 framework/config.json
@@ -5,3 +5,4 @@
/simulator/
/test/
/source/script/
+/script/
@@ -4,7 +4,15 @@
"include" :
[
{
- "path" : "${QOOXDOO_PATH}/tool/data/config/application.json"
+ "path" : "${QOOXDOO_PATH}/tool/data/config/application.json",
+ "block" :
+ [
+ "build",
+ "build-script",
+ "build-resources",
+ "source",
+ "source-script"
+ ]
}
],
@@ -15,21 +23,13 @@
"build",
"clean",
"distclean",
- "fix",
"info",
"inspector",
- "lint",
"migration",
- "pretty",
"profiling",
"source",
- "source-all",
- "source-hybrid",
- "simulation-build",
- "simulation-run",
"test",
- "test-source",
- "translation"
+ "test-source"
],
"default-job" : "source-hybrid",
@@ -42,44 +42,138 @@
"API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"],
"LOCALES" : [ "en" ],
"CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache",
+ "BUILD_PATH" : "script",
"ROOT" : "."
},
- // You only need to edit the remainder of this file, if you want to customize
- // specific jobs, or add own job definitions.
+ "config-warnings" :
+ {
+ "job-shadowing" :
+ [
+ "api"
+ ]
+ },
"jobs" :
{
- // Uncomment the following entry to add a contrib or library to your
- // project; make sure to adapt the path to the Manifest.json; if you are
- // using a contrib: library, it will be downloaded into the path specified
- // by the 'cache/downloads' config key
- /*
- "libraries" :
+ "qxoo-common" :
{
+ "config-warnings" :
+ {
+ "exclude" : ["qx.event.GlobalError"]
+ },
+
"library" :
[
{
- "manifest" : "contrib://SkeletonApplication/trunk/Manifest.json"
+ "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json",
+ "uri" : ".."
}
- ]
- }
- */
+ ],
+
+ "extend" : [ "cache" ],
+
+ "include" :
+ [
+ "qx.Class",
+ "qx.Mixin",
+ "qx.Interface"
+ ],
+
+ "exclude" :
+ [
+ "qx.event.GlobalError"
+ ],
+
+ "environment" :
+ {
+ "qx.debug" : false,
+ "qx.debug.dispose" : false,
+ "qx.debug.databinding" : false,
+ "qx.aspects" : false,
+ "qx.globalErrorHandling" : false
+ },
+
+ "compile-options" :
+ {
+ "paths" :
+ {
+ "loader-template" : "${QOOXDOO_PATH}/tool/data/generator/oo.loader.tmpl.js"
+ },
+ "uris" :
+ {
+ "script" : ".",
+ "resource" : "."
+ }
+ }
+ },
- // If you want to tweak a job setting, see the following sample where
- // the "format" feature of the "build-script" job is overridden.
- // To see a list of available jobs, invoke 'generate.py x'.
- /*
- ,"build-script" :
+ "build" :
{
- "compile-options" :
+ "desc" : "a basic qooxdoo OO library",
+ "extend" : [ "qxoo-common" ],
+
+ "compile-options" :
{
+ "paths" :
+ {
+ "file" : "${BUILD_PATH}/qx-oo.js",
+ "app-root" : "."
+ },
+ "code" :
+ {
+ "format" : true,
+ "except" : [],
+ "optimize" : [ "variables", "basecalls", "privates", "strings", "variants" ]
+ }
+ },
+ "compile" : { "type" : "build" }
+ },
+
+
+ "source" :
+ {
+ "desc" : "a basic qooxdoo OO library (non-optimized)",
+ "extend" : [ "qxoo-common" ],
+
+ "compile-options" :
+ {
+ "paths" :
+ {
+ "file" : "${BUILD_PATH}/qx-oo-noopt.js",
+ "app-root" : "."
+ },
"code" :
{
- "format" : false
+ "format" : true,
+ "except" : [],
+ "optimize" : [ ]
}
+ },
+ "compile" : { "type" : "build" }
+ },
+
+
+ "api" :
+ {
+ "desc" : "create api doc for qxoo",
+ "=library" : [
+ {
+ "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"
+ },
+ {
+ "manifest" : "${QOOXDOO_PATH}/component/apiviewer/Manifest.json"
+ },
+ {
+ "manifest" : "${QOOXDOO_PATH}/component/library/versionlabel/Manifest.json"
+ }
+ ],
+ "let" :
+ {
+ "BUILD_PATH" : "./api",
+ "API_INCLUDE" : ["qx.Class", "qx.Mixin", "qx.Interface"],
+ "API_EXCLUDE" : ["qx.test.*", "qx.event.GlobalError"]
}
}
- */
}
}
View
@@ -29,10 +29,7 @@
"test-source",
"test-performance",
"test-performance-source",
- "translation",
- "qxoo-build",
- "qxoo-noopt",
- "qxoo-api"
+ "translation"
],
@@ -76,119 +73,6 @@
"jobs":
{
- "qxoo" :
- {
- "config-warnings" :
- {
- "exclude" : ["qx.event.GlobalError"]
- },
-
- "library" :
- [
- {
- "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json",
- "uri" : ".."
- }
- ],
-
- "extend" : [ "cache" ],
-
- "include" :
- [
- "qx.Class",
- "qx.Mixin",
- "qx.Interface"
- ],
-
- "exclude" :
- [
- "qx.event.GlobalError"
- ],
-
- "environment" :
- {
- "qx.debug" : false,
- "qx.debug.dispose" : false,
- "qx.debug.databinding" : false,
- "qx.aspects" : false,
- "qx.globalErrorHandling" : false
- },
-
- "compile-options" :
- {
- "paths" :
- {
- "loader-template" : "../tool/data/generator/oo.loader.tmpl.js"
- },
- "uris" :
- {
- "script" : ".",
- "resource" : "."
- }
- }
- },
-
-
- "qxoo-build" :
- {
- "desc" : "a basic qooxdoo OO library",
- "extend" : [ "qxoo" ],
-
- "compile-options" :
- {
- "paths" :
- {
- "file" : "build/script/qx-oo.js",
- "app-root" : "."
- },
- "code" :
- {
- "format" : true,
- "except" : [],
- "optimize" : [ "variables", "basecalls", "privates", "strings", "variants" ]
- }
- },
- "compile" : { "type" : "build" }
- },
-
-
- "qxoo-noopt" :
- {
- "desc" : "a basic qooxdoo OO library (non-optimized)",
- "extend" : [ "qxoo" ],
-
- "compile-options" :
- {
- "paths" :
- {
- "file" : "build/script/qx-oo-noopt.js",
- "app-root" : "."
- },
- "code" :
- {
- "format" : true,
- "except" : [],
- "optimize" : [ ]
- }
- },
- "compile" : { "type" : "build" }
- },
-
-
- "qxoo-api" :
- {
- "desc" : "create api doc for qxoo",
- "extend" : [ "apiconf::build" ],
- "let" :
- {
- "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/component/apiviewer",
- "BUILD_PATH" : "${ROOT}/qxoo_api",
- "API_INCLUDE" : ["qx.Class", "qx.Mixin", "qx.Interface"],
- "API_EXCLUDE" : ["qx.test.*", "qx.event.GlobalError"]
- }
- },
-
-
"build-all" :
{
"library" :

0 comments on commit 7f2dc2e

Please sign in to comment.