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/06/06 23:09:36 UTC
svn commit: r1347129 - in /incubator/flex/trunk: ./ frameworks/
frameworks/projects/framework/src/mx/graphics/shaderClasses/
frameworks/projects/spark/asdoc/en_US/spark/effects/examples/assets/
frameworks/projects/spark/src/spark/effects/ modules/
Author: cframpton
Date: Wed Jun 6 21:09:35 2012
New Revision: 1347129
URL: http://svn.apache.org/viewvc?rev=1347129&view=rev
Log:
Document the new PIXELBENDER_HOME environment variable. Remove the Pixel Bender binaries because they are now generated from source.
Removed:
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbj
incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbj
incubator/flex/trunk/frameworks/projects/spark/asdoc/en_US/spark/effects/examples/assets/twist.pbj
incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbj
incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbj
incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbj
incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbj
incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbj
Modified:
incubator/flex/trunk/README
incubator/flex/trunk/build.xml
incubator/flex/trunk/env-template.properties
incubator/flex/trunk/frameworks/ (props changed)
incubator/flex/trunk/modules/build.xml
Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1347129&r1=1347128&r2=1347129&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Wed Jun 6 21:09:35 2012
@@ -121,18 +121,18 @@ Install Prerequisites
Use URL above to download playerglobal11_1.swc. Create the directory, player/11.1
and copy playerglobal11_1.swc to player/11.1/playerglobal.swc.
- Set PLAYERGLOBAL_HOME to the absolute path of the player directory (not including the
- version subdirectory). The target-version option controls which PLAYERGLOBAL_HOME
- subdirectory is used.
+ Set PLAYERGLOBAL_HOME to the absolute path of the player directory (not including
+ the version subdirectory). The target-version option controls which
+ PLAYERGLOBAL_HOME subdirectory is used.
*4) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
- http://www.adobe.com/go/pixelbender_toolkit_zip/
+ http://www.adobe.com/go/pixelbender_toolkit_zip/
The Adobe Pixel Bender Toolkit for Mac can be downloaded from:
http://www.adobe.com/go/pixelbender_toolkit_dmg/
- Download the Pixel Bender Toolkit for your platform and install or unzip it. Set
- PIXELBENDER_HOME to the absolute path of the AIR SDK directory.
+ Download the Pixel Bender Toolkit for your platform and install or unzip it.
+ Set PIXELBENDER_HOME to the absolute path of the Pixel Bender Toolkit directory.
FlashPlayer Configuration
-------------------------
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1347129&r1=1347128&r2=1347129&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed Jun 6 21:09:35 2012
@@ -97,7 +97,11 @@
-->
<target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
<ant dir="${basedir}/modules" target="thirdparty-downloads"/>
- <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>
+ <!-- don't ask again about these since we just did if these weren't already set -->
+ <property name="blazeds.donot.ask" value="set" />
+ <property name="font.donot.ask" value="set"/>
+
+ <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>
</target>
<target name="pre-build" depends="check-compile-env,create-description,thirdparty-downloads" description="stuff that needs to be done before any builds" />
@@ -106,7 +110,7 @@
description="Check for the required environment variables for compilation"/>
<target name="check-playerglobal-home" unless="playerglobal.swc.exists"
- description="Check PLAYERGLOBAL for both a directory and a swc file">
+ description="Check PLAYERGLOBAL_HOME for both a directory and a swc file">
<echo message="PLAYERGLOBAL_HOME is ${env.PLAYERGLOBAL_HOME}"/>
<echo message="playerglobal.version is ${playerglobal.version}"/>
@@ -147,6 +151,36 @@
unless="AIR_HOME.set"/>
</target>
+ <target name="check-pixelbender-home" unless="pbutil.exe.exists"
+ description="Check PIXELBENDER_HOME for both a directory and an exe file">
+
+ <echo message="PIXELBENDER_HOME is ${env.PIXELBENDER_HOME}"/>
+
+ <available file="${env.PIXELBENDER_HOME}"
+ type="dir"
+ property="PIXELBENDER_HOME.set"/>
+
+ <fail message="The environment variable PIXELBENDER_HOME is not set to a directory"
+ unless="PIXELBENDER_HOME.set"/>
+
+ <condition property="pbutil.exe.exists">
+ <and>
+ <os family="mac"/>
+ <available file="${env.PIXELBENDER_HOME}/pbutil" type="file"/>
+ </and>
+ </condition>
+
+ <condition property="pbutil.exe.exists">
+ <and>
+ <os family="windows"/>
+ <available file="${env.PIXELBENDER_HOME}/pbutil.exe" type="file"/>
+ </and>
+ </condition>
+
+ <fail message="The directory ${env.PIXELBENDER_HOME} does not contain the pbutil executable"
+ unless="pbutil.exe.exists"/>
+ </target>
+
<target name="create-description" description="Generate flex-sdk-description.xml">
<echo file="${basedir}/flex-sdk-description.xml"><?xml version="1.0"?>
<!--
Modified: incubator/flex/trunk/env-template.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/env-template.properties?rev=1347129&r1=1347128&r2=1347129&view=diff
==============================================================================
--- incubator/flex/trunk/env-template.properties (original)
+++ incubator/flex/trunk/env-template.properties Wed Jun 6 21:09:35 2012
@@ -67,3 +67,9 @@
#
#env.PLAYERGLOBAL_HOME=
+#
+# Set this to directory that contains the Adobe Pixel Bender Toolkit
+# for your platform.
+#
+#env.PIXELBENDER_HOME=
+
Propchange: incubator/flex/trunk/frameworks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 6 21:09:35 2012
@@ -1,2 +1,3 @@
libs
rsls
+*Fonts.ser
Modified: incubator/flex/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/build.xml?rev=1347129&r1=1347128&r2=1347129&view=diff
==============================================================================
--- incubator/flex/trunk/modules/build.xml (original)
+++ incubator/flex/trunk/modules/build.xml Wed Jun 6 21:09:35 2012
@@ -85,7 +85,7 @@
<ant dir="${basedir}/thirdparty/xerces-patch" target="clean"/>
<delete file="${FLEX_LIB}/asc.jar"/>
<!--delete dir="${FLEX_LIB}/*.jar" failonerror="false"/-->
- <delete includeemptydirs="true">
+ <delete includeemptydirs="true" failonerror="false">
<fileset dir="${FLEX_LIB}">
<exclude name="**/*" />
</fileset>
@@ -187,7 +187,9 @@
</target>
<target name="batik-clean">
+ <mkdir dir="${basedir}/thirdparty/batik/lib"/>
<ant dir="${basedir}/thirdparty/batik" target="clean"/>
+ <delete dir="${basedir}/thirdparty/batik/lib"/>
<delete file="${FLEX_LIB}/batik-all-flex.jar"/>
<delete file="${FLEX_LIB}/batik-LICENSE"/>
<delete file="${FLEX_LIB}/batik-NOTICE"/>
@@ -210,7 +212,9 @@
</target>
<target name="velocity-clean">
+ <mkdir dir="${basedir}/thirdparty/velocity/build/lib"/>
<ant dir="${basedir}/thirdparty/velocity/build" target="clean"/>
+ <delete dir="${basedir}/thirdparty/velocity/build/lib"/>
<delete file="${FLEX_LIB}/velocity-dep-1.4-flex.jar"/>
<delete file="${FLEX_LIB}/velocity-LICENSE"/>
<delete file="${FLEX_LIB}/velocity-NOTICE"/>