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 2015/11/04 20:47:50 UTC
[6/7] git commit: [flex-asjs] [refs/heads/core_js_to_as] - get build
to stop copying handwritten js files
get build to stop copying handwritten js 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/c9d8f52b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c9d8f52b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c9d8f52b
Branch: refs/heads/core_js_to_as
Commit: c9d8f52b6342215380e32e8385b3d1c5a4dd876c
Parents: 2297170
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 4 11:47:05 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 4 11:47:05 2015 -0800
----------------------------------------------------------------------
frameworks/build.xml | 15 +++------------
frameworks/projects/Binding/build.xml | 3 ---
frameworks/projects/Binding/compile-config.xml | 1 -
frameworks/projects/Collections/build.xml | 2 +-
frameworks/projects/HTML/build.xml | 3 ---
5 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9d8f52b/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 42c6978..765476e 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -95,16 +95,13 @@
</target>
<target name="compile-asjs" description="Cross-compiles all SWCs">
- <ant dir="${basedir}/projects/Binding" target="compile-asjs"/>
<ant dir="${basedir}/projects/Charts" target="compile-asjs"/>
- <ant dir="${basedir}/projects/Collections" target="compile-asjs"/>
<ant dir="${basedir}/projects/CreateJS" target="compile-asjs"/>
<ant dir="${basedir}/projects/DragDrop" target="compile-asjs"/>
<ant dir="${basedir}/projects/Effects" target="compile-asjs"/>
<ant dir="${basedir}/projects/Formatters" target="compile-asjs"/>
<ant dir="${basedir}/projects/GoogleMaps" target="compile-asjs"/>
<ant dir="${basedir}/projects/Graphics" target="compile-asjs"/>
- <ant dir="${basedir}/projects/HTML" target="compile-asjs"/>
<ant dir="${basedir}/projects/HTML5" target="compile-asjs"/>
<ant dir="${basedir}/projects/JQuery" target="compile-asjs"/>
<ant dir="${basedir}/projects/Mobile" target="compile-asjs"/>
@@ -112,9 +109,7 @@
</target>
<target name="lint-js" description="Cross-compiles all SWCs">
- <ant dir="${basedir}/projects/Binding" target="lint-js"/>
<ant dir="${basedir}/projects/Charts" target="lint-js"/>
- <ant dir="${basedir}/projects/Collections" target="lint-js"/>
<ant dir="${basedir}/projects/CreateJS" target="lint-js"/>
<ant dir="${basedir}/projects/DragDrop" target="lint-js"/>
<ant dir="${basedir}/projects/Effects" target="lint-js"/>
@@ -122,7 +117,6 @@
<ant dir="${basedir}/projects/Formatters" target="lint-js"/>
<ant dir="${basedir}/projects/GoogleMaps" target="lint-js"/>
<ant dir="${basedir}/projects/Graphics" target="lint-js"/>
- <ant dir="${basedir}/projects/HTML" target="lint-js"/>
<ant dir="${basedir}/projects/HTML5" target="lint-js"/>
<ant dir="${basedir}/projects/JQuery" target="lint-js"/>
<ant dir="${basedir}/projects/Mobile" target="lint-js"/>
@@ -132,11 +126,8 @@
<target name="re-compile" description="Builds all SWCs which should pick up the JS files from asjs">
<!-- order may matter due to dependencies -->
<ant dir="${basedir}/projects/Graphics" target="compile"/>
- <ant dir="${basedir}/projects/Binding" target="compile"/>
- <ant dir="${basedir}/projects/HTML" target="compile"/>
<ant dir="${basedir}/projects/Flat" target="compile"/>
<ant dir="${basedir}/projects/Charts" target="compile"/>
- <ant dir="${basedir}/projects/Collections" target="compile"/>
<ant dir="${basedir}/projects/CreateJS" target="compile"/>
<ant dir="${basedir}/projects/DragDrop" target="compile"/>
<ant dir="${basedir}/projects/Effects" target="compile"/>
@@ -211,7 +202,7 @@
</target>
<target name="Binding" description="Clean build of Binding.swc">
- <ant dir="${basedir}/projects/Binding"/>
+ <ant dir="${basedir}/projects/Binding" target="all"/>
</target>
<target name="Charts" description="Clean build of Charts.swc">
@@ -223,7 +214,7 @@
</target>
<target name="Collections" description="Clean build of Collections.swc">
- <ant dir="${basedir}/projects/Collections"/>
+ <ant dir="${basedir}/projects/Collections" target="all"/>
</target>
<target name="CreateJS" description="Clean build of CreateJS.swc">
@@ -255,7 +246,7 @@
</target>
<target name="HTML" description="Clean build of HTML.swc">
- <ant dir="${basedir}/projects/HTML"/>
+ <ant dir="${basedir}/projects/HTML" target="all"/>
</target>
<target name="HTML5" description="Clean build of HTML5.swc">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9d8f52b/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index c8f9c5f..3c2bebe 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -164,9 +164,6 @@
<target name="copy-js" >
<copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
- <fileset dir="${basedir}/js/src">
- <include name="**/**" />
- </fileset>
<fileset dir="${basedir}/js/out">
<include name="**/**" />
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9d8f52b/frameworks/projects/Binding/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/compile-config.xml b/frameworks/projects/Binding/compile-config.xml
index b2a4c59..e9e8515 100644
--- a/frameworks/projects/Binding/compile-config.xml
+++ b/frameworks/projects/Binding/compile-config.xml
@@ -54,7 +54,6 @@
<source-path>
<path-element>as/src</path-element>
- <path-element>asjs/src</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9d8f52b/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 6dbe094..02a7112 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -162,7 +162,7 @@
<target name="copy-js" >
<copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
- <fileset dir="${basedir}/js/src">
+ <fileset dir="${basedir}/js/out">
<include name="**/**" />
</fileset>
</copy>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9d8f52b/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index d65a172..b98d7a8 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -166,9 +166,6 @@
<target name="lint-js" depends="gjslint, jshint, copy-js" />
<target name="copy-js" >
<copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
- <fileset dir="${basedir}/js/src">
- <include name="**/**" />
- </fileset>
<fileset dir="${basedir}/js/out">
<include name="**/**" />
</fileset>