You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/04/20 19:32:14 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - cross-compiled
JS files now go into a subdir in the project and then into the SWC. They also
get copied into frameworks/js/FlexJS/libs for now for backward compatibility
and to make it faster to see c
Repository: flex-asjs
Updated Branches:
refs/heads/develop 50889a818 -> eabf1d412
cross-compiled JS files now go into a subdir in the project and then into the SWC. They also get copied into frameworks/js/FlexJS/libs for now for backward compatibility and to make it faster to see changes to JS files as you develop them.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/eabf1d41
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/eabf1d41
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/eabf1d41
Branch: refs/heads/develop
Commit: eabf1d4129ef742e86fbbd87276c44443eb7db06
Parents: c889b40
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 20 10:32:03 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 20 10:32:10 2015 -0700
----------------------------------------------------------------------
frameworks/build.xml | 19 +++++++++++++++++++
frameworks/projects/Binding/build.xml | 8 ++++++--
frameworks/projects/Binding/compile-config.xml | 6 ++++++
frameworks/projects/Charts/build.xml | 8 ++++++--
.../projects/Charts/compile-asjs-config.xml | 3 ---
frameworks/projects/Charts/compile-config.xml | 8 ++++++++
.../projects/Collections/compile-config.xml | 2 ++
frameworks/projects/Core/build.xml | 8 ++++++--
frameworks/projects/Core/compile-config.xml | 6 ++++++
frameworks/projects/CreateJS/compile-config.xml | 4 ++++
frameworks/projects/DragDrop/build.xml | 8 ++++++--
frameworks/projects/DragDrop/compile-config.xml | 6 ++++++
frameworks/projects/Effects/build.xml | 8 ++++++--
frameworks/projects/Effects/compile-config.xml | 6 ++++++
frameworks/projects/Formatters/build.xml | 8 ++++++--
.../projects/Formatters/compile-config.xml | 6 ++++++
.../projects/GoogleMaps/compile-config.xml | 4 ++++
frameworks/projects/Graphics/compile-config.xml | 2 ++
frameworks/projects/HTML/build.xml | 8 ++++++--
frameworks/projects/HTML/compile-config.xml | 8 ++++++++
frameworks/projects/HTML5/compile-config.xml | 4 ++++
frameworks/projects/JQuery/compile-config.xml | 4 ++++
frameworks/projects/Mobile/build.xml | 8 ++++++--
frameworks/projects/Mobile/compile-config.xml | 6 ++++++
frameworks/projects/Network/compile-config.xml | 2 ++
25 files changed, 141 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index dcfbcc2..654d6d6 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -130,6 +130,25 @@
<ant dir="${basedir}/projects/Network" target="lint-js"/>
</target>
+ <target name="re-compile" description="Builds all SWCs which should pick up the JS files from asjs">
+ <!-- order may matter due to dependencies -->
+ <ant dir="${basedir}/projects/Core" target="compile"/>
+ <ant dir="${basedir}/projects/Graphics" target="compile"/>
+ <ant dir="${basedir}/projects/Binding" target="compile"/>
+ <ant dir="${basedir}/projects/HTML" target="compile"/>
+ <ant dir="${basedir}/projects/Charts" target="compile"/>
+ <ant dir="${basedir}/projects/Collections" target="compile"/>
+ <ant dir="${basedir}/projects/CreateJS" target="compile"/>
+ <ant dir="${basedir}/projects/DragDrop" target="compile"/>
+ <ant dir="${basedir}/projects/Effects" target="compile"/>
+ <ant dir="${basedir}/projects/Formatters" target="compile"/>
+ <ant dir="${basedir}/projects/GoogleMaps" target="compile"/>
+ <ant dir="${basedir}/projects/HTML5" target="compile"/>
+ <ant dir="${basedir}/projects/JQuery" target="compile"/>
+ <ant dir="${basedir}/projects/Mobile" target="compile"/>
+ <ant dir="${basedir}/projects/Network" target="compile"/>
+ </target>
+
<target name="js" depends="compile-asjs, lint-js" />
<target name="other.locales" description ="Builds resource SWCs for all locales">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 5b3a23a..204b82a 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -68,6 +68,8 @@
<echo message="Compiling libs/Binding.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Binding/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -105,7 +106,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -119,6 +120,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Binding/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/compile-config.xml b/frameworks/projects/Binding/compile-config.xml
index 12e20c9..b2a4c59 100644
--- a/frameworks/projects/Binding/compile-config.xml
+++ b/frameworks/projects/Binding/compile-config.xml
@@ -61,6 +61,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index 034c929..9461194 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -68,6 +68,8 @@
<echo message="Compiling libs/Charts.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Charts/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -105,7 +106,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -119,6 +120,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/compile-asjs-config.xml b/frameworks/projects/Charts/compile-asjs-config.xml
index a89e04b..f82f1c7 100644
--- a/frameworks/projects/Charts/compile-asjs-config.xml
+++ b/frameworks/projects/Charts/compile-asjs-config.xml
@@ -55,9 +55,6 @@
<warn-no-constructor>false</warn-no-constructor>
</compiler>
- <include-file>
- </include-file>
-
<include-sources>
<path-element>asjs/src</path-element>
</include-sources>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/compile-config.xml b/frameworks/projects/Charts/compile-config.xml
index c8e301e..588688e 100644
--- a/frameworks/projects/Charts/compile-config.xml
+++ b/frameworks/projects/Charts/compile-config.xml
@@ -66,6 +66,14 @@
<name>defaults.css</name>
<path>asjs/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>ChartsClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Collections/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/compile-config.xml b/frameworks/projects/Collections/compile-config.xml
index 57a6cdf..fdb1921 100644
--- a/frameworks/projects/Collections/compile-config.xml
+++ b/frameworks/projects/Collections/compile-config.xml
@@ -60,6 +60,8 @@
</compiler>
<include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 513f574..e7826a3 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -69,6 +69,8 @@
<echo message="Compiling libs/Core.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Core/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Core/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-config.xml b/frameworks/projects/Core/compile-config.xml
index fe4ac4e..718bf56 100644
--- a/frameworks/projects/Core/compile-config.xml
+++ b/frameworks/projects/Core/compile-config.xml
@@ -64,6 +64,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/CreateJS/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/compile-config.xml b/frameworks/projects/CreateJS/compile-config.xml
index 6f0358c..96f74fd 100644
--- a/frameworks/projects/CreateJS/compile-config.xml
+++ b/frameworks/projects/CreateJS/compile-config.xml
@@ -64,6 +64,10 @@
<name>defaults.css</name>
<path>as/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>CreateJSClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 52f668a..b5db45b 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -69,6 +69,8 @@
<echo message="Compiling libs/DragDrop.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling DragDrop/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/DragDrop/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/compile-config.xml b/frameworks/projects/DragDrop/compile-config.xml
index d430873..7506e1d 100644
--- a/frameworks/projects/DragDrop/compile-config.xml
+++ b/frameworks/projects/DragDrop/compile-config.xml
@@ -61,6 +61,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 1cb2677..1cb752a 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -70,6 +70,8 @@
<echo message="Compiling libs/Effects.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -98,7 +100,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Effects/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -107,7 +108,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -121,6 +122,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Effects/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/compile-config.xml b/frameworks/projects/Effects/compile-config.xml
index 22f79d8..68b4ab8 100644
--- a/frameworks/projects/Effects/compile-config.xml
+++ b/frameworks/projects/Effects/compile-config.xml
@@ -61,6 +61,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index ebd561f..a613dce 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -70,6 +70,8 @@
<echo message="Compiling libs/Formatters.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -98,7 +100,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Formatters/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -107,7 +108,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -121,6 +122,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Formatters/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/compile-config.xml b/frameworks/projects/Formatters/compile-config.xml
index 6099456..6e59964 100644
--- a/frameworks/projects/Formatters/compile-config.xml
+++ b/frameworks/projects/Formatters/compile-config.xml
@@ -62,6 +62,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/GoogleMaps/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/compile-config.xml b/frameworks/projects/GoogleMaps/compile-config.xml
index 1f9857b..8017798 100644
--- a/frameworks/projects/GoogleMaps/compile-config.xml
+++ b/frameworks/projects/GoogleMaps/compile-config.xml
@@ -63,6 +63,10 @@
<name>defaults.css</name>
<path>as/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>GoogleMapsClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Graphics/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/compile-config.xml b/frameworks/projects/Graphics/compile-config.xml
index 967426e..eb660f2 100644
--- a/frameworks/projects/Graphics/compile-config.xml
+++ b/frameworks/projects/Graphics/compile-config.xml
@@ -60,6 +60,8 @@
</compiler>
<include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 67d632b..e82078d 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -69,6 +69,8 @@
<echo message="Compiling libs/HTML.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling HTML/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/compile-config.xml b/frameworks/projects/HTML/compile-config.xml
index fc3c1e9..8d7bfd5 100644
--- a/frameworks/projects/HTML/compile-config.xml
+++ b/frameworks/projects/HTML/compile-config.xml
@@ -70,6 +70,14 @@
<name>defaults.css</name>
<path>as/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>HTMLClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML5/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/compile-config.xml b/frameworks/projects/HTML5/compile-config.xml
index 0950f6d..3bca049 100644
--- a/frameworks/projects/HTML5/compile-config.xml
+++ b/frameworks/projects/HTML5/compile-config.xml
@@ -64,6 +64,10 @@
<name>defaults.css</name>
<path>as/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>HTML5Classes</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/JQuery/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/compile-config.xml b/frameworks/projects/JQuery/compile-config.xml
index 1d6e400..59f2bfb 100644
--- a/frameworks/projects/JQuery/compile-config.xml
+++ b/frameworks/projects/JQuery/compile-config.xml
@@ -64,6 +64,10 @@
<name>defaults.css</name>
<path>as/defaults.css</path>
</include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
+ </include-file>
<include-classes>
<class>JQueryClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index a1e060e..6f489ea 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -69,6 +69,8 @@
<echo message="Compiling libs/Mobile.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/js/out" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
<target name="compile-asjs" >
<echo message="Cross-compiling Mobile/asjs"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-output=${basedir}/js/out" />
<arg value="-load-config=${basedir}/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
<fileset dir="${basedir}/js/src">
<include name="**/**" />
</fileset>
+ <fileset dir="${basedir}/js/out">
+ <include name="**/**" />
+ </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Mobile/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/compile-config.xml b/frameworks/projects/Mobile/compile-config.xml
index d63598c..980f4ad 100644
--- a/frameworks/projects/Mobile/compile-config.xml
+++ b/frameworks/projects/Mobile/compile-config.xml
@@ -66,6 +66,12 @@
</compiler>
<include-file>
+ <name>js/out/*</name>
+ <path>js/out/*</path>
+ </include-file>
+ <include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Network/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/compile-config.xml b/frameworks/projects/Network/compile-config.xml
index 92c3643..f62a960 100644
--- a/frameworks/projects/Network/compile-config.xml
+++ b/frameworks/projects/Network/compile-config.xml
@@ -60,6 +60,8 @@
</compiler>
<include-file>
+ <name>js/src/*</name>
+ <path>js/src/*</path>
</include-file>
<include-classes>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - fix build
Posted by ah...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c889b40a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c889b40a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c889b40a
Branch: refs/heads/develop
Commit: c889b40a279daff2e17c7b7fbb6173ca8c1b81a4
Parents: 50889a8
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 20 10:30:21 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 20 10:32:10 2015 -0700
----------------------------------------------------------------------
build.xml | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c889b40a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 222a2be..5f1e918 100644
--- a/build.xml
+++ b/build.xml
@@ -72,14 +72,14 @@
Each of the main targets for the modules will call clean themselves before proceeding.
-->
- <target name="main" depends="prebuild,frameworks-as,frameworks-js,post-build" description="Full build">
+ <target name="main" depends="prebuild,frameworks-as,frameworks-js,frameworks-as-recompile,post-build" description="Full build">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
<echo>ant main target completed on ${build.datetime}</echo>
</target>
- <target name="main-jenkins" depends="dump-config,prebuild,frameworks-as,frameworks-js-jenkins,post-build" description="Full build">
+ <target name="main-jenkins" depends="dump-config,prebuild,frameworks-as,frameworks-js-jenkins,frameworks-as-recompile,post-build" description="Full build">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
@@ -340,7 +340,7 @@
<target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/>
<target name="thirdparty-clean" description="Removes all thirdparty downloads.">
- <ant dir="${basedir}/frameworks/as" target="thirdparty-clean"/>
+ <ant dir="${basedir}/frameworks" target="thirdparty-clean"/>
<ant dir="${basedir}/frameworks/js" target="thirdparty-clean"/>
<delete dir="${basedir}/in"/>
<delete dir="${basedir}/lib"/>
@@ -372,7 +372,7 @@
</target>
<target name="frameworks-as-clean">
- <ant dir="${basedir}/frameworks/as" target="clean"/>
+ <ant dir="${basedir}/frameworks" target="clean"/>
</target>
<target name="frameworks-js-clean">
@@ -410,6 +410,12 @@
</ant>
</target>
+ <target name="frameworks-as-recompile" description="Full build of all Actionscript framework SWCs in order to pick up JS files from asjs">
+ <ant dir="${basedir}/frameworks" target="re-compile">
+ <property name="locale" value="${locale}"/>
+ </ant>
+ </target>
+
<target name="frameworks-js-jenkins" description="Full check of all JavaScript framework files, using gsjlint and jshint">
<property name="no.lint" value="true" />
<ant dir="${basedir}/frameworks" target="js">
@@ -514,7 +520,7 @@
</fileset>
</copy>
- <!-- frameworks/as -->
+ <!-- frameworks -->
<antcall target="stage-framework-as"/>
<!-- make the js output folder so copy doesn't complain if it isn't there -->
@@ -624,8 +630,28 @@
<exclude name="projects/**/*.DS_Store"/>
</fileset>
</copy>
- <copy todir="${basedir}/temp/frameworks/as" includeEmptyDirs="false">
- <fileset dir="${basedir}/frameworks/as">
+ <copy todir="${basedir}/temp/frameworks/projects" includeEmptyDirs="false">
+ <fileset dir="${basedir}/frameworks/projects">
+ <include name="**"/>
+ <exclude name="**/libs/**"/>
+ <exclude name="**/*.swc"/>
+ <exclude name="**/*.pbj"/>
+ <exclude name="**/*.swf"/>
+ <exclude name="**/*.mxp"/>
+ <exclude name="test*/**"/>
+ <exclude name="javascript/**"/>
+ <exclude name="projects/air/**"/>
+ <exclude name="projects/spark/manifest.xml"/>
+ <exclude name="projects/*/bundles.properties"/>
+ <exclude name="projects/*/.settings/**"/>
+ <exclude name="projects/*/tests/out/**"/>
+ <exclude name="projects/**/*.actionScriptProperties"/>
+ <exclude name="projects/**/*.flexLibProperties"/>
+ <exclude name="projects/**/*.DS_Store"/>
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/temp/frameworks" includeEmptyDirs="false">
+ <fileset dir="${basedir}/frameworks">
<include name="air-config-template.xml"/>
<include name="flex-config-template.xml"/>
</fileset>
@@ -638,20 +664,17 @@
<!-- now that config xml files are in temp, fix them up for release. -->
<echo message="Updating config file air-config.xml with version ${build.version}"/>
- <fix-config-file file="${basedir}/temp/frameworks/as/air-config-template.xml" version="${build.version}" />
+ <fix-config-file file="${basedir}/temp/frameworks/air-config-template.xml" version="${build.version}" />
<echo message="Updating config file flex-config.xml with version ${build.version}"/>
- <fix-config-file file="${basedir}/temp/frameworks/as/flex-config-template.xml" version="${build.version}" />
+ <fix-config-file file="${basedir}/temp/frameworks/flex-config-template.xml" version="${build.version}" />
<!-- Update all Version.as files in the kit frameworks directory with build.number -->
<!--<antcall target="version-update"/>-->
</target>
- <!-- tlf -->
+ <!-- js -->
<target name="stage-framework-js">
<copy todir="${basedir}/temp/frameworks/js/FlexJS/src" includeEmptyDirs="false">
- <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/src">
- <include name="**"/>
- </fileset>
<fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
<include name="**"/>
<exclude name="FlexJSJXClasses.js"/>
@@ -789,8 +812,8 @@
</concat-->
<!-- frameworks/libs -->
- <copy todir="${basedir}/temp/frameworks/as/libs">
- <fileset dir="${basedir}/frameworks/as/libs">
+ <copy todir="${basedir}/temp/frameworks/libs">
+ <fileset dir="${basedir}/frameworks/libs">
<include name="FlexJSUI.swc"/>
<include name="FlexJSJX.swc"/>
<include name="MXMLCClasses.swc"/>
@@ -863,8 +886,8 @@
</concat-->
<!-- frameworks/libs -->
- <copy todir="${basedir}/temp/frameworks/as/libs">
- <fileset dir="${basedir}/frameworks/as/libs">
+ <copy todir="${basedir}/temp/frameworks/libs">
+ <fileset dir="${basedir}/frameworks/libs">
<include name="FlexJSUI.swc"/>
<include name="FlexJSJX.swc"/>
<include name="MXMLCClasses.swc"/>