http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML5/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml index 0b4daf1..d5d373e 100644 --- a/frameworks/projects/HTML5/build.xml +++ b/frameworks/projects/HTML5/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML5/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml index a0aaeec..d6bfecf 100644 --- a/frameworks/projects/HTML5/pom.xml +++ b/frameworks/projects/HTML5/pom.xml @@ -55,10 +55,6 @@ <name>defaults.css</name> <path>../src/main/resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> </includeFiles> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 index 51b9206..959b649 100644 --- a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml +++ b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml @@ -64,10 +64,6 @@ <name>defaults.css</name> <path>../resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/HTML5JS/target/generated-sources/flexjs/*</path> - </include-file> <include-classes> <class>HTML5Classes</class> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/JQuery/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml index 52509b0..0ca87ba 100644 --- a/frameworks/projects/JQuery/build.xml +++ b/frameworks/projects/JQuery/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/JQuery/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml index 3902d83..414c049 100644 --- a/frameworks/projects/JQuery/pom.xml +++ b/frameworks/projects/JQuery/pom.xml @@ -55,10 +55,6 @@ <name>defaults.css</name> <path>../src/main/resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> </includeFiles> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 index c732dd1..0181e50 100644 --- a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml +++ b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml @@ -64,10 +64,6 @@ <name>defaults.css</name> <path>../resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/JQueryJS/target/generated-sources/flexjs/*</path> - </include-file> <include-classes> <class>JQueryClasses</class> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Language/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Language/build.xml b/frameworks/projects/Language/build.xml index 7a06b78..124bc41 100644 --- a/frameworks/projects/Language/build.xml +++ b/frameworks/projects/Language/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Language/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Language/pom.xml b/frameworks/projects/Language/pom.xml index ac7119e..6b1ff3d 100644 --- a/frameworks/projects/Language/pom.xml +++ b/frameworks/projects/Language/pom.xml @@ -44,12 +44,6 @@ <includeClasses> <includeClass>LanguageClasses</includeClass> </includeClasses> - <includeFiles> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> - </includeFiles> <skipExtern>false</skipExtern> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 index 2bde07e..b526902 100644 --- a/frameworks/projects/Language/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Language/src/main/config/compile-as-config.xml @@ -46,7 +46,6 @@ <source-path> <path-element>../flex</path-element> - <!--path-element>generated-sources/asjs</path-element--> </source-path> <warn-no-constructor>false</warn-no-constructor> @@ -55,11 +54,6 @@ <warn-instance-of-changes>false</warn-instance-of-changes> </compiler> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/LanguageJS/target/generated-sources/flexjs/*</path> - </include-file> - <include-classes> <class>LanguageClasses</class> </include-classes> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Mobile/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml index 16d0352..41da261 100644 --- a/frameworks/projects/Mobile/build.xml +++ b/frameworks/projects/Mobile/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Mobile/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml index a20db8d..d11f863 100644 --- a/frameworks/projects/Mobile/pom.xml +++ b/frameworks/projects/Mobile/pom.xml @@ -59,10 +59,6 @@ <name>defaults.css</name> <path>../src/main/resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> </includeFiles> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml index 58ddda6..4b20628 100644 --- a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml @@ -70,10 +70,6 @@ <name>defaults.css</name> <path>../resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/MobileJS/target/generated-sources/flexjs/*</path> - </include-file> <include-classes> <class>MobileClasses</class> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Network/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml index 7b382f0..cf45775 100644 --- a/frameworks/projects/Network/build.xml +++ b/frameworks/projects/Network/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Network/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml index 884fdab..b13cf88 100644 --- a/frameworks/projects/Network/pom.xml +++ b/frameworks/projects/Network/pom.xml @@ -50,12 +50,6 @@ <includeClasses> <includeClass>NetworkClasses</includeClass> </includeClasses> - <includeFiles> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> - </includeFiles> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Network/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Network/src/main/config/compile-as-config.xml b/frameworks/projects/Network/src/main/config/compile-as-config.xml index 6daa048..591d4c8 100644 --- a/frameworks/projects/Network/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Network/src/main/config/compile-as-config.xml @@ -59,11 +59,6 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/NetworkJS/target/generated-sources/flexjs/*</path> - </include-file> - <include-classes> <class>NetworkClasses</class> </include-classes> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Reflection/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml index aa73d10..d2b78ca 100644 --- a/frameworks/projects/Reflection/build.xml +++ b/frameworks/projects/Reflection/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Reflection/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml index 2a09ee5..ab9db5a 100644 --- a/frameworks/projects/Reflection/pom.xml +++ b/frameworks/projects/Reflection/pom.xml @@ -42,12 +42,6 @@ <extensions>true</extensions> <configuration> <includeSources>true</includeSources> - <includeFiles> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> - </includeFiles> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml index 072ee6d..6b65d4e 100644 --- a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml @@ -55,11 +55,6 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/ReflectionJS/target/generated-sources/flexjs/*</path> - </include-file> - <!-- TODO: Why this? --> <include-sources> <path-element>../flex</path-element> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Storage/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml index 2494b65..6f079bf 100644 --- a/frameworks/projects/Storage/build.xml +++ b/frameworks/projects/Storage/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Storage/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml index b7d7ff9..0d49303 100644 --- a/frameworks/projects/Storage/pom.xml +++ b/frameworks/projects/Storage/pom.xml @@ -55,10 +55,6 @@ <name>defaults.css</name> <path>../src/main/resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> </includeFiles> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Storage/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Storage/src/main/config/compile-as-config.xml b/frameworks/projects/Storage/src/main/config/compile-as-config.xml index 1b38feb..60a81a1 100644 --- a/frameworks/projects/Storage/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Storage/src/main/config/compile-as-config.xml @@ -63,10 +63,6 @@ <name>defaults.css</name> <path>../resources/defaults.css</path> </include-file> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/StorageJS/target/generated-sources/flexjs/*</path> - </include-file> <include-classes> <class>StorageClasses</class> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/XML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml index 0c188b0..7dc535c 100644 --- a/frameworks/projects/XML/build.xml +++ b/frameworks/projects/XML/build.xml @@ -29,18 +29,17 @@ <property name="target.name" value="${ant.project.name}.swc" /> - <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc"> </target> - <target name="check-js"> - <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc"> - <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/> - </uptodate> - </target> - <target name="js-if-needed" depends="check-js" unless="js-not-needed"> + <target name="compile-js"> <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" /> </target> + <target name="copy-swc"> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" /> + </target> + <target name="check-for-tests" > <condition property="skip-tests" > <not> @@ -75,8 +74,6 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <compc fork="true" output="${basedir}/target/${target.name}"> @@ -87,7 +84,6 @@ <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}" /> </target> <target name="check-compiler" depends="check-falcon-home"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/XML/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml index a8392ac..90e30d1 100644 --- a/frameworks/projects/XML/pom.xml +++ b/frameworks/projects/XML/pom.xml @@ -48,12 +48,6 @@ </namespace> </namespaces> <includeSources>true</includeSources> - <includeFiles> - <include-file> - <name>js/out/*</name> - <path>generated-sources/flexjs/*</path> - </include-file> - </includeFiles> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/XML/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/XML/src/main/config/compile-as-config.xml b/frameworks/projects/XML/src/main/config/compile-as-config.xml index 6750e30..07cf4e8 100644 --- a/frameworks/projects/XML/src/main/config/compile-as-config.xml +++ b/frameworks/projects/XML/src/main/config/compile-as-config.xml @@ -59,11 +59,6 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> - <include-file> - <name>js/out/*</name> - <path>../../../../../js/FlexJS/projects/XMLJS/target/generated-sources/flexjs/*</path> - </include-file> - <include-classes> <class>XMLClasses</class> </include-classes>