http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Flat/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml index 3c9e5da..cbdb7f7 100644 --- a/frameworks/projects/Flat/build.xml +++ b/frameworks/projects/Flat/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Flat/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/config/compile-as-config.xml b/frameworks/projects/Flat/src/main/config/compile-as-config.xml deleted file mode 100644 index 1db9fe4..0000000 --- a/frameworks/projects/Flat/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,89 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Binding.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Graphics.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/flat</uri> - <manifest>../resources/flat-manifest.xml</manifest> - </namespace> - <namespace> - <uri>library://ns.apache.org/flexjs/flat</uri> - <manifest>../resources/flat-as-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-lookup-only>true</include-lookup-only> - - <include-classes> - <class>FlatClasses</class> - <!--<class>FlatASJSClasses</class>--> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/Flat/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/config/compile-swf-config.xml b/frameworks/projects/Flat/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..2a2ff97 --- /dev/null +++ b/frameworks/projects/Flat/src/main/config/compile-swf-config.xml @@ -0,0 +1,98 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Binding.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Graphics.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <allow-subclass-overrides>true</allow-subclass-overrides> + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/flat</uri> + <manifest>../resources/flat-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/flat</uri> + <manifest>../resources/flat-as-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-lookup-only>true</include-lookup-only> + + <include-classes> + <class>FlatClasses</class> + <!--<class>FlatASJSClasses</class>--> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/FontAwesome/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/FontAwesome/build.xml b/frameworks/projects/FontAwesome/build.xml index de271c7..98670a5 100644 --- a/frameworks/projects/FontAwesome/build.xml +++ b/frameworks/projects/FontAwesome/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/FontAwesome/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/FontAwesome/src/main/config/compile-as-config.xml b/frameworks/projects/FontAwesome/src/main/config/compile-as-config.xml deleted file mode 100644 index 6af95a6..0000000 --- a/frameworks/projects/FontAwesome/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,88 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Binding.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Graphics.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/fa</uri> - <manifest>../resources/fa-manifest.xml</manifest> - </namespace> - <namespace> - <uri>library://ns.apache.org/flexjs/fa</uri> - <manifest>../resources/fa-as-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-lookup-only>true</include-lookup-only> - - <include-classes> - <class>FAClasses</class> - </include-classes> - - <include-namespaces> - <uri>library://ns.apache.org/flexjs/fa</uri> - </include-namespaces> - - <target-player>${playerglobal.version}</target-player> - - -</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/FontAwesome/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/FontAwesome/src/main/config/compile-swf-config.xml b/frameworks/projects/FontAwesome/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..90a2d34 --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/config/compile-swf-config.xml @@ -0,0 +1,97 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Binding.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Graphics.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <allow-subclass-overrides>true</allow-subclass-overrides> + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/fa</uri> + <manifest>../resources/fa-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/fa</uri> + <manifest>../resources/fa-as-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-lookup-only>true</include-lookup-only> + + <include-classes> + <class>FAClasses</class> + </include-classes> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/fa</uri> + </include-namespaces> + + <target-player>${playerglobal.version}</target-player> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Formatters/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml index dfaf8ec..c8c677f 100644 --- a/frameworks/projects/Formatters/build.xml +++ b/frameworks/projects/Formatters/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Formatters/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml deleted file mode 100644 index 4bd7bc5..0000000 --- a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,74 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/basic</uri> - <manifest>../resources/basic-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-classes> - <class>FormattersClasses</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/Formatters/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/src/main/config/compile-swf-config.xml b/frameworks/projects/Formatters/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..13f8d14 --- /dev/null +++ b/frameworks/projects/Formatters/src/main/config/compile-swf-config.xml @@ -0,0 +1,83 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-classes> + <class>FormattersClasses</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/GoogleMaps/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml index dbfd669..44d50ee 100644 --- a/frameworks/projects/GoogleMaps/build.xml +++ b/frameworks/projects/GoogleMaps/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml deleted file mode 100644 index 9f5a279..0000000 --- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,81 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/google</uri> - <manifest>../resources/google-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-classes> - <class>GoogleStubClasses</class> - <class>GoogleMapsClasses</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/GoogleMaps/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-swf-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..dc8546e --- /dev/null +++ b/frameworks/projects/GoogleMaps/src/main/config/compile-swf-config.xml @@ -0,0 +1,90 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <allow-subclass-overrides>true</allow-subclass-overrides> + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/google</uri> + <manifest>../resources/google-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-classes> + <class>GoogleStubClasses</class> + <class>GoogleMapsClasses</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/Graphics/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml index b47b813..2a591e4 100644 --- a/frameworks/projects/Graphics/build.xml +++ b/frameworks/projects/Graphics/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Graphics/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml deleted file mode 100644 index 75adafe..0000000 --- a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,82 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/basic</uri> - <manifest>../resources/basic-manifest.xml</manifest> - </namespace> - <namespace> - <uri>library://ns.apache.org/flexjs/svg</uri> - <manifest>../resources/svg-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-classes> - <class>GraphicsClasses</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml b/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..97799ad --- /dev/null +++ b/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml @@ -0,0 +1,91 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../resources/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/svg</uri> + <manifest>../resources/svg-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-classes> + <class>GraphicsClasses</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index 48bed3c..3ba9743 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/HTML/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/config/compile-as-config.xml b/frameworks/projects/HTML/src/main/config/compile-as-config.xml deleted file mode 100644 index a3d2ff6..0000000 --- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,78 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Binding.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Graphics.swc</path-element> - <path-element>../../../../../libs/Collections.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/basic</uri> - <manifest>../resources/basic-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-classes> - <class>HTMLClasses</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/HTML/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/config/compile-swf-config.xml b/frameworks/projects/HTML/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..1e80ecd --- /dev/null +++ b/frameworks/projects/HTML/src/main/config/compile-swf-config.xml @@ -0,0 +1,87 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Binding.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Graphics.swc</path-element> + <path-element>../../../../../libs/Collections.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <allow-subclass-overrides>true</allow-subclass-overrides> + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-classes> + <class>HTMLClasses</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/HTML5/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml index d5d373e..7c7c219 100644 --- a/frameworks/projects/HTML5/build.xml +++ b/frameworks/projects/HTML5/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/HTML5/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml deleted file mode 100644 index 6bfebb7..0000000 --- a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,80 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/html5</uri> - <manifest>../resources/html5-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-classes> - <class>HTML5Classes</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/HTML5/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/src/main/config/compile-swf-config.xml b/frameworks/projects/HTML5/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..025fba2 --- /dev/null +++ b/frameworks/projects/HTML5/src/main/config/compile-swf-config.xml @@ -0,0 +1,89 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <allow-subclass-overrides>true</allow-subclass-overrides> + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/html5</uri> + <manifest>../resources/html5-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-classes> + <class>HTML5Classes</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/JQuery/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml index 0ca87ba..4430287 100644 --- a/frameworks/projects/JQuery/build.xml +++ b/frameworks/projects/JQuery/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/jquery-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/JQuery/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml deleted file mode 100644 index aa453d5..0000000 --- a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,79 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../../../../libs/Core.swc</path-element> - <path-element>../../../../../libs/Basic.swc</path-element> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/jquery</uri> - <manifest>../resources/jquery-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - - <include-classes> - <class>JQueryClasses</class> - </include-classes> - - <include-namespaces> - <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/80e61d8e/frameworks/projects/JQuery/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/src/main/config/compile-swf-config.xml b/frameworks/projects/JQuery/src/main/config/compile-swf-config.xml new file mode 100644 index 0000000..af21589 --- /dev/null +++ b/frameworks/projects/JQuery/src/main/config/compile-swf-config.xml @@ -0,0 +1,88 @@ +<!-- + + 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> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Basic.swc</path-element> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </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> + + <define> + <name>COMPILE::SWF</name> + <value>true</value> + </define> + <define> + <name>COMPILE::JS</name> + <value>false</value> + </define> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path/> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/jquery</uri> + <manifest>../resources/jquery-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + <name>defaults.css</name> + <path>../resources/defaults.css</path> + </include-file> + + <include-classes> + <class>JQueryClasses</class> + </include-classes> + + <include-namespaces> + <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/80e61d8e/frameworks/projects/Language/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Language/build.xml b/frameworks/projects/Language/build.xml index 124bc41..39d0017 100644 --- a/frameworks/projects/Language/build.xml +++ b/frameworks/projects/Language/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Language/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Language/src/main/config/compile-as-config.xml b/frameworks/projects/Language/src/main/config/compile-as-config.xml deleted file mode 100644 index b526902..0000000 --- a/frameworks/projects/Language/src/main/config/compile-as-config.xml +++ /dev/null @@ -1,63 +0,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> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </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> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - - <!-- Use of the instanceof operator. --> - <warn-instance-of-changes>false</warn-instance-of-changes> - </compiler> - - <include-classes> - <class>LanguageClasses</class> - </include-classes> - - <target-player>20.0</target-player> - -</flex-config>
