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/08/11 21:45:02 UTC
[5/7] git commit: [flex-falcon] [refs/heads/develop] - more fixes for
release package
more fixes for release package
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4bc17745
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4bc17745
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4bc17745
Branch: refs/heads/develop
Commit: 4bc177456255114e5e58b2c5974f0b25c479c6c2
Parents: cdffc40
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 11 10:20:30 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 11 10:20:30 2016 -0700
----------------------------------------------------------------------
build.xml | 5 ++++-
flex-compiler-oem/build.xml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4bc17745/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7077688..f0335da 100644
--- a/build.xml
+++ b/build.xml
@@ -87,7 +87,7 @@
<ant dir="compiler.tests" target="eclipse"/>
</target>
- <target name="sdk" description="Produces an SDK at generated/dist/sdk containing both Falcon and the legacy compiler.">
+ <target name="sdk" description="Produces an set of jars in compiler/lib.">
<ant dir="compiler-build-tools" />
<ant dir="compiler-jburg-types" />
<ant dir="compiler-test-utils" />
@@ -137,6 +137,7 @@
</target>
<target name="typedef.swcs">
+ <property name="FALCON_HOME" value="${basedir}/compiler" />
<property name="FALCONJX_HOME" value="${basedir}/compiler-jx" />
<ant dir="${FLEXJS_TYPEDEFS_HOME}" />
</target>
@@ -186,8 +187,10 @@
<ant dir="debugger" target="clean"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
+ <!-- remove legacy folders if they exist -->
<delete dir="${basedir}/compiler.jx" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/compiler/generated" failonerror="false" includeEmptyDirs="true"/>
+ <delete dir="${basedir}/externs" failonerror="false" includeEmptyDirs="true"/>
</target>
<target name="maven-artifacts" description="Installs Falcon artifacts to a local maven repository">
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4bc17745/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index 5e58d6a..ebf7445 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -45,7 +45,7 @@
<!-- set FLEX_HOME from environment if not already set -->
<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
- <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/generated/dist/sdk directory -->
+ <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler directory -->
<!-- where a Falcon SDK is built -->
<!-- All output paths are expressed as absolute paths starting with ${sdk} -->
<property name="sdk" value="${compiler}"/>