You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/05/13 19:01:47 UTC
[1/4] git commit: [flex-asjs] [refs/heads/ide-projects] - switch
folder name to generated-sources
Repository: flex-asjs
Updated Branches:
refs/heads/ide-projects 060b27f0d -> c70e44adc
switch folder name to generated-sources
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1ca548da
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1ca548da
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1ca548da
Branch: refs/heads/ide-projects
Commit: 1ca548dab28d03137eccd16a7c6393d9455b4cd2
Parents: 060b27f
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 13 11:46:28 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 13 11:46:28 2016 -0700
----------------------------------------------------------------------
examples/build_example.xml | 6 +++---
frameworks/js/FlexJS/projects/BindingJS/build.xml | 3 ++-
frameworks/js/FlexJS/projects/ChartsJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/CollectionsJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/CoreJS/build.xml | 5 ++++-
frameworks/js/FlexJS/projects/CreateJSJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/DragDropJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/EffectsJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/FlatJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/FormattersJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/GraphicsJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/HTML5JS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/HTMLJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/JQueryJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/MobileJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/NetworkJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/ReflectionJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/StorageJS/build.xml | 4 ++--
frameworks/js/FlexJS/projects/XMLJS/build.xml | 4 ++--
20 files changed, 43 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 15f3596..aa0393f 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -247,7 +247,7 @@
<arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
- <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" />
<arg value="${basedir}/src/${example}.mxml" />
</java>
<fail>
@@ -291,7 +291,7 @@
<arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
- <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" />
<arg value="${basedir}/src/${example}.mxml" />
</java>
<fail>
@@ -336,7 +336,7 @@
<arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
- <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" />
<arg value="${basedir}/src/${example}.as" />
</java>
<fail>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 ff119f6..12a62fa 100644
--- a/frameworks/js/FlexJS/projects/BindingJS/build.xml
+++ b/frameworks/js/FlexJS/projects/BindingJS/build.xml
@@ -135,7 +135,8 @@
</target>
<target name="copy-js" >
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**" />
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 a5fac6a..6f32686 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
@@ -95,7 +95,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -130,7 +129,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 b799458..0b526f7 100644
--- a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
@@ -95,7 +95,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -130,7 +129,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 d800753..9806f7d 100644
--- a/frameworks/js/FlexJS/projects/CoreJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CoreJS/build.xml
@@ -106,6 +106,8 @@
<echo message="Compiling target/${target.name}"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
+ <mkdir dir="${basedir}/target"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -138,7 +140,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 f8141c0..8b69fd9 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
@@ -108,7 +108,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -144,7 +143,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 3ee1053..21c7f02 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/build.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
@@ -102,7 +102,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -137,7 +136,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 01f29f0..efc449f 100644
--- a/frameworks/js/FlexJS/projects/EffectsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
@@ -103,7 +103,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -138,7 +137,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 1329302..3b9497c 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/build.xml
@@ -102,7 +102,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -137,7 +136,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 78cf647..dcd0c72 100644
--- a/frameworks/js/FlexJS/projects/FormattersJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
@@ -94,7 +94,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -129,7 +128,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 def3cf1..c42f400 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
@@ -99,7 +99,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -135,7 +134,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 bcf5da3..2108ce6 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
@@ -102,7 +102,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -137,7 +136,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 c375dbf..702e60e 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
@@ -94,7 +94,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -129,7 +128,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 d88fc4a..a034ce9 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
@@ -100,7 +100,6 @@
<echo message="Compiling target/externs/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -135,7 +134,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 7030adb..f7d4f0d 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/build.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
@@ -99,7 +99,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -135,7 +134,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 1e3d0b4..94ee6dc 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/build.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/build.xml
@@ -94,7 +94,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -129,7 +128,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 06af9bb..5d660e2 100644
--- a/frameworks/js/FlexJS/projects/NetworkJS/build.xml
+++ b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
@@ -100,7 +100,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -135,7 +134,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 6dcc084..7652935 100644
--- a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
@@ -100,7 +100,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -135,7 +134,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 9de3dac..b732390 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/build.xml
@@ -105,7 +105,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -141,7 +140,8 @@
</target>
<target name="copy-js">
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ca548da/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 d67f8c2..2ec623f 100644
--- a/frameworks/js/FlexJS/projects/XMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/XMLJS/build.xml
@@ -97,7 +97,6 @@
<echo message="Compiling target/${target.name}"/>
<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="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
<mkdir dir="${basedir}/target"/>
@@ -132,7 +131,8 @@
</target>
<target name="copy-js" >
- <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
<fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**" />
</fileset>
[4/4] git commit: [flex-asjs] [refs/heads/ide-projects] - fix clean
Posted by ah...@apache.org.
fix clean
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c70e44ad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c70e44ad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c70e44ad
Branch: refs/heads/ide-projects
Commit: c70e44adcee6addefbd39be80fdae9f7c56ac4b8
Parents: 7478c67
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 13 11:57:04 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 13 11:57:04 2016 -0700
----------------------------------------------------------------------
frameworks/js/FlexJS/build.xml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c70e44ad/frameworks/js/FlexJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/build.xml b/frameworks/js/FlexJS/build.xml
index c4b88ca..182ca4d 100644
--- a/frameworks/js/FlexJS/build.xml
+++ b/frameworks/js/FlexJS/build.xml
@@ -136,25 +136,8 @@
<ant dir="${basedir}/projects/StorageJS" target="clean"/>
<ant dir="${basedir}/projects/XMLJS" target="clean"/>
- <!-- delete the FlashBuilder executable directories -->
- <delete includeemptydirs="true" failonerror="false">
- <fileset dir="${basedir}/projects">
- <include name="*/bin/**"/>
- </fileset>
- </delete>
- <!-- Delete empty folders -->
<delete dir="${basedir}/libs"/>
- <delete dir="${basedir}/locale">
- <exclude name="**/metadata.properties"/>
- </delete>
- <delete dir="${basedir}/libs/generated"/>
- <!-- Delete only if it exists and it is empty. air and swfobject put dirs here. -->
- <delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false">
- <exclude name="swfobject/index.template.html" />
- <exclude name="swfobject/expressInstall.swf" />
- <exclude name="swfobject/swfobject.js" />
- <exclude name="swfobject/history/**" />
- </delete>
+ <delete dir="${basedir}/generated-sources"/>
</target>
<target name="Binding" description="Clean build of Binding.swc">
[3/4] git commit: [flex-asjs] [refs/heads/ide-projects] - launch
scripts now reference new folder name
Posted by ah...@apache.org.
launch scripts now reference new folder name
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7478c673
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7478c673
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7478c673
Branch: refs/heads/ide-projects
Commit: 7478c67351ae57413a1f34548dd7902cfe1601e7
Parents: 054faeb
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 13 11:51:59 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 13 11:51:59 2016 -0700
----------------------------------------------------------------------
js/bin/compc | 2 +-
js/bin/compc.bat | 2 +-
js/bin/mxmlc | 2 +-
js/bin/mxmlc.bat | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7478c673/js/bin/compc
----------------------------------------------------------------------
diff --git a/js/bin/compc b/js/bin/compc
index 5d5a953..814bf47 100755
--- a/js/bin/compc
+++ b/js/bin/compc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=FLEXJS -sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/src" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=FLEXJS -sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/generated-sources" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7478c673/js/bin/compc.bat
----------------------------------------------------------------------
diff --git a/js/bin/compc.bat b/js/bin/compc.bat
index f35c335..3c972fe 100644
--- a/js/bin/compc.bat
+++ b/js/bin/compc.bat
@@ -26,4 +26,4 @@ if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon
if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\compc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\src" %*
\ No newline at end of file
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\compc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\generated-sources" %*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7478c673/js/bin/mxmlc
----------------------------------------------------------------------
diff --git a/js/bin/mxmlc b/js/bin/mxmlc
index 1a34671..e617d6f 100755
--- a/js/bin/mxmlc
+++ b/js/bin/mxmlc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=FLEXJS -sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/src" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=FLEXJS -sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/generated-sources" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7478c673/js/bin/mxmlc.bat
----------------------------------------------------------------------
diff --git a/js/bin/mxmlc.bat b/js/bin/mxmlc.bat
index cfa4a9e..675f80b 100644
--- a/js/bin/mxmlc.bat
+++ b/js/bin/mxmlc.bat
@@ -26,4 +26,4 @@ if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon
if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\mxmlc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\src" %*
\ No newline at end of file
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\mxmlc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\generated-sources" %*
\ No newline at end of file
[2/4] git commit: [flex-asjs] [refs/heads/ide-projects] - hide copies
of generated sources
Posted by ah...@apache.org.
hide copies of generated sources
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/054faebe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/054faebe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/054faebe
Branch: refs/heads/ide-projects
Commit: 054faebef0b72997bb8b8e26bc7bdb8bdb1aa4b1
Parents: 1ca548d
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 13 11:49:34 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 13 11:49:34 2016 -0700
----------------------------------------------------------------------
.gitignore | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/054faebe/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index d2aacfb..ad7ee76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,4 +123,7 @@ html-template
#VF2JS generated files
bin
-vf2js/frameworks/js/
\ No newline at end of file
+vf2js/frameworks/js/
+
+#FlexJS generated files
+frameworks/js/FlexJS/generated-sources