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/01/11 21:56:03 UTC
[19/20] git commit: [flex-asjs] [refs/heads/mavenfolders] - go back
to not using version in copies of swcs in frameworks/libs. Updating the
version in the compile-config is painful since it isn't processed by Ant
go back to not using version in copies of swcs in frameworks/libs. Updating the version in the compile-config is painful since it isn't processed by Ant
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/63249503
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/63249503
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/63249503
Branch: refs/heads/mavenfolders
Commit: 6324950312852714686511b24cfcfbd66d778bb1
Parents: 72c9cb8
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 11 12:51:43 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 11 12:51:43 2016 -0800
----------------------------------------------------------------------
frameworks/projects/Core/build.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/63249503/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 4a768d7..8e92f15 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -29,6 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
<property name="target.name" value="Core-${release.version}.swc" />
+ <property name="target.name.no.version" value="Core.swc" />
<target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Core.swc">
</target>
@@ -91,7 +92,7 @@
<arg value="-define=COMPILE::AS3,true" />
<arg value="-define=COMPILE::JS,false" />
</compc>
- <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
<target name="compile-asjs">
@@ -157,7 +158,7 @@
<arg value="-define=COMPILE::AS3,false" />
<arg value="-define=COMPILE::JS,true" />
</compc>
- <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name}" />
+ <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}" />
</target>
<target name="copy-js">