You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/10/01 06:41:30 UTC
[1/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - Added missing event
declarations.
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/maven-archetypes 33eaf210f -> 1774068cd
Added missing event declarations.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7073d36c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7073d36c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7073d36c
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 7073d36c9f3c352c82a06de489f716df4e6441f7
Parents: 33eaf21
Author: Peter Ent <pe...@apache.org>
Authored: Thu Sep 29 12:21:00 2016 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Sep 29 12:21:00 2016 -0400
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mobile/StackedViewManager.as | 2 ++
.../src/main/flex/org/apache/flex/mobile/TabbedViewManager.as | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7073d36c/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
index 6720d1a..7a2d0f1 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
@@ -26,6 +26,8 @@ package org.apache.flex.mobile
import org.apache.flex.mobile.chrome.ToolBar;
import org.apache.flex.mobile.models.ViewManagerModel;
+ [Event(name="viewChanged",type="org.apache.flex.events.Event")]
+
/**
* The StackedViewManager displays a single View at a time from a
* collection of Views where views[0] is at the bottom and views[n-1]
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7073d36c/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
index 49438a8..243e285 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
@@ -24,6 +24,8 @@ package org.apache.flex.mobile
import org.apache.flex.mobile.chrome.TabBar;
import org.apache.flex.mobile.models.ViewManagerModel;
+ [Event(name="viewChanged",type="org.apache.flex.events.Event")]
+
/**
* The TabbedViewManager displays a set of views, only one of which is active at
* a time. The other views are reachable via a set of tab buttons at the bottom of
[5/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - change build to build JS
last now that it can pack its output into existing SWCs
Posted by cd...@apache.org.
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>
[8/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - keep build from deleting
new js template
Posted by cd...@apache.org.
keep build from deleting new js template
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1774068c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1774068c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1774068c
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 1774068cd296c9cf8826bd4adc77b1c118b3f8aa
Parents: 8087621
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 30 08:20:51 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 30 08:24:37 2016 -0700
----------------------------------------------------------------------
frameworks/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1774068c/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index e849d3f..75dda80 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -162,6 +162,7 @@
<exclude name="swfobject/expressInstall.swf" />
<exclude name="swfobject/swfobject.js" />
<exclude name="swfobject/history/**" />
+ <exclude name="js-index-template.html" />
</delete>
</target>
[2/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - - Fixed the directory
structure of the archetypes
Posted by cd...@apache.org.
- Fixed the directory structure of the archetypes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7cbbc425
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7cbbc425
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7cbbc425
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 7cbbc425328756dc90d5e2aa986f49147ea66ceb
Parents: 7073d36
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Sep 29 23:55:41 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Sep 29 23:56:02 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/maven/archetype.xml | 27 ------------------
.../flexjs-simple-library-archetype/pom.xml | 2 +-
.../src/main/resources/maven/archetype.xml | 30 --------------------
3 files changed, 1 insertion(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cbbc425/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
deleted file mode 100644
index 0daccb1..0000000
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
- <id>flexjs-simple-application-archetype</id>
- <resources>
- <resource>src/main/java/App.java</resource>
- </resources>
-</archetype>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cbbc425/archetypes/flexjs-simple-library-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-library-archetype/pom.xml b/archetypes/flexjs-simple-library-archetype/pom.xml
index 384a220..714a8dc 100644
--- a/archetypes/flexjs-simple-library-archetype/pom.xml
+++ b/archetypes/flexjs-simple-library-archetype/pom.xml
@@ -26,7 +26,7 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
- <artifactId>flexjs-library-archetype</artifactId>
+ <artifactId>flexjs-simple-library-archetype</artifactId>
<version>0.8.0-SNAPSHOT</version>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cbbc425/archetypes/flexjs-simple-library-archetype/src/main/resources/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-library-archetype/src/main/resources/maven/archetype.xml b/archetypes/flexjs-simple-library-archetype/src/main/resources/maven/archetype.xml
deleted file mode 100644
index 561c04e..0000000
--- a/archetypes/flexjs-simple-library-archetype/src/main/resources/maven/archetype.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
- <id>flexjs-simple-library-archetype</id>
- <resources>
- <resource>src/main/java/App.java</resource>
- </resources>
- <testResources>
- <resource>src/test/java/AppTest.java</resource>
- </testResources>
-</archetype>
[6/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - change build to build JS
last now that it can pack its output into existing SWCs
Posted by cd...@apache.org.
change build to build JS last now that it can pack its output into existing SWCs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b8d8c48b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b8d8c48b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b8d8c48b
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: b8d8c48b11f41ea435eefafc94eb0927229e8a4b
Parents: d585dc6
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 29 15:41:18 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 30 08:21:02 2016 -0700
----------------------------------------------------------------------
build.xml | 3 ---
frameworks/js/FlexJS/projects/BindingJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/ChartsJS/build.xml | 8 ++++++--
.../js/FlexJS/projects/CollectionsJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/CoreJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/CreateJSJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/DragDropJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/EffectsJS/build.xml | 9 +++++++--
frameworks/js/FlexJS/projects/FlatJS/build.xml | 9 +++++++--
.../js/FlexJS/projects/FormattersJS/build.xml | 8 ++++++--
.../js/FlexJS/projects/GoogleMapsJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/GraphicsJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/HTML5JS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/HTMLJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/JQueryJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/LanguageJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/MobileJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/NetworkJS/build.xml | 8 ++++++--
.../js/FlexJS/projects/ReflectionJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/StorageJS/build.xml | 8 ++++++--
frameworks/js/FlexJS/projects/XMLJS/build.xml | 8 ++++++--
frameworks/projects/Binding/build.xml | 15 ++++++---------
frameworks/projects/Binding/pom.xml | 6 ------
.../Binding/src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Charts/build.xml | 15 ++++++---------
frameworks/projects/Charts/pom.xml | 4 ----
.../Charts/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/Collections/build.xml | 15 ++++++---------
frameworks/projects/Collections/pom.xml | 6 ------
.../src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Core/build.xml | 15 ++++++---------
frameworks/projects/Core/pom.xml | 6 ------
.../Core/src/main/config/compile-as-config.xml | 6 ------
frameworks/projects/CreateJS/build.xml | 17 +++++++----------
frameworks/projects/CreateJS/pom.xml | 4 ----
.../CreateJS/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/DragDrop/build.xml | 15 ++++++---------
frameworks/projects/DragDrop/pom.xml | 6 ------
.../DragDrop/src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Effects/build.xml | 15 ++++++---------
frameworks/projects/Effects/pom.xml | 6 ------
.../Effects/src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Flat/build.xml | 15 ++++++---------
frameworks/projects/Flat/pom.xml | 4 ----
.../Flat/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/Formatters/build.xml | 15 ++++++---------
frameworks/projects/Formatters/pom.xml | 6 ------
.../src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/GoogleMaps/build.xml | 15 ++++++---------
frameworks/projects/GoogleMaps/pom.xml | 4 ----
.../src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/Graphics/build.xml | 15 ++++++---------
frameworks/projects/Graphics/pom.xml | 6 ------
.../Graphics/src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/HTML/build.xml | 15 ++++++---------
frameworks/projects/HTML/pom.xml | 4 ----
.../HTML/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/HTML5/build.xml | 15 ++++++---------
frameworks/projects/HTML5/pom.xml | 4 ----
.../HTML5/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/JQuery/build.xml | 15 ++++++---------
frameworks/projects/JQuery/pom.xml | 4 ----
.../JQuery/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/Language/build.xml | 15 ++++++---------
frameworks/projects/Language/pom.xml | 6 ------
.../Language/src/main/config/compile-as-config.xml | 6 ------
frameworks/projects/Mobile/build.xml | 15 ++++++---------
frameworks/projects/Mobile/pom.xml | 4 ----
.../Mobile/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/Network/build.xml | 15 ++++++---------
frameworks/projects/Network/pom.xml | 6 ------
.../Network/src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Reflection/build.xml | 15 ++++++---------
frameworks/projects/Reflection/pom.xml | 6 ------
.../src/main/config/compile-as-config.xml | 5 -----
frameworks/projects/Storage/build.xml | 15 ++++++---------
frameworks/projects/Storage/pom.xml | 4 ----
.../Storage/src/main/config/compile-as-config.xml | 4 ----
frameworks/projects/XML/build.xml | 16 ++++++----------
frameworks/projects/XML/pom.xml | 6 ------
.../XML/src/main/config/compile-as-config.xml | 5 -----
81 files changed, 243 insertions(+), 420 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f5ab8c5..18a583b 100644
--- a/build.xml
+++ b/build.xml
@@ -496,9 +496,6 @@
-->
<target name="frameworks" description="Full build of all Actionscript framework SWCs, including resource bundles and themes" unless="airsdk.found">
- <ant dir="${basedir}/frameworks/js/FlexJS">
- <property name="locale" value="${locale}"/>
- </ant>
<ant dir="${basedir}/frameworks">
<property name="locale" value="${locale}"/>
</ant>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/BindingJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/BindingJS/build.xml b/frameworks/js/FlexJS/projects/BindingJS/build.xml
index 8574b3c..454fa2a 100644
--- a/frameworks/js/FlexJS/projects/BindingJS/build.xml
+++ b/frameworks/js/FlexJS/projects/BindingJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ChartsJS/build.xml b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
index 29155ac..f901286 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
index a8e3afc..f1f976d 100644
--- a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CoreJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CoreJS/build.xml b/frameworks/js/FlexJS/projects/CoreJS/build.xml
index 8ebb892..1c1f737 100644
--- a/frameworks/js/FlexJS/projects/CoreJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CoreJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
index ab7f80e..75bb24e 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/createjs-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/DragDropJS/build.xml b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
index f02daeb..1a97cc8 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/build.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/EffectsJS/build.xml b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
index 1849dcf..698a40b 100644
--- a/frameworks/js/FlexJS/projects/EffectsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
@@ -28,8 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +63,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/FlatJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FlatJS/build.xml b/frameworks/js/FlexJS/projects/FlatJS/build.xml
index 7296c3f..45214de 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/build.xml
@@ -28,8 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +63,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FormattersJS/build.xml b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
index 2b5e129..7708d84 100644
--- a/frameworks/js/FlexJS/projects/FormattersJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
index aaf8f01..2656529 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
index 97c8fa6..628f069 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTML5JS/build.xml b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
index d6a382c..3843b20 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/build.xml b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
index 2966638..ee07b10 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/JQueryJS/build.xml b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
index 35fb357..41c057a 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/build.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/jquery-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/LanguageJS/build.xml b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
index 75968a2..5365aba 100644
--- a/frameworks/js/FlexJS/projects/LanguageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/MobileJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MobileJS/build.xml b/frameworks/js/FlexJS/projects/MobileJS/build.xml
index 6393c32..8244c63 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/build.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/NetworkJS/build.xml b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
index e4cca09..053b6cc 100644
--- a/frameworks/js/FlexJS/projects/NetworkJS/build.xml
+++ b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
index 09e1db4..f058231 100644
--- a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/StorageJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/StorageJS/build.xml b/frameworks/js/FlexJS/projects/StorageJS/build.xml
index 97bbb8f..c328fe2 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/XMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/XMLJS/build.xml b/frameworks/js/FlexJS/projects/XMLJS/build.xml
index 09ab015..e82d048 100644
--- a/frameworks/js/FlexJS/projects/XMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/XMLJS/build.xml
@@ -28,8 +28,12 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
- <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
</target>
<target name="clean">
@@ -58,7 +62,7 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
<arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 7ecb7ba..117b98a 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/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/Binding/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index dfcb04b..347c232 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/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/Binding/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/config/compile-as-config.xml b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
index c09e14e..9f68b12 100644
--- a/frameworks/projects/Binding/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Binding/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/BindingJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>BindingClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index d5b0e5e..0f9dae4 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/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/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index 394fcfe..2b4424e 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/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/Charts/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-as-config.xml b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
index 728b5ca..465490d 100644
--- a/frameworks/projects/Charts/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
@@ -66,10 +66,6 @@
<name>defaults.css</name>
<path>../resources/defaults.css</path>
</include-file>
- <include-file>
- <name>js/out/*</name>
- <path>../../../../../js/FlexJS/projects/ChartsJS/target/generated-sources/flexjs/*</path>
- </include-file>
<include-classes>
<class>ChartsClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 3330905..e24bf0f 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/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/Collections/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index fd3b3ed..f6d6af5 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -50,12 +50,6 @@
<includeClasses>
<includeClass>CollectionsClasses</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/Collections/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/src/main/config/compile-as-config.xml b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
index 2940e3b..282c931 100644
--- a/frameworks/projects/Collections/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Collections/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/CollectionsJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>CollectionsClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index c6744c5..0c1854a 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/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/Core/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index 6ca9a6d..16797fc 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -50,12 +50,6 @@
<includeClasses>
<includeClass>CoreClasses</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/Core/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/config/compile-as-config.xml b/frameworks/projects/Core/src/main/config/compile-as-config.xml
index 76ff3a1..dec155b 100644
--- a/frameworks/projects/Core/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-as-config.xml
@@ -53,7 +53,6 @@
<source-path>
<path-element>../flex</path-element>
- <!--path-element>generated-sources/asjs</path-element-->
</source-path>
<warn-no-constructor>false</warn-no-constructor>
@@ -62,11 +61,6 @@
<warn-instance-of-changes>false</warn-instance-of-changes>
</compiler>
- <include-file>
- <name>js/out/*</name>
- <path>../../../../../js/FlexJS/projects/CoreJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>CoreClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index bf7c1cd..de0a253 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/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,9 +74,7 @@
<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}">
<jvmarg line="${compc.jvm.args}"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index a550a17..cd1c3ae 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/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/CreateJS/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
index 5862e1b..b6c6cd3 100644
--- a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
@@ -66,10 +66,6 @@
<name>defaults.css</name>
<path>../resources/defaults.css</path>
</include-file>
- <include-file>
- <name>js/out/*</name>
- <path>../../../../../js/FlexJS/projects/CreateJSJS/target/generated-sources/flexjs/*</path>
- </include-file>
<include-classes>
<class>CreateJSClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index ff8a41c..59bcd35 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/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/DragDrop/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index 7470cab..d3a9cff 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -50,12 +50,6 @@
<includeClasses>
<includeClass>DragDropClasses</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/DragDrop/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
index 8be2e5b..87f20cb 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/DragDrop/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/DragDropJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>DragDropClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index f4496a4..ee591bc 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/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/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index f993c99..eab99ae 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -50,12 +50,6 @@
<includeClasses>
<includeClass>EffectsClasses</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/Effects/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/config/compile-as-config.xml b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
index 7b304e4..f5bd6ba 100644
--- a/frameworks/projects/Effects/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Effects/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/EffectsJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>EffectsClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index e4fc097..3c9e5da 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/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/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 511cc2f..36f8fee 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -60,10 +60,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>
<includeLookupOnly>true</includeLookupOnly>
</configuration>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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
index 3fb7880..8ee2592 100644
--- a/frameworks/projects/Flat/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Flat/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/FlatJS/target/generated-sources/flexjs/*</path>
- </include-file>
<include-lookup-only>true</include-lookup-only>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index daf0972..dfaf8ec 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/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/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 417c4db..8fd94d0 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -50,12 +50,6 @@
<includeClasses>
<includeClass>FormattersClasses</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/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
index a6fcfbb..f1b67ad 100644
--- a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
@@ -60,11 +60,6 @@
<warn-no-constructor>false</warn-no-constructor>
</compiler>
- <include-file>
- <name>js/out/*</name>
- <path>../../../../../js/FlexJS/projects/FormattersJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>FormattersClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index 50484bc..dbfd669 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/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/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index f4bce2a..915bab7 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -56,10 +56,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/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
index e2bb1cb..e94188a 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/GoogleMaps/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/GoogleMapsJS/target/generated-sources/flexjs/*</path>
- </include-file>
<include-classes>
<class>GoogleStubClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index df5f5f2..b47b813 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/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/Graphics/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index 52caac8..75d7339 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -54,12 +54,6 @@
<includeClasses>
<includeClass>GraphicsClasses</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/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
index c05225f..765ccbe 100644
--- a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Graphics/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/GraphicsJS/target/generated-sources/flexjs/*</path>
- </include-file>
-
<include-classes>
<class>GraphicsClasses</class>
</include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 5fb4679..5ee6dd8 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/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/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index 613755a..5eab490 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -64,10 +64,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/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
index 70f5fd0..7b1c242 100644
--- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
@@ -74,10 +74,6 @@
<name>defaults.css</name>
<path>../resources/defaults.css</path>
</include-file>
- <include-file>
- <name>js/out/*</name>
- <path>../../../../../js/FlexJS/projects/HTMLJS/target/generated-sources/flexjs/*</path>
- </include-file>
<include-classes>
<class>HTMLClasses</class>
[3/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - - Updated the gitignore and
added the archetype config files
Posted by cd...@apache.org.
- Updated the gitignore and added the archetype config files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/91cf13f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/91cf13f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/91cf13f6
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 91cf13f6c22f25c8e37b7054ca3fb62b0022967d
Parents: 7cbbc42
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Sep 30 09:39:34 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Sep 30 09:39:34 2016 +0200
----------------------------------------------------------------------
.gitignore | 1 -
.../main/resources/META-INF/maven/archetype.xml | 27 ++++++++++++++++++
.../main/resources/META-INF/maven/archetype.xml | 30 ++++++++++++++++++++
3 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/91cf13f6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 95222f0..96c39ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ in/
swfobject/
flex2/
thirdparty/
-META-INF/
3.0.33/
3.0.33
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/91cf13f6/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 0000000..0daccb1
--- /dev/null
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
+ <id>flexjs-simple-application-archetype</id>
+ <resources>
+ <resource>src/main/java/App.java</resource>
+ </resources>
+</archetype>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/91cf13f6/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 0000000..561c04e
--- /dev/null
+++ b/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
+ <id>flexjs-simple-library-archetype</id>
+ <resources>
+ <resource>src/main/java/App.java</resource>
+ </resources>
+ <testResources>
+ <resource>src/test/java/AppTest.java</resource>
+ </testResources>
+</archetype>
[7/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - force linking is a bit
different in JS. See notes on CoreTester.as
Posted by cd...@apache.org.
force linking is a bit different in JS. See notes on CoreTester.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/80876211
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/80876211
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/80876211
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 8087621162138f9afe5be51f329528ae7fea3f6a
Parents: b8d8c48
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 30 08:16:41 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 30 08:24:37 2016 -0700
----------------------------------------------------------------------
.../GenericTests/src/flexUnitTests/CoreTester.as | 13 +++++++++++++
.../src/flexUnitTests/ObservedBugsTester.as | 4 ++++
.../GenericTests/src/flexUnitTests/ReflectionTester.as | 9 ++++++---
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80876211/manualtests/GenericTests/src/flexUnitTests/CoreTester.as
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/src/flexUnitTests/CoreTester.as b/manualtests/GenericTests/src/flexUnitTests/CoreTester.as
index 56531d0..9af36e3 100644
--- a/manualtests/GenericTests/src/flexUnitTests/CoreTester.as
+++ b/manualtests/GenericTests/src/flexUnitTests/CoreTester.as
@@ -24,6 +24,19 @@ package flexUnitTests
[RunWith("org.flexunit.runners.Suite")]
public class CoreTester
{
+ public function CoreTester()
+ {
+ // for JS, force-link these classes in the output
+ var arr:Array = [StrandTesterTest, BinaryDataTesterTest];
+ }
+
+ // in JS, using a class as a type won't include the class in
+ // the output since types are not chcked in JS. It is when
+ // the actual class is referenced that it will be included
+ // in the output.
+ // Is there a reason to use reflection to gather the set
+ // of tests? I would think an array of tests would wokr
+ // better and allow you to define order.
public var strandTesterTest:StrandTesterTest;
public var binaryDataTesterTest:BinaryDataTesterTest;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80876211/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as b/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as
index e01b7c2..11f62e3 100644
--- a/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as
+++ b/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as
@@ -24,6 +24,10 @@ package flexUnitTests
[RunWith("org.flexunit.runners.Suite")]
public class ObservedBugsTester
{
+ public function ObservedBugsTester()
+ {
+ var arr:Array = [ObservedBugTests];
+ }
public var observedBugsTest1:ObservedBugTests;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80876211/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as b/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as
index 14a7aa6..74c5b4d 100644
--- a/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as
+++ b/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as
@@ -24,10 +24,13 @@ package flexUnitTests
[RunWith("org.flexunit.runners.Suite")]
public class ReflectionTester
{
-
-
+ public function ReflectionTester()
+ {
+ // see notes in CoreTester
+ var arr:Array = [ReflectionTesterTest, ReflectionTesterTestUseCache, ReflectionTesterTestAlias];
+ }
+
public var reflectionTesterCacheTest:ReflectionTesterTestUseCache;
-
public var reflectionTesterTest:ReflectionTesterTest;
public var reflectionTesterAliasTest:ReflectionTesterTestAlias;
[4/8] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - - Fixed an obvious error in
the descriptor
Posted by cd...@apache.org.
- Fixed an obvious error in the descriptor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d585dc68
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d585dc68
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d585dc68
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: d585dc6898396f8ab53fd2e0c8dafdbce3a8f703
Parents: 91cf13f
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Sep 30 16:22:09 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Sep 30 16:22:09 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/maven/archetype.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d585dc68/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
index 0daccb1..e765a36 100644
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -22,6 +22,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>flexjs-simple-application-archetype</id>
<resources>
- <resource>src/main/java/App.java</resource>
+ <resource>src/main/flex/App.mxml</resource>
</resources>
</archetype>