You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/11/15 23:13:11 UTC
svn commit: r1410052 -
/incubator/flex/sdk/branches/develop/frameworks/build.xml
Author: cframpton
Date: Thu Nov 15 22:13:11 2012
New Revision: 1410052
URL: http://svn.apache.org/viewvc?rev=1410052&view=rev
Log:
Add playerglobal.swfversion setting for playerglobal.version=11.5. Use java.version rather than ant.java.version since it seems more accurate.
Modified:
incubator/flex/sdk/branches/develop/frameworks/build.xml
Modified: incubator/flex/sdk/branches/develop/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build.xml?rev=1410052&r1=1410051&r2=1410052&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build.xml Thu Nov 15 22:13:11 2012
@@ -33,9 +33,9 @@
<condition property="local.d32" value="-d32">
<and>
<os family="mac"/>
+ <matches pattern="1.6.*" string="${java.version}"/>
<equals arg1="${sun.arch.data.model}" arg2="64"/>
<equals arg1="${os.arch}" arg2="x86_64"/>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
</and>
</condition>
@@ -143,6 +143,9 @@
<condition property="playerglobal.swfversion" value="17">
<equals arg1="${playerglobal.version}" arg2="11.4" />
</condition>
+ <condition property="playerglobal.swfversion" value="18">
+ <equals arg1="${playerglobal.version}" arg2="11.5" />
+ </condition>
</target>
<!--