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/05/08 02:23:54 UTC
svn commit: r1335308 - in /incubator/flex/trunk: ./
frameworks/projects/advancedgrids/ frameworks/projects/airframework/
frameworks/projects/airspark/ frameworks/projects/authoringsupport/
frameworks/projects/automation/ frameworks/projects/automation_...
Author: cframpton
Date: Tue May 8 00:23:52 2012
New Revision: 1335308
URL: http://svn.apache.org/viewvc?rev=1335308&view=rev
Log:
Rename PLAYERGLOBAL_HOME to PLAYERGLOBAL since _HOME implies a directory and this is the absolute path to playerglobal.swc and added unsigned RSLs to frameworks/rsls. The kits can be found at http://people.apache.org/~cframpton/ApacheFlexRC/ and the README can now be viewed at http://people.apache.org/~cframpton/ApacheFlexRC/README
Modified:
incubator/flex/trunk/README
incubator/flex/trunk/build.xml
incubator/flex/trunk/env.properties
incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
incubator/flex/trunk/frameworks/projects/airframework/build.xml
incubator/flex/trunk/frameworks/projects/airspark/build.xml
incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
incubator/flex/trunk/frameworks/projects/automation/build.xml
incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
incubator/flex/trunk/frameworks/projects/charts/build.xml
incubator/flex/trunk/frameworks/projects/core/build.xml
incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
incubator/flex/trunk/frameworks/projects/framework/build.xml
incubator/flex/trunk/frameworks/projects/halo/build.xml
incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
incubator/flex/trunk/frameworks/projects/mx/build.xml
incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
incubator/flex/trunk/frameworks/projects/rpc/build.xml
incubator/flex/trunk/frameworks/projects/spark/build.xml
incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml
incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
incubator/flex/trunk/frameworks/projects/textLayout/build.xml
incubator/flex/trunk/frameworks/projects/wireframe/build.xml
incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java
incubator/flex/trunk/mustella/build.xml
Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Tue May 8 00:23:52 2012
@@ -43,11 +43,15 @@ Building Apache Flex
Building Apache Flex 4.8.0
==========================
+ Apache Flex 4.8.0 is a parity release from Apache of Adobe Flex 4.6.
+
Apache Flex is a large project. It requires some build tools which must be installed
prior to building Flex and it depends on some external libraries which
are downloaded as part of the build process.
- Apache Flex 4.8.0 is a parity release from Apache of Adobe Flex 4.6.
+ From Apache's perspective, the Adobe Flash Player and Adobe AIR have excluded
+ licenses so they can not be bundled with the Apache Flex binaries. They must be
+ installed prior to building Apache Flex.
Install Prerequisites
---------------------
@@ -56,8 +60,16 @@ Install Prerequisites
corresponding environment variables using absolute file paths. Relative file paths
will result in build errors.
- Alternatively, PLAYERGLOBAL_HOME, AIR_HOME and FLASHPLAYER_DEBUGGER may be set in
- env.properties located in the top-level directory.
+ The Adobe Flash Player playerglobal.swc is needed to compile all the components
+ with the exception of the airframework and airspark components which require
+ airglobal.swc from the AIR Integration Kit. The AIR Integration kit is also needed
+ to build and debug mobile applications. The Flash Player content debugger is
+ used by checkintests and other pieces of the test subsystem to run compiled
+ applications.
+
+ Rather than defining environment variables for PLAYERGLOBAL, AIR_HOME and
+ FLASHPLAYER_DEBUGGER, these properties may be set in env.properties located in the
+ top-level directory. If both are set, the environment variables take precedence.
==================================================================================
SOFTWARE ENVIRONMENT VARIABLE (absolute paths)
@@ -72,8 +84,8 @@ Install Prerequisites
or other unix-like shell
(if Windows)
- Adobe Flash Player PLAYERGLOBAL_HOME
- (rename playerglobal11_1.swc to
+ Adobe Flash Player PLAYERGLOBAL
+ (rename playerglobal swc to
playerglobal.swc and point to this file)
Adobe AIR Integration Kit AIR_HOME
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Tue May 8 00:23:52 2012
@@ -56,7 +56,7 @@
Each of the main targets for the modules will call clean themselves before proceeding.
-->
- <target name="main" depends="pre-build,modules,frameworks,sample-themes,post-build" description="Full build">
+ <target name="main" depends="pre-build,modules,frameworks,frameworks-rsls,sample-themes,post-build" description="Full build">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
@@ -102,10 +102,10 @@
<target name="check-compile-env"
description="Check for the required environment variables for compilation">
- <condition property="PLAYERGLOBAL_HOME.notset">
- <equals arg1="${env.PLAYERGLOBAL_HOME}" arg2="must_set_environment_variable_PLAYERGLOBAL_HOME" casesensitive="true"/>
+ <condition property="PLAYERGLOBAL.notset">
+ <equals arg1="${env.PLAYERGLOBAL}" arg2="must_set_environment_variable_PLAYERGLOBAL" casesensitive="true"/>
</condition>
- <fail message="PLAYERGLOBAL_HOME environment variable is not set" if="PLAYERGLOBAL_HOME.notset"/>
+ <fail message="PLAYERGLOBAL environment variable is not set" if="PLAYERGLOBAL.notset"/>
<condition property="AIR_HOME.notset">
<equals arg1="${env.AIR_HOME}" arg2="must_set_environment_variable_AIR_HOME" casesensitive="true"/>
</condition>
@@ -134,7 +134,9 @@
<ant dir="${basedir}/frameworks" target="thirdparty-clean"/>
</target>
- <target name="clean" depends="modules-clean,frameworks-clean,package-clean,checkintests-clean" description="Full clean excluding thirdparty downloads">
+ <target name="clean" depends="modules-clean,frameworks-clean,frameworks-clean,frameworks-rsls-clean,package-clean,checkintests-clean"
+ description="Full clean excluding thirdparty downloads">
+
<delete file="${basedir}/flex-sdk-description.xml" failonerror="false"/>
<delete dir="${basedir}/lib/win" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
@@ -150,6 +152,10 @@
<ant dir="${basedir}/frameworks" target="clean"/>
</target>
+ <target name="frameworks-rsls-clean">
+ <delete dir="${basedir}/frameworks/rsls" includeEmptyDirs="true" quiet="true"/>
+ </target>
+
<target name="package-clean">
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<antcall target="clean-temp"/>
@@ -228,6 +234,57 @@
<ant dir="${basedir}/frameworks/projects/airspark" target="compile"/>
</target>
+ <!-- Build framework RSLs -->
+
+ <macrodef name="create-rsl">
+ <attribute name="rsl-dir"/>
+ <attribute name="swc-dir"/>
+ <attribute name="swc-name"/>
+ <attribute name="build-number"/>
+
+ <sequential>
+ <unzip src="@{swc-dir}/@{swc-name}.swc"
+ dest="@{rsl-dir}" >
+ <patternset>
+ <include name="library.swf" />
+ </patternset>
+ </unzip>
+ <!-- optimize out metadata but keep debug info for the unsigned RSL -->
+ <java jar="${basedir}/lib/optimizer.jar" fork="true" failonerror="true">
+ <jvmarg line="-ea -DAS3 -DAVMPLUS -Dflexlib=${basedir}/frameworks -Xms32m -Xmx384m -Dsun.io.useCanonCaches=false"/>
+ <arg line="'@{rsl-dir}/library.swf' --output '@{rsl-dir}/@{swc-name}_@{build-number}.swf' --keep-as3-metadata='Bindable,Managed,ChangeEvent,NonCommittingChangeEvent,Transient,SkinPart' --debug='true' "/>
+ </java>
+ <delete file="@{rsl-dir}/library.swf"/>
+ <java jar="${basedir}/lib/digest.jar" fork="true" failonerror="true">
+ <jvmarg line="-ea -DAS3 -DAVMPLUS -Xms32m -Xmx384m -Dsun.io.useCanonCaches=false"/>
+ <arg line="--digest.rsl-file '@{rsl-dir}/@{swc-name}_@{build-number}.swf' --digest.swc-path '@{swc-dir}/@{swc-name}.swc' --digest.signed=false"/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <target name="frameworks-rsls" description="Build signed framework RSLs">
+ <!-- framework RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="framework" build-number="${release.version}.${build.number}"/>
+ <!-- mx RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs/mx" swc-name="mx" build-number="${release.version}.${build.number}"/>
+ <!-- rpc RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="rpc" build-number="${release.version}.${build.number}"/>
+ <!-- Spark -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark" build-number="${release.version}.${build.number}"/>
+ <!-- sparkskins RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="sparkskins" build-number="${release.version}.${build.number}"/>
+ <!-- charts RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="charts" build-number="${release.version}.${build.number}"/>
+ <!-- advancedgrids RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="advancedgrids" build-number="${release.version}.${build.number}"/>
+ <!-- spark_dmv RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark_dmv" build-number="${release.version}.${build.number}"/>
+ <!-- OSMF RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="osmf" build-number="${release.version}.${build.number}"/>
+ <!-- textLayout RSL -->
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="textLayout" build-number="${release.version}.${build.number}"/>
+ </target>
+
<target name="other.locales" description="Build resource SWCs for additional locales">
<ant dir="${basedir}/frameworks" target="other.locales"/>
</target>
@@ -523,6 +580,11 @@
<include name="${env.FLASHPLAYER_HOME}/playerglobal.swc"/>
</fileset>
</copy>
+
+ <!-- frameworks/rsls -->
+ <copy todir="${basedir}/temp/frameworks/rsls">
+ <fileset dir="${basedir}/frameworks/rsls"/>
+ </copy>
<!-- not currently in Apache Flex (formerly qtp and qtp_air) -->
<!--
Modified: incubator/flex/trunk/env.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/env.properties?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/env.properties (original)
+++ incubator/flex/trunk/env.properties Tue May 8 00:23:52 2012
@@ -18,7 +18,9 @@
################################################################################
# You need to either set the environment variables AIR_HOME and PLAYER_HOME or set
-# the properties here. The environment variables take precedence.
+# the properties here.
+# The environment variables take precedence.
+# Use absolute file paths.
# See the README file for more information.
#
@@ -28,13 +30,13 @@
env.AIR_HOME=must_set_environment_variable_AIR_HOME
#
-# Set this to the directory that contains the Adobe Flash Player content debugger
+# Set this to file that contains the Adobe Flash Player content debugger
# for your platform.
#
env.FLASHPLAYER_DEBUGGER=must_set_environment_variable_FLASHPLAYER_DEBUGGER
#
-# Set this to the directory that contains the Adobe Flash Player playerglobal.swc.
+# Set this to the file that contains the Adobe Flash Player playerglobal.swc.
#
-env.PLAYERGLOBAL_HOME=must_set_environment_variable_PLAYERGLOBAL_HOME
+env.PLAYERGLOBAL=must_set_environment_variable_PLAYERGLOBAL
Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Tue May 8 00:23:52 2012
@@ -31,7 +31,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/advancedgrids_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -48,7 +48,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/advancedgrids/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -179,7 +179,7 @@
<target name="compile" description="Compiles advancedgrids.swc">
<echo message="Compiling frameworks/libs/advancedgrids.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -205,7 +205,7 @@
<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
<source-path path-element="${basedir}/src"/>
<library-path />
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/airframework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airframework/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/airframework_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +60,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/airspark_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +50,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml Tue May 8 00:23:52 2012
@@ -40,7 +40,7 @@
<target name="compile" description="Compiles authoringsupport.swc">
<echo message="Compiling frameworks/libs/authoringsupport.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -65,7 +65,7 @@
<library-path dir="${basedir}/libs/">
<include name="FlexContentHolderThumbnail.swc"/>
</library-path>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -101,7 +101,7 @@
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
<compiler.source-path path-element="${basedir}/src"/>
<doc-classes class="AuthoringSupportClasses"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/automation/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation/build.xml Tue May 8 00:23:52 2012
@@ -31,7 +31,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/automation_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -48,7 +48,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -147,7 +147,7 @@
<target name="compile" description="Compiles automation.swc">
<echo message="Compiling frameworks/libs/automation/automation.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -174,7 +174,7 @@
<include-classes>AutomationClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml Tue May 8 00:23:52 2012
@@ -32,7 +32,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/automation_airspark_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
<compc fork="true"
@@ -46,7 +46,7 @@
<source-path path-element="${basedir}/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<target name="compile" description="Compiles automation_dmv.swc">
<echo message="Compiling frameworks/libs/automation/automation_dmv.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +60,7 @@
<source-path path-element="${basedir}/src"/>
<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml Tue May 8 00:23:52 2012
@@ -49,7 +49,7 @@
<target name="compile" description="Compiles automation_flashflexkit.swc">
<echo message="Compiling frameworks/libs/automation/automation_flashflexkit.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -74,7 +74,7 @@
<target-player>11.1</target-player>
<include-classes>AutomationFlashFlexKitClasses</include-classes>
<source-path path-element="${basedir}/src"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<target name="compile" description="Compiles automation_spark.swc">
<echo message="Compiling frameworks/libs/automation/automation_spark.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +60,7 @@
<include-classes>AutomationSparkClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/charts/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/charts/build.xml Tue May 8 00:23:52 2012
@@ -31,7 +31,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/charts_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -52,7 +52,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/charts/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -183,7 +183,7 @@
<target name="compile" description="Compiles charts.swc">
<echo message="Compiling frameworks/libs/charts.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -209,7 +209,7 @@
<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
<source-path path-element="${basedir}/src"/>
<library-path />
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/core/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/core/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/core/build.xml Tue May 8 00:23:52 2012
@@ -41,7 +41,7 @@
<target name="compile" description="Compiles core.swc">
<echo message="Compiling frameworks/libs/core.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -72,7 +72,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
<load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/flash-integration/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<copy file="${basedir}/bundles/en_US/empty.properties" tofile="${basedir}/bundles/@{locale}/empty.properties"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<echo message="Compiling frameworks/locale/@{locale}/flash-integration_rb.swc"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
@@ -51,7 +51,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/flash-integration/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -119,7 +119,7 @@
<target name="compile" description="Compiles flash-integration.swc">
<echo message="Compiling frameworks/projects/flash-integration/libs/flash-integration.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -146,7 +146,7 @@
<source-path path-element="${basedir}/src"/>
<load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -193,7 +193,7 @@
it just needs to be linked through a manifest file -->
<namespace uri="http://www.adobe.com/someNonSensicalURI" manifest="${basedir}/manifest.xml"/>
<doc-namespaces uri="http://www.adobe.com/someNonSensicalURI"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/framework_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -62,7 +62,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
</compc>
@@ -177,7 +177,7 @@
<target name="compile" description="Compiles framework.swc">
<echo message="Compiling frameworks/libs/framework.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -208,7 +208,7 @@
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
<include name="textLayout.swc"/>
</external-library-path>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
Modified: incubator/flex/trunk/frameworks/projects/halo/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/halo/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/halo/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/halo/build.xml Tue May 8 00:23:52 2012
@@ -41,7 +41,7 @@
<target name="compile" description="Compiles halo.swc">
<echo message="Compiling frameworks/themes/Halo/halo.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -62,7 +62,7 @@
<target-player>11.1</target-player>
<jvmarg line="${compc.jvm.args}"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/mobilecomponents_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +50,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml Tue May 8 00:23:52 2012
@@ -41,7 +41,7 @@
<target name="compile" description="Compiles mobile.swc">
<echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +67,7 @@
<include-classes>MobileThemeClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -106,7 +106,7 @@
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
<compiler.source-path path-element="${basedir}/src"/>
<doc-classes class="MobileThemeClasses"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/mx/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mx/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mx/build.xml Tue May 8 00:23:52 2012
@@ -33,7 +33,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/mx_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +50,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -168,7 +168,7 @@
<target name="compile" description="Compiles mx.swc">
<echo message="Compiling frameworks/libs/mx/mx.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -197,7 +197,7 @@
<include-classes>MxClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/playerglobal/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/playerglobal/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/playerglobal/build.xml Tue May 8 00:23:52 2012
@@ -31,7 +31,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/playerglobal_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
<compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/playerglobal_rb.swc"
@@ -45,7 +45,7 @@
<source-path path-element="${basedir}/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -103,7 +103,7 @@
<!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
<target name="bundle">
<echo message="Compiling frameworks/locale/${locale}/playerglobal_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
<compc fork="true" output="${FLEX_HOME}/frameworks/locale/${locale}/playerglobal_rb.swc"
@@ -117,7 +117,7 @@
<source-path path-element="${basedir}/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/rpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/rpc/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/rpc/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/rpc/build.xml Tue May 8 00:23:52 2012
@@ -32,7 +32,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/rpc_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -55,7 +55,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -175,7 +175,7 @@
<target name="compile" description="Compiles rpc.swc">
<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
<echo message="Compiling frameworks/libs/rpc.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -205,7 +205,7 @@
<include-classes>RPCClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark/build.xml Tue May 8 00:23:52 2012
@@ -32,7 +32,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/spark_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -58,7 +58,7 @@
<source-path path-element="${FLEX_HOME}/frameworks/projects/spark/src"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -188,7 +188,7 @@
<target name="compile" depends="prepare" description="Compiles spark.swc">
<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
<echo message="Compiling frameworks/libs/spark.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -214,7 +214,7 @@
<include-classes>SparkClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path />
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml Tue May 8 00:23:52 2012
@@ -43,7 +43,7 @@
<target name="compile" description="Compiles spark_dmv.swc">
<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
<echo message="Compiling frameworks/libs/spark_dmv.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -69,7 +69,7 @@
<include-classes>SparkDmvClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path />
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/sparkskins/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/sparkskins/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/sparkskins/build.xml Tue May 8 00:23:52 2012
@@ -41,7 +41,7 @@
<target name="compile" description="Compiles sparkskins.swc">
<echo message="Compiling frameworks/libs/sparkskins.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +67,7 @@
<include-classes>SparkSkinsClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -101,7 +101,7 @@
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" >
<compiler.source-path path-element="${basedir}/src"/>
<doc-classes class="SparkSkinsClasses"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/textLayout/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/textLayout/build.xml Tue May 8 00:23:52 2012
@@ -40,7 +40,7 @@
<attribute name="locale"/>
<sequential>
<echo message="Compiling frameworks/locale/@{locale}/textLayout_rb.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -56,7 +56,7 @@
<source-path path-element="${basedir}/bundles/@{locale}"/>
<include-libraries/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/frameworks/projects/wireframe/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/wireframe/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/wireframe/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/wireframe/build.xml Tue May 8 00:23:52 2012
@@ -41,7 +41,7 @@
<target name="compile" description="Compiles wireframe.swc">
<echo message="Compiling frameworks/themes/Wireframe/wireframe.swc"/>
- <echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+ <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +67,7 @@
<include-classes>WireframeClasses</include-classes>
<source-path path-element="${basedir}/src"/>
<library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -107,7 +107,7 @@
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
<compiler.source-path path-element="${basedir}/src"/>
<doc-classes class="WireframeClasses"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+ <external-library-path dir="${env.PLAYERGLOBAL}">
<include name="playerglobal.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java Tue May 8 00:23:52 2012
@@ -64,7 +64,7 @@ public class CompilerConfiguration imple
public static final String LOCALE_TOKEN = "{locale}";
public static final String TARGET_PLAYER_MAJOR_VERSION_TOKEN = "{targetPlayerMajorVersion}";
public static final String TARGET_PLAYER_MINOR_VERSION_TOKEN = "{targetPlayerMinorVersion}";
- public static final String PLAYERGLOBAL_HOME_TOKEN = "{playerglobalHome}";
+ public static final String PLAYERGLOBAL_TOKEN = "{playerglobalHome}";
public static final String AIR_HOME_TOKEN = "{airHome}";
// this is passed as the list of soft prerequisites for options like
@@ -169,21 +169,21 @@ public class CompilerConfiguration imple
/**
* Replaces instances of {playerglobalHome} with the environment variable
- * PLAYERGLOBAL_HOME. Doesn't turn the paths into VirtualFiles (yet,
+ * PLAYERGLOBAL. Doesn't turn the paths into VirtualFiles (yet,
* @see expandLocaleToken()).
*/
private static String[] expandPlayerglobalHomeToken(String[] pathlist)
{
final String[] processed = new String[pathlist.length];
- String playerglobalHome = System.getenv("PLAYERGLOBAL_HOME");
+ String playerglobalHome = System.getenv("PLAYERGLOBAL");
if (playerglobalHome == null)
playerglobalHome = "";
for (int i = 0; i < pathlist.length; i++)
{
processed[i] = StringUtils.substitute(pathlist[i],
- PLAYERGLOBAL_HOME_TOKEN, playerglobalHome);
+ PLAYERGLOBAL_TOKEN, playerglobalHome);
}
return processed;
Modified: incubator/flex/trunk/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/build.xml?rev=1335308&r1=1335307&r2=1335308&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/build.xml (original)
+++ incubator/flex/trunk/mustella/build.xml Tue May 8 00:23:52 2012
@@ -82,7 +82,7 @@
<property name="aschartspath" value="."/>
<property name="frameworks.dir1" value="${frameworks}" />
<property name="librarypath" value="${frameworks.dir1}/libs/framework.swc,${frameworks.dir1}/libs/charts.swc,${frameworks.dir1}/libs/rpc.swc"/>
- <property name="external.librarypath" value="${env.PLAYERGLOBAL_HOME}/playerglobal.swc"/>
+ <property name="external.librarypath" value="${env.PLAYERGLOBAL}/playerglobal.swc"/>
<property name="rsl" value="" />
<property name="coach" value="true" />
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/projects/automat...
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> I am not seeing this. Mine builds cleanly. I will try to figure it out
> when I get into work this morning.
It was a clean checkout so I'm guessing it's some sort of environmental issue - although exactly what or how prevalent it is I'm not sure/can't tell.
The task is creating/signing the RSLs so as a guess perhaps I'm missing the keys to sign the RSLs? I'd be surprised if I was able produce "official" signed RSLs.
Thanks,
Justin
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/projects/automat...
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> Yes I am using the release target. It is the only one that builds the
> rsls. Do you still see this after my submit last night (1335899)?
As of 5 or 6 hours ago (rev 1335923) with a clean build I was still having the issue.
Thanks,
Justin
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./
frameworks/projects/advancedgrids/ frameworks/projects/airframework/
frameworks/projects/airspark/ frameworks/projects/authoringsupport/
frameworks/projects/automation/ frameworks/projects/automat...
Posted by Carol Frampton <cf...@adobe.com>.
On 5/9/12 1 :30AM, "Justin Mclean" <ju...@classsoftware.com> wrote:
>Hi,
>
>> I am not seeing this. Mine builds cleanly. I will try to figure it out
>> when I get into work this morning.
>Sorry I forgot to mention that this was for the "release" target (which
>is what I assuming you using for the pre release parity build?), the
>standard "main" target works fine.
>
Yes I am using the release target. It is the only one that builds the
rsls. Do you still see this after my submit last night (1335899)? If so
I'll try to see if I can figure it out.
Carol
>
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/projects/automat...
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> I am not seeing this. Mine builds cleanly. I will try to figure it out
> when I get into work this morning.
Sorry I forgot to mention that this was for the "release" target (which is what I assuming you using for the pre release parity build?), the standard "main" target works fine.
Thanks,
Justin
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./
frameworks/projects/advancedgrids/ frameworks/projects/airframework/
frameworks/projects/airspark/ frameworks/projects/authoringsupport/
frameworks/projects/automation/ frameworks/projects/automat...
Posted by Carol Frampton <cf...@adobe.com>.
Justin,
I am not seeing this. Mine builds cleanly. I will try to figure it out
when I get into work this morning.
Carol
On 5/7/12 11 :58PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
>Hi,
>
>Looks like there's an issue with the build.
>
>With a clean checkout up and envs set correctly I get target
>"frameworks-rsls" target failing like so:
>
>Buildfile: /Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache
>Flex Clean/build.xml
>frameworks-rsls:
> [unzip] Expanding: /Users/justinmclean/Documents/Adobe Flash Builder
>4.6/Apache Flex Clean/frameworks/libs/framework.swc into
>/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex
>Clean/frameworks/rsls
> [java] Exception in thread "main" java.lang.NoClassDefFoundError:
>Flash
> [java] Caused by: java.lang.ClassNotFoundException: Flash
> [java] at java.net.URLClassLoader$1.run(URLClassLoader.java:202)
> [java] at java.security.AccessController.doPrivileged(Native Method)
> [java] at java.net.URLClassLoader.findClass(URLClassLoader.java:190)
> [java] at java.lang.ClassLoader.loadClass(ClassLoader.java:306)
> [java] at
>sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:301)
> [java] at java.lang.ClassLoader.loadClass(ClassLoader.java:247)
>
>BUILD FAILED
>/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex
>Clean/build.xml:267: The following error occurred while executing this
>line:
>/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex
>Clean/build.xml:253: Java returned: 1
>
>Removing "frameworks-rsls" target it compiles to completion.
>
>Thanks,
>Justin
Re: svn commit: r1335308 - in /incubator/flex/trunk: ./ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/projects/automation_...
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
Looks like there's an issue with the build.
With a clean checkout up and envs set correctly I get target "frameworks-rsls" target failing like so:
Buildfile: /Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Clean/build.xml
frameworks-rsls:
[unzip] Expanding: /Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Clean/frameworks/libs/framework.swc into /Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Clean/frameworks/rsls
[java] Exception in thread "main" java.lang.NoClassDefFoundError: Flash
[java] Caused by: java.lang.ClassNotFoundException: Flash
[java] at java.net.URLClassLoader$1.run(URLClassLoader.java:202)
[java] at java.security.AccessController.doPrivileged(Native Method)
[java] at java.net.URLClassLoader.findClass(URLClassLoader.java:190)
[java] at java.lang.ClassLoader.loadClass(ClassLoader.java:306)
[java] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:301)
[java] at java.lang.ClassLoader.loadClass(ClassLoader.java:247)
BUILD FAILED
/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Clean/build.xml:267: The following error occurred while executing this line:
/Users/justinmclean/Documents/Adobe Flash Builder 4.6/Apache Flex Clean/build.xml:253: Java returned: 1
Removing "frameworks-rsls" target it compiles to completion.
Thanks,
Justin