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 2016/06/08 06:09:27 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - implement a
js-config.xml and use it in the build
Repository: flex-asjs
Updated Branches:
refs/heads/develop f4bfc523a -> 4c55ca39f
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
index 5052955..aaf8f01 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
@@ -59,16 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -82,16 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -106,18 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../js/libs/google_maps.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" />
- </condition>
- <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/target/google_maps.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
index c3a363f..74bd69b 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
@@ -21,7 +21,10 @@
<compiler>
<accessible>false</accessible>
-
+ <external-library-path append="true">
+ <path-element>../../../../../../../../js/libs/google_maps.swc</path-element>
+ </external-library-path>
+
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -29,6 +32,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -39,7 +51,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -69,7 +81,5 @@
<uri>library://ns.apache.org/flexjs/google</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
index d8925df..97c8fa6 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
index 8a65a62..de1aef8 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -76,7 +82,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/HTML5JS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTML5JS/build.xml b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
index 372f272..d6a382c 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
index a320c65..5b5d258 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -71,7 +77,5 @@
<uri>library://ns.apache.org/flexjs/html5</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/HTMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/build.xml b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
index bc08c2b..2966638 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
index 2670033..b2e1b59 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -84,7 +90,5 @@
<uri>library://ns.apache.org/flexjs/svg</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/JQueryJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/JQueryJS/build.xml b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
index fa3a7cf..24ffad6 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/build.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
@@ -59,16 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${JQUERY.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -82,16 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <arg value="-external-library-path+=${JQUERY.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -106,15 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/target/jquery-1.9.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
index 5892898..666a828 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/src/main/config/compile-js-config.xml
@@ -21,7 +21,8 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
+ <external-library-path append="true">
+ <path-element>../../../../../../../../js/libs/jquery.swc</path-element>
</external-library-path>
<mxml>
@@ -31,6 +32,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +51,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -80,7 +90,5 @@
<uri>library://ns.apache.org/flexjs/jquery</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/MobileJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MobileJS/build.xml b/frameworks/js/FlexJS/projects/MobileJS/build.xml
index ce9d392..6393c32 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/build.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,10 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +92,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
index 7422554..6340b69 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/src/main/config/compile-js-config.xml
@@ -21,7 +21,8 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
+ <external-library-path append="true">
+ <path-element>../../../../../../../../js/libs/cordova.swc</path-element>
</external-library-path>
<mxml>
@@ -31,6 +32,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +51,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -83,7 +93,5 @@
<uri>library://ns.apache.org/flexjs/cordova</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/NetworkJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/NetworkJS/build.xml b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
index 42fc17c..e4cca09 100644
--- a/frameworks/js/FlexJS/projects/NetworkJS/build.xml
+++ b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/NetworkJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/NetworkJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/NetworkJS/src/main/config/compile-js-config.xml
index f402c79..58a81f2 100644
--- a/frameworks/js/FlexJS/projects/NetworkJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/NetworkJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -76,7 +82,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
index edeef54..09e1db4 100644
--- a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,10 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +92,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/ReflectionJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ReflectionJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/ReflectionJS/src/main/config/compile-js-config.xml
index c2f63f6..b790203 100644
--- a/frameworks/js/FlexJS/projects/ReflectionJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/ReflectionJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -71,7 +77,5 @@
<include-namespaces>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/StorageJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/StorageJS/build.xml b/frameworks/js/FlexJS/projects/StorageJS/build.xml
index 03f3055..97bbb8f 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/build.xml
@@ -59,16 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${CORDOVA.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -82,16 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <arg value="-external-library-path+=${CORDOVA.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -106,18 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="CORDOVA.SWC" value="${FALCONJX_HOME}/../js/libs/cordova.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/cordova.swc" />
- </condition>
- <property name="CORDOVA.SWC" value="${FALCONJX_HOME}/../externs/cordova/target/cordova.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
index 4fdfcef..95642b5 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/src/main/config/compile-js-config.xml
@@ -20,8 +20,9 @@
<compiler>
<accessible>false</accessible>
-
- <external-library-path>
+
+ <external-library-path append="true">
+ <path-element>../../../../../../../../js/libs/cordova.swc</path-element>
</external-library-path>
<mxml>
@@ -31,6 +32,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +51,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -76,7 +86,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/XMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/XMLJS/build.xml b/frameworks/js/FlexJS/projects/XMLJS/build.xml
index 3b6ad6c..09ab015 100644
--- a/frameworks/js/FlexJS/projects/XMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/XMLJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,10 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +92,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml
index e78ac2e..e1c10e7 100644
--- a/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -73,7 +79,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 0938c4f..75814cf 100644
--- a/installer.xml
+++ b/installer.xml
@@ -779,6 +779,8 @@
tofile="${FLEXJS_HOME}/frameworks/flex-config.xml" overwrite="true"/>
<copy file="${FLEXJS_HOME}/frameworks/air-config-template.xml"
tofile="${FLEXJS_HOME}/frameworks/air-config.xml" overwrite="true"/>
+ <copy file="${FLEXJS_HOME}/frameworks/js-config-template.xml"
+ tofile="${FLEXJS_HOME}/frameworks/js-config.xml" overwrite="true"/>
<replace file="${FLEXJS_HOME}/frameworks/flex-config.xml">
<replacefilter token="@playerversion@"
value="${flash.sdk.version}"/>
@@ -795,6 +797,14 @@
<replacefilter token="{airHome}/frameworks/libs"
value="libs"/>
</replace>
+ <replace file="${FLEXJS_HOME}/frameworks/js-config.xml" >
+ <replacefilter token="@playerversion@"
+ value="${flash.sdk.version}"/>
+ <replacefilter token="@swfversion@"
+ value="${flash.sdk.swfversion}"/>
+ <replacefilter token="{airHome}/frameworks/libs"
+ value="libs"/>
+ </replace>
</target>
<target name="hack-fb-files" description="create files needed by Adobe Flash Builder">
[2/2] git commit: [flex-asjs] [refs/heads/develop] - implement a
js-config.xml and use it in the build
Posted by ah...@apache.org.
implement a js-config.xml and use it in the 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/4c55ca39
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4c55ca39
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4c55ca39
Branch: refs/heads/develop
Commit: 4c55ca39f9060beeb3be0ab10ef5b59432a9e6d4
Parents: f4bfc52
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 7 23:09:01 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 7 23:09:11 2016 -0700
----------------------------------------------------------------------
build.xml | 27 +-
frameworks/build.xml | 10 +
frameworks/js-config-template.xml | 339 +++++++++++++++++++
frameworks/js-config.xml | 339 +++++++++++++++++++
.../js/FlexJS/projects/BindingJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/ChartsJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/CollectionsJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
frameworks/js/FlexJS/projects/CoreJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 17 +-
.../js/FlexJS/projects/CreateJSJS/build.xml | 33 +-
.../src/main/config/compile-js-config.xml | 17 +-
.../js/FlexJS/projects/DragDropJS/build.xml | 29 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/EffectsJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
frameworks/js/FlexJS/projects/FlatJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/FormattersJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/GoogleMapsJS/build.xml | 33 +-
.../src/main/config/compile-js-config.xml | 18 +-
.../js/FlexJS/projects/GraphicsJS/build.xml | 29 +-
.../src/main/config/compile-js-config.xml | 16 +-
frameworks/js/FlexJS/projects/HTML5JS/build.xml | 29 +-
.../src/main/config/compile-js-config.xml | 16 +-
frameworks/js/FlexJS/projects/HTMLJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/JQueryJS/build.xml | 30 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/MobileJS/build.xml | 26 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/NetworkJS/build.xml | 27 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/ReflectionJS/build.xml | 28 +-
.../src/main/config/compile-js-config.xml | 16 +-
.../js/FlexJS/projects/StorageJS/build.xml | 35 +-
.../src/main/config/compile-js-config.xml | 18 +-
frameworks/js/FlexJS/projects/XMLJS/build.xml | 28 +-
.../XMLJS/src/main/config/compile-js-config.xml | 16 +-
installer.xml | 10 +
43 files changed, 988 insertions(+), 590 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1bb6a1d..7f92eb3 100644
--- a/build.xml
+++ b/build.xml
@@ -183,7 +183,7 @@
<property name="no.thirdparty-downloads" value="set" />
</target>
- <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config"
+ <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config,copy-externs"
description="Stuff that needs to be done before any builds." unless="airsdk.found"/>
<target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-falcon-home,check-falconjx-home" unless="airsdk.found"
@@ -357,8 +357,29 @@
<target name="create-config" description="Create flex config file" unless="airsdk.found">
<ant dir="${basedir}/frameworks" target="flex-config" />
<ant dir="${basedir}/frameworks" target="air-config" />
+ <ant dir="${basedir}/frameworks" target="js-config" />
</target>
+ <target name="copy-externs" description="Copy extern swcs into this folder">
+ <mkdir dir="${basedir}/js/libs" />
+ <copy todir="${basedir}/js/libs" flatten="true">
+ <fileset dir="${FALCONJX_HOME}/../externs">
+ <include name="**/*.swc"/>
+ </fileset>
+ </copy>
+ <antcall target="rename_jquery" />
+ </target>
+
+ <target name="check_jquery" >
+ <condition property="jquery_exists">
+ <available file="${basedir}/js/libs/jquery.swc" />
+ </condition>
+ </target>
+
+ <target name="rename_jquery" depends="check_jquery" unless="jquery_exists" >
+ <move file="${basedir}/js/libs/jquery-1.9.swc" tofile="${basedir}/js/libs/jquery.swc" />
+ </target>
+
<target name="setup-binary-release" depends="thirdparty-clean"
description="Set properties needed to turn on features for release sdk">
<!--
@@ -395,6 +416,7 @@
<include name="**/*.swf"/>
</delete>
+ <delete dir="${basedir}/js/libs" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
@@ -661,6 +683,7 @@
<fileset dir="${basedir}/frameworks">
<include name="air-config-template.xml"/>
<include name="flex-config-template.xml"/>
+ <include name="js-config-template.xml"/>
</fileset>
</copy>
@@ -674,6 +697,8 @@
<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/flex-config-template.xml" version="${build.version}" />
+ <echo message="Updating config file js-config.xml with version ${build.version}"/>
+ <fix-config-file file="${basedir}/temp/frameworks/js-config-template.xml" version="${build.version}" />
<!-- Update all Version.as files in the kit frameworks directory with build.number -->
<!--<antcall target="version-update"/>-->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index ea42384..839c896 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -258,6 +258,16 @@
</copy>
</target>
+ <target name="js-config" depends="playerglobal-setswfversion" description="Copy the js config template to js-config.xml and inject version numbers">
+ <copy file="${basedir}/js-config-template.xml" tofile="${basedir}/js-config.xml" overwrite="true">
+ <filterset>
+ <filter token="playerversion" value="${playerglobal.version}"/>
+ <filter token="swfversion" value="${playerglobal.swfversion}"/>
+ <filter token="locale" value="${locale}"/>
+ </filterset>
+ </copy>
+ </target>
+
<target name="playerglobal-setswfversion" description="Set the swfversion to insert into the flex config file">
<condition property="playerglobal.swfversion" value="11">
<equals arg1="${playerglobal.version}" arg2="10.2" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/js-config-template.xml b/frameworks/js-config-template.xml
new file mode 100644
index 0000000..cc3568f
--- /dev/null
+++ b/frameworks/js-config-template.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0"?>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<flex-config>
+ <!-- Specifies the minimum player version that will run the compiled SWF. -->
+ <target-player>@playerversion@</target-player>
+
+ <!-- Specifies the version of the compiled SWF -->
+ <swf-version>@swfversion@</swf-version>
+
+ <compiler>
+
+ <!-- List of path elements that form the roots of ActionScript class hierarchies. -->
+ <!-- not set -->
+ <!--
+ <source-path>
+ <path-element>string</path-element>
+ </source-path>
+ -->
+
+ <!-- Allow the source-path to have path-elements which contain other path-elements -->
+ <allow-source-path-overlap>false</allow-source-path-overlap>
+
+ <!-- Run the AS3 compiler in a mode that detects legal but potentially incorrect -->
+ <!-- code. -->
+ <show-actionscript-warnings>true</show-actionscript-warnings>
+
+ <!-- Turn on generation of debuggable SWFs. False by default for mxmlc, -->
+ <!-- but true by default for compc. -->
+ <!--
+ <debug>true</debug>
+ -->
+
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </external-library-path>
+
+ <!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
+ <!-- the compiler during mxml translation and are helpful with understanding and -->
+ <!-- debugging Flex applications. -->
+ <keep-generated-actionscript>false</keep-generated-actionscript>
+
+ <!-- not set -->
+ <!--
+ <include-libraries>
+ <library>string</library>
+ </include-libraries>
+ -->
+
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <library-path>
+ <path-element>../js/libs/GCL.swc</path-element>
+ </library-path>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ <imports>
+ <implicit-import>org.apache.flex.events.*</implicit-import>
+ <implicit-import>org.apache.flex.geom.*</implicit-import>
+ <implicit-import>org.apache.flex.core.ClassFactory</implicit-import>
+ <implicit-import>org.apache.flex.core.IFactory</implicit-import>
+ </imports>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
+ <binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <states-class>org.apache.flex.states.State</states-class>
+ <states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
+ <states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
+ <states-event-override-class>org.apache.flex.states.SetEventHandler</states-event-override-class>
+ <component-factory-class>org.apache.flex.core.ClassFactory</component-factory-class>
+ <component-factory-interface>org.apache.flex.core.IFactory</component-factory-interface>
+
+ <namespaces>
+ <!-- Specify a URI to associate with a manifest of components for use as MXML -->
+ <!-- elements. -->
+ </namespaces>
+
+ <!-- Enable post-link SWF optimization. -->
+ <optimize>true</optimize>
+
+ <!-- Enable trace statement omission. -->
+ <omit-trace-statements>true</omit-trace-statements>
+
+ <!-- Keep the following AS3 metadata in the bytecodes. -->
+ <!-- Warning: For the data binding feature in the Flex framework to work properly, -->
+ <!-- the following metadata must be kept: -->
+ <!-- 1. Bindable -->
+ <!-- 2. Managed -->
+ <!-- 3. ChangeEvent -->
+ <!-- 4. NonCommittingChangeEvent -->
+ <!-- 5. Transient -->
+ <!--
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+ -->
+
+ <!-- Turn on reporting of data binding warnings. For example: Warning: Data binding -->
+ <!-- will not be able to detect assignments to "foo". -->
+ <show-binding-warnings>true</show-binding-warnings>
+
+ <!-- toggle whether warnings generated from unused type selectors are displayed -->
+ <show-unused-type-selector-warnings>true</show-unused-type-selector-warnings>
+
+ <!-- Run the AS3 compiler in strict error checking mode. -->
+ <strict>true</strict>
+
+ <!-- Use the ActionScript 3 class based object model for greater performance and better error reporting. -->
+ <!-- In the class based object model most built-in functions are implemented as fixed methods of classes -->
+ <!-- (-strict is recommended, but not required, for earlier errors) -->
+ <as3>true</as3>
+
+ <!-- Use the ECMAScript edition 3 prototype based object model to allow dynamic overriding of prototype -->
+ <!-- properties. In the prototype based object model built-in functions are implemented as dynamic -->
+ <!-- properties of prototype objects (-strict is allowed, but may result in compiler errors for -->
+ <!-- references to dynamic properties) -->
+ <es>false</es>
+
+ <!-- List of CSS or SWC files to apply as a theme. -->
+ <theme>
+ </theme>
+
+ <!-- Turns on the display of stack traces for uncaught runtime errors. -->
+ <verbose-stacktraces>false</verbose-stacktraces>
+
+ <!-- Defines the AS3 file encoding. -->
+ <!-- not set -->
+ <!--
+ <actionscript-file-encoding></actionscript-file-encoding>
+ -->
+
+ <fonts>
+
+ <!-- Enables advanced anti-aliasing for embedded fonts, which provides greater clarity for small -->
+ <!-- fonts. This setting can be overriden in CSS for specific fonts. -->
+ <!-- NOTE: flash-type has been deprecated. Please use advanced-anti-aliasing <flash-type>true</flash-type> -->
+ <advanced-anti-aliasing>true</advanced-anti-aliasing>
+
+ <!-- The number of embedded font faces that are cached. -->
+ <max-cached-fonts>20</max-cached-fonts>
+
+ <!-- The number of character glyph outlines to cache for each font face. -->
+ <max-glyphs-per-face>1000</max-glyphs-per-face>
+
+ <!-- Defines ranges that can be used across multiple font-face declarations. -->
+ <!-- See flash-unicode-table.xml for more examples. -->
+ <!-- not set -->
+ <!--
+ <languages>
+ <language-range>
+ <lang>englishRange</lang>
+ <range>U+0020-007E</range>
+ </language-range>
+ </languages>
+ -->
+
+ <!-- Compiler font manager classes, in policy resolution order -->
+ <!-- NOTE: For Apache Flex -->
+ <!-- AFEFontManager and CFFFontManager both use proprietary technology. -->
+ <!-- You must install the optional font jars if you wish to use embedded fonts -->
+ <!-- directly or you can use fontswf to precompile the font as a swf. -->
+ <managers>
+ <manager-class>flash.fonts.JREFontManager</manager-class>
+ <manager-class>flash.fonts.BatikFontManager</manager-class>
+ <manager-class>flash.fonts.AFEFontManager</manager-class>
+ <manager-class>flash.fonts.CFFFontManager</manager-class>
+ </managers>
+
+ <!-- File containing cached system font licensing information produced via
+ java -cp mxmlc.jar flex2.tools.FontSnapshot (fontpath)
+ Will default to winFonts.ser on Windows XP and
+ macFonts.ser on Mac OS X, so is commented out by default.
+
+ <local-fonts-snapshot>localFonts.ser</local-fonts-snapshot>
+ -->
+
+ </fonts>
+
+ <!-- Array.toString() format has changed. -->
+ <warn-array-tostring-changes>false</warn-array-tostring-changes>
+
+ <!-- Assignment within conditional. -->
+ <warn-assignment-within-conditional>true</warn-assignment-within-conditional>
+
+ <!-- Possibly invalid Array cast operation. -->
+ <warn-bad-array-cast>true</warn-bad-array-cast>
+
+ <!-- Non-Boolean value used where a Boolean value was expected. -->
+ <warn-bad-bool-assignment>true</warn-bad-bool-assignment>
+
+ <!-- Invalid Date cast operation. -->
+ <warn-bad-date-cast>true</warn-bad-date-cast>
+
+ <!-- Unknown method. -->
+ <warn-bad-es3-type-method>true</warn-bad-es3-type-method>
+
+ <!-- Unknown property. -->
+ <warn-bad-es3-type-prop>true</warn-bad-es3-type-prop>
+
+ <!-- Illogical comparison with NaN. Any comparison operation involving NaN will evaluate to false because NaN != NaN. -->
+ <warn-bad-nan-comparison>true</warn-bad-nan-comparison>
+
+ <!-- Impossible assignment to null. -->
+ <warn-bad-null-assignment>true</warn-bad-null-assignment>
+
+ <!-- Illogical comparison with null. -->
+ <warn-bad-null-comparison>true</warn-bad-null-comparison>
+
+ <!-- Illogical comparison with undefined. Only untyped variables (or variables of type *) can be undefined. -->
+ <warn-bad-undefined-comparison>true</warn-bad-undefined-comparison>
+
+ <!-- Boolean() with no arguments returns false in ActionScript 3.0. Boolean() returned undefined in ActionScript 2.0. -->
+ <warn-boolean-constructor-with-no-args>false</warn-boolean-constructor-with-no-args>
+
+ <!-- __resolve is no longer supported. -->
+ <warn-changes-in-resolve>false</warn-changes-in-resolve>
+
+ <!-- Class is sealed. It cannot have members added to it dynamically. -->
+ <warn-class-is-sealed>true</warn-class-is-sealed>
+
+ <!-- Constant not initialized. -->
+ <warn-const-not-initialized>true</warn-const-not-initialized>
+
+ <!-- Function used in new expression returns a value. Result will be what the -->
+ <!-- function returns, rather than a new instance of that function. -->
+ <warn-constructor-returns-value>false</warn-constructor-returns-value>
+
+ <!-- EventHandler was not added as a listener. -->
+ <warn-deprecated-event-handler-error>false</warn-deprecated-event-handler-error>
+
+ <!-- Unsupported ActionScript 2.0 function. -->
+ <warn-deprecated-function-error>true</warn-deprecated-function-error>
+
+ <!-- Unsupported ActionScript 2.0 property. -->
+ <warn-deprecated-property-error>true</warn-deprecated-property-error>
+
+ <!-- More than one argument by the same name. -->
+ <warn-duplicate-argument-names>true</warn-duplicate-argument-names>
+
+ <!-- Duplicate variable definition -->
+ <warn-duplicate-variable-def>true</warn-duplicate-variable-def>
+
+ <!-- ActionScript 3.0 iterates over an object's properties within a "for x in target" statement in random order. -->
+ <warn-for-var-in-changes>false</warn-for-var-in-changes>
+
+ <!-- Importing a package by the same name as the current class will hide that class identifier in this scope. -->
+ <warn-import-hides-class>true</warn-import-hides-class>
+
+ <!-- Use of the instanceof operator. -->
+ <warn-instance-of-changes>true</warn-instance-of-changes>
+
+ <!-- Internal error in compiler. -->
+ <warn-internal-error>true</warn-internal-error>
+
+ <!-- _level is no longer supported. For more information, see the flash.display package. -->
+ <warn-level-not-supported>true</warn-level-not-supported>
+
+ <!-- Missing namespace declaration (e.g. variable is not defined to be public, private, etc.). -->
+ <warn-missing-namespace-decl>true</warn-missing-namespace-decl>
+
+ <!-- Negative value will become a large positive value when assigned to a uint data type. -->
+ <warn-negative-uint-literal>true</warn-negative-uint-literal>
+
+ <!-- Missing constructor. -->
+ <warn-no-constructor>false</warn-no-constructor>
+
+ <!-- The super() statement was not called within the constructor. -->
+ <warn-no-explicit-super-call-in-constructor>false</warn-no-explicit-super-call-in-constructor>
+
+ <!-- Missing type declaration. -->
+ <warn-no-type-decl>true</warn-no-type-decl>
+
+ <!-- In ActionScript 3.0, white space is ignored and '' returns 0. Number() returns -->
+ <!-- NaN in ActionScript 2.0 when the parameter is '' or contains white space. -->
+ <warn-number-from-string-changes>false</warn-number-from-string-changes>
+
+ <!-- Change in scoping for the this keyword. Class methods extracted from an -->
+ <!-- instance of a class will always resolve this back to that instance. In -->
+ <!-- ActionScript 2.0 this is looked up dynamically based on where the method -->
+ <!-- is invoked from. -->
+ <warn-scoping-change-in-this>false</warn-scoping-change-in-this>
+
+ <!-- Inefficient use of += on a TextField.-->
+ <warn-slow-text-field-addition>true</warn-slow-text-field-addition>
+
+ <!-- Possible missing parentheses. -->
+ <warn-unlikely-function-value>true</warn-unlikely-function-value>
+
+ <!-- Possible usage of the ActionScript 2.0 XML class. -->
+ <warn-xml-class-has-changed>false</warn-xml-class-has-changed>
+
+ </compiler>
+
+
+ <!-- target-player: specifies the version of the player the application is targeting.
+ Features requiring a later version will not be compiled into the application.
+ The minimum value supported is "9.0.0".-->
+ <!-- target-player usage:
+ <target-player>version</target-player>
+ -->
+
+ <!-- Metadata added to SWFs via the SWF Metadata tag. -->
+ <metadata>
+ <title>Apache FlexJS Application</title>
+ <description>http://flex.apache.org/</description>
+ <publisher>Apache Software Foundation</publisher>
+ <creator>unknown</creator>
+ <language>EN</language>
+ </metadata>
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js-config.xml b/frameworks/js-config.xml
new file mode 100644
index 0000000..17786d9
--- /dev/null
+++ b/frameworks/js-config.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0"?>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<flex-config>
+ <!-- Specifies the minimum player version that will run the compiled SWF. -->
+ <target-player>11.1</target-player>
+
+ <!-- Specifies the version of the compiled SWF -->
+ <swf-version>14</swf-version>
+
+ <compiler>
+
+ <!-- List of path elements that form the roots of ActionScript class hierarchies. -->
+ <!-- not set -->
+ <!--
+ <source-path>
+ <path-element>string</path-element>
+ </source-path>
+ -->
+
+ <!-- Allow the source-path to have path-elements which contain other path-elements -->
+ <allow-source-path-overlap>false</allow-source-path-overlap>
+
+ <!-- Run the AS3 compiler in a mode that detects legal but potentially incorrect -->
+ <!-- code. -->
+ <show-actionscript-warnings>true</show-actionscript-warnings>
+
+ <!-- Turn on generation of debuggable SWFs. False by default for mxmlc, -->
+ <!-- but true by default for compc. -->
+ <!--
+ <debug>true</debug>
+ -->
+
+ <!-- List of SWC files or directories to compile against but to omit from -->
+ <!-- linking. -->
+ <external-library-path>
+ <path-element>../js/libs/js.swc</path-element>
+ </external-library-path>
+
+ <!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
+ <!-- the compiler during mxml translation and are helpful with understanding and -->
+ <!-- debugging Flex applications. -->
+ <keep-generated-actionscript>false</keep-generated-actionscript>
+
+ <!-- not set -->
+ <!--
+ <include-libraries>
+ <library>string</library>
+ </include-libraries>
+ -->
+
+ <!-- List of SWC files or directories that contain SWC files. -->
+ <library-path>
+ <path-element>../js/libs/GCL.swc</path-element>
+ </library-path>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ <imports>
+ <implicit-import>org.apache.flex.events.*</implicit-import>
+ <implicit-import>org.apache.flex.geom.*</implicit-import>
+ <implicit-import>org.apache.flex.core.ClassFactory</implicit-import>
+ <implicit-import>org.apache.flex.core.IFactory</implicit-import>
+ </imports>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <binding-event-handler-event>org.apache.flex.events.Event</binding-event-handler-event>
+ <binding-event-handler-class>org.apache.flex.events.EventDispatcher</binding-event-handler-class>
+ <states-class>org.apache.flex.states.State</states-class>
+ <states-instance-override-class>org.apache.flex.states.AddItems</states-instance-override-class>
+ <states-property-override-class>org.apache.flex.states.SetProperty</states-property-override-class>
+ <states-event-override-class>org.apache.flex.states.SetEventHandler</states-event-override-class>
+ <component-factory-class>org.apache.flex.core.ClassFactory</component-factory-class>
+ <component-factory-interface>org.apache.flex.core.IFactory</component-factory-interface>
+
+ <namespaces>
+ <!-- Specify a URI to associate with a manifest of components for use as MXML -->
+ <!-- elements. -->
+ </namespaces>
+
+ <!-- Enable post-link SWF optimization. -->
+ <optimize>true</optimize>
+
+ <!-- Enable trace statement omission. -->
+ <omit-trace-statements>true</omit-trace-statements>
+
+ <!-- Keep the following AS3 metadata in the bytecodes. -->
+ <!-- Warning: For the data binding feature in the Flex framework to work properly, -->
+ <!-- the following metadata must be kept: -->
+ <!-- 1. Bindable -->
+ <!-- 2. Managed -->
+ <!-- 3. ChangeEvent -->
+ <!-- 4. NonCommittingChangeEvent -->
+ <!-- 5. Transient -->
+ <!--
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+ -->
+
+ <!-- Turn on reporting of data binding warnings. For example: Warning: Data binding -->
+ <!-- will not be able to detect assignments to "foo". -->
+ <show-binding-warnings>true</show-binding-warnings>
+
+ <!-- toggle whether warnings generated from unused type selectors are displayed -->
+ <show-unused-type-selector-warnings>true</show-unused-type-selector-warnings>
+
+ <!-- Run the AS3 compiler in strict error checking mode. -->
+ <strict>true</strict>
+
+ <!-- Use the ActionScript 3 class based object model for greater performance and better error reporting. -->
+ <!-- In the class based object model most built-in functions are implemented as fixed methods of classes -->
+ <!-- (-strict is recommended, but not required, for earlier errors) -->
+ <as3>true</as3>
+
+ <!-- Use the ECMAScript edition 3 prototype based object model to allow dynamic overriding of prototype -->
+ <!-- properties. In the prototype based object model built-in functions are implemented as dynamic -->
+ <!-- properties of prototype objects (-strict is allowed, but may result in compiler errors for -->
+ <!-- references to dynamic properties) -->
+ <es>false</es>
+
+ <!-- List of CSS or SWC files to apply as a theme. -->
+ <theme>
+ </theme>
+
+ <!-- Turns on the display of stack traces for uncaught runtime errors. -->
+ <verbose-stacktraces>false</verbose-stacktraces>
+
+ <!-- Defines the AS3 file encoding. -->
+ <!-- not set -->
+ <!--
+ <actionscript-file-encoding></actionscript-file-encoding>
+ -->
+
+ <fonts>
+
+ <!-- Enables advanced anti-aliasing for embedded fonts, which provides greater clarity for small -->
+ <!-- fonts. This setting can be overriden in CSS for specific fonts. -->
+ <!-- NOTE: flash-type has been deprecated. Please use advanced-anti-aliasing <flash-type>true</flash-type> -->
+ <advanced-anti-aliasing>true</advanced-anti-aliasing>
+
+ <!-- The number of embedded font faces that are cached. -->
+ <max-cached-fonts>20</max-cached-fonts>
+
+ <!-- The number of character glyph outlines to cache for each font face. -->
+ <max-glyphs-per-face>1000</max-glyphs-per-face>
+
+ <!-- Defines ranges that can be used across multiple font-face declarations. -->
+ <!-- See flash-unicode-table.xml for more examples. -->
+ <!-- not set -->
+ <!--
+ <languages>
+ <language-range>
+ <lang>englishRange</lang>
+ <range>U+0020-007E</range>
+ </language-range>
+ </languages>
+ -->
+
+ <!-- Compiler font manager classes, in policy resolution order -->
+ <!-- NOTE: For Apache Flex -->
+ <!-- AFEFontManager and CFFFontManager both use proprietary technology. -->
+ <!-- You must install the optional font jars if you wish to use embedded fonts -->
+ <!-- directly or you can use fontswf to precompile the font as a swf. -->
+ <managers>
+ <manager-class>flash.fonts.JREFontManager</manager-class>
+ <manager-class>flash.fonts.BatikFontManager</manager-class>
+ <manager-class>flash.fonts.AFEFontManager</manager-class>
+ <manager-class>flash.fonts.CFFFontManager</manager-class>
+ </managers>
+
+ <!-- File containing cached system font licensing information produced via
+ java -cp mxmlc.jar flex2.tools.FontSnapshot (fontpath)
+ Will default to winFonts.ser on Windows XP and
+ macFonts.ser on Mac OS X, so is commented out by default.
+
+ <local-fonts-snapshot>localFonts.ser</local-fonts-snapshot>
+ -->
+
+ </fonts>
+
+ <!-- Array.toString() format has changed. -->
+ <warn-array-tostring-changes>false</warn-array-tostring-changes>
+
+ <!-- Assignment within conditional. -->
+ <warn-assignment-within-conditional>true</warn-assignment-within-conditional>
+
+ <!-- Possibly invalid Array cast operation. -->
+ <warn-bad-array-cast>true</warn-bad-array-cast>
+
+ <!-- Non-Boolean value used where a Boolean value was expected. -->
+ <warn-bad-bool-assignment>true</warn-bad-bool-assignment>
+
+ <!-- Invalid Date cast operation. -->
+ <warn-bad-date-cast>true</warn-bad-date-cast>
+
+ <!-- Unknown method. -->
+ <warn-bad-es3-type-method>true</warn-bad-es3-type-method>
+
+ <!-- Unknown property. -->
+ <warn-bad-es3-type-prop>true</warn-bad-es3-type-prop>
+
+ <!-- Illogical comparison with NaN. Any comparison operation involving NaN will evaluate to false because NaN != NaN. -->
+ <warn-bad-nan-comparison>true</warn-bad-nan-comparison>
+
+ <!-- Impossible assignment to null. -->
+ <warn-bad-null-assignment>true</warn-bad-null-assignment>
+
+ <!-- Illogical comparison with null. -->
+ <warn-bad-null-comparison>true</warn-bad-null-comparison>
+
+ <!-- Illogical comparison with undefined. Only untyped variables (or variables of type *) can be undefined. -->
+ <warn-bad-undefined-comparison>true</warn-bad-undefined-comparison>
+
+ <!-- Boolean() with no arguments returns false in ActionScript 3.0. Boolean() returned undefined in ActionScript 2.0. -->
+ <warn-boolean-constructor-with-no-args>false</warn-boolean-constructor-with-no-args>
+
+ <!-- __resolve is no longer supported. -->
+ <warn-changes-in-resolve>false</warn-changes-in-resolve>
+
+ <!-- Class is sealed. It cannot have members added to it dynamically. -->
+ <warn-class-is-sealed>true</warn-class-is-sealed>
+
+ <!-- Constant not initialized. -->
+ <warn-const-not-initialized>true</warn-const-not-initialized>
+
+ <!-- Function used in new expression returns a value. Result will be what the -->
+ <!-- function returns, rather than a new instance of that function. -->
+ <warn-constructor-returns-value>false</warn-constructor-returns-value>
+
+ <!-- EventHandler was not added as a listener. -->
+ <warn-deprecated-event-handler-error>false</warn-deprecated-event-handler-error>
+
+ <!-- Unsupported ActionScript 2.0 function. -->
+ <warn-deprecated-function-error>true</warn-deprecated-function-error>
+
+ <!-- Unsupported ActionScript 2.0 property. -->
+ <warn-deprecated-property-error>true</warn-deprecated-property-error>
+
+ <!-- More than one argument by the same name. -->
+ <warn-duplicate-argument-names>true</warn-duplicate-argument-names>
+
+ <!-- Duplicate variable definition -->
+ <warn-duplicate-variable-def>true</warn-duplicate-variable-def>
+
+ <!-- ActionScript 3.0 iterates over an object's properties within a "for x in target" statement in random order. -->
+ <warn-for-var-in-changes>false</warn-for-var-in-changes>
+
+ <!-- Importing a package by the same name as the current class will hide that class identifier in this scope. -->
+ <warn-import-hides-class>true</warn-import-hides-class>
+
+ <!-- Use of the instanceof operator. -->
+ <warn-instance-of-changes>true</warn-instance-of-changes>
+
+ <!-- Internal error in compiler. -->
+ <warn-internal-error>true</warn-internal-error>
+
+ <!-- _level is no longer supported. For more information, see the flash.display package. -->
+ <warn-level-not-supported>true</warn-level-not-supported>
+
+ <!-- Missing namespace declaration (e.g. variable is not defined to be public, private, etc.). -->
+ <warn-missing-namespace-decl>true</warn-missing-namespace-decl>
+
+ <!-- Negative value will become a large positive value when assigned to a uint data type. -->
+ <warn-negative-uint-literal>true</warn-negative-uint-literal>
+
+ <!-- Missing constructor. -->
+ <warn-no-constructor>false</warn-no-constructor>
+
+ <!-- The super() statement was not called within the constructor. -->
+ <warn-no-explicit-super-call-in-constructor>false</warn-no-explicit-super-call-in-constructor>
+
+ <!-- Missing type declaration. -->
+ <warn-no-type-decl>true</warn-no-type-decl>
+
+ <!-- In ActionScript 3.0, white space is ignored and '' returns 0. Number() returns -->
+ <!-- NaN in ActionScript 2.0 when the parameter is '' or contains white space. -->
+ <warn-number-from-string-changes>false</warn-number-from-string-changes>
+
+ <!-- Change in scoping for the this keyword. Class methods extracted from an -->
+ <!-- instance of a class will always resolve this back to that instance. In -->
+ <!-- ActionScript 2.0 this is looked up dynamically based on where the method -->
+ <!-- is invoked from. -->
+ <warn-scoping-change-in-this>false</warn-scoping-change-in-this>
+
+ <!-- Inefficient use of += on a TextField.-->
+ <warn-slow-text-field-addition>true</warn-slow-text-field-addition>
+
+ <!-- Possible missing parentheses. -->
+ <warn-unlikely-function-value>true</warn-unlikely-function-value>
+
+ <!-- Possible usage of the ActionScript 2.0 XML class. -->
+ <warn-xml-class-has-changed>false</warn-xml-class-has-changed>
+
+ </compiler>
+
+
+ <!-- target-player: specifies the version of the player the application is targeting.
+ Features requiring a later version will not be compiled into the application.
+ The minimum value supported is "9.0.0".-->
+ <!-- target-player usage:
+ <target-player>version</target-player>
+ -->
+
+ <!-- Metadata added to SWFs via the SWF Metadata tag. -->
+ <metadata>
+ <title>Apache FlexJS Application</title>
+ <description>http://flex.apache.org/</description>
+ <publisher>Apache Software Foundation</publisher>
+ <creator>unknown</creator>
+ <language>EN</language>
+ </metadata>
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/BindingJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/BindingJS/build.xml b/frameworks/js/FlexJS/projects/BindingJS/build.xml
index f5be9ab..8574b3c 100644
--- a/frameworks/js/FlexJS/projects/BindingJS/build.xml
+++ b/frameworks/js/FlexJS/projects/BindingJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/BindingJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/BindingJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/BindingJS/src/main/config/compile-js-config.xml
index a56c1e2..926202e 100644
--- a/frameworks/js/FlexJS/projects/BindingJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/BindingJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -73,7 +79,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/ChartsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ChartsJS/build.xml b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
index dbc5c58..29155ac 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
index 649b6ef..4880d97 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -75,7 +81,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
index 8de2c5a..a8e3afc 100644
--- a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CollectionsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CollectionsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/CollectionsJS/src/main/config/compile-js-config.xml
index c009150..ba47903 100644
--- a/frameworks/js/FlexJS/projects/CollectionsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/CollectionsJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -70,7 +76,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CoreJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CoreJS/build.xml b/frameworks/js/FlexJS/projects/CoreJS/build.xml
index 9a27073..8ebb892 100644
--- a/frameworks/js/FlexJS/projects/CoreJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CoreJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CoreJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CoreJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/CoreJS/src/main/config/compile-js-config.xml
index d710846..95c6bef 100644
--- a/frameworks/js/FlexJS/projects/CoreJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/CoreJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,9 +47,6 @@
<locale/>
- <library-path>
- </library-path>
-
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
@@ -75,7 +78,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <!--<target-player>${playerglobal.version}</target-player>-->
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
index aea3544..42e1f2b 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
@@ -59,16 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${CREATEJS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -82,16 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <arg value="-external-library-path+=${CREATEJS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -106,18 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="CREATEJS.SWC" value="${FALCONJX_HOME}/../js/libs/createjs.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/createjs.swc" />
- </condition>
- <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/target/createjs.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
index 08de41e..05fe473 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/src/main/config/compile-js-config.xml
@@ -21,7 +21,8 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
+ <external-library-path append="true">
+ <path-element>../../../../../../../../js/libs/createjs.swc</path-element>
</external-library-path>
<mxml>
@@ -31,6 +32,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,9 +51,6 @@
<locale/>
- <library-path>
- </library-path>
-
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/createjs</uri>
@@ -78,7 +85,5 @@
<uri>library://ns.apache.org/flexjs/createjs</uri>
</include-namespaces>
- <!--<target-player>${playerglobal.version}</target-player>-->
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/DragDropJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/DragDropJS/build.xml b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
index 2e8cc87..f02daeb 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/build.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
index a651af1..60f16de 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -73,7 +79,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/EffectsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/EffectsJS/build.xml b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
index 82d25cc..1849dcf 100644
--- a/frameworks/js/FlexJS/projects/EffectsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/EffectsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/EffectsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/EffectsJS/src/main/config/compile-js-config.xml
index 1aad9b2..e04a4f3 100644
--- a/frameworks/js/FlexJS/projects/EffectsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/EffectsJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -73,7 +79,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/FlatJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FlatJS/build.xml b/frameworks/js/FlexJS/projects/FlatJS/build.xml
index 5fa5d49..7296c3f 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
index b77144f..b5d9555 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -74,7 +80,5 @@
<uri>library://ns.apache.org/flexjs/flat</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/FormattersJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FormattersJS/build.xml b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
index aaf97a6..2b5e129 100644
--- a/frameworks/js/FlexJS/projects/FormattersJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
@@ -59,15 +59,8 @@
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
</target>
@@ -81,15 +74,9 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
<load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <arg value="-define=COMPILE::JS,true" />
</compc>
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
</target>
@@ -104,14 +91,6 @@
</target>
<target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c55ca39/frameworks/js/FlexJS/projects/FormattersJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FormattersJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/FormattersJS/src/main/config/compile-js-config.xml
index 1d24545..6918120 100644
--- a/frameworks/js/FlexJS/projects/FormattersJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/FormattersJS/src/main/config/compile-js-config.xml
@@ -21,9 +21,6 @@
<compiler>
<accessible>false</accessible>
- <external-library-path>
- </external-library-path>
-
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -31,6 +28,15 @@
<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <define>
+ <name>COMPILE::AS3</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -41,7 +47,7 @@
<locale/>
- <library-path>
+ <library-path append="true">
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
@@ -74,7 +80,5 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
</include-namespaces>
- <target-player>${playerglobal.version}</target-player>
-
</flex-config>