Updated Branches:
  refs/heads/develop 9bfa5ef8c -> c3b7791de

more loose ends on the PixelBender package.  Add custom README


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/19b592d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/19b592d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/19b592d4

Branch: refs/heads/develop
Commit: 19b592d430825fcdf25c9e04bb62d17ae3981c07
Parents: 9bfa5ef
Author: Alex Harui <[email protected]>
Authored: Fri Dec 20 14:10:32 2013 -0800
Committer: Alex Harui <[email protected]>
Committed: Fri Dec 20 23:30:59 2013 -0800

----------------------------------------------------------------------
 README.pb                               | 158 +++++++++++++++++++++++++++
 build.xml                               |   4 +-
 frameworks/projects/framework/build.xml |   2 +-
 3 files changed, 162 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/19b592d4/README.pb
----------------------------------------------------------------------
diff --git a/README.pb b/README.pb
new file mode 100644
index 0000000..44b5390
--- /dev/null
+++ b/README.pb
@@ -0,0 +1,158 @@
+Apache Flex (Flex)
+==================
+
+    Apache Flex is an application framework for easily building Flash-based 
applications 
+    for mobile devices, the browser and desktop.
+
+    For detailed information about Apache Flex please visit 
+    http://flex.apache.org/
+
+    The PixelBender package contains PixelBender shaders used by the Apache 
Flex SDK.
+
+    To build the pbj files, run the build-pixelbender target in build.xml.
+
+    While Apache Flex runs on a large set of platforms, the PixelBender 
compiler
+    is only supported on:
+
+        Microsoft Windows
+        Mac OS X
+
+Getting the convenience packages for Apache Flex
+================================================
+
+    You can also get just the binaries from our website.  These binaries do not
+    include the dependencies, so additional software may need to be downloaded 
and
+    installed.
+
+      http://flex.apache.org/download-binaries.html
+
+
+Getting the latest sources via git
+==================================
+
+    Getting the source code is the recommended way to get Apache Flex.  We also
+    offer an automated installer along with binary distributions on our website
+    at http://flex.apache.org/.
+
+    You can always checkout the latest source via git using the following
+    command:
+       
+        git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git sdk
+        cd sdk
+        git checkout develop
+
+    An Apache Flex SDK also requires source code from other Apache Flex git
+    repositories.  To get the latest source via git for the Text Layout 
Framework
+    use the following command:
+
+        git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git tlf
+        cd tlf
+        git checkout develop
+
+    In an Apache Flex source code package hosted on the distribution server or
+    one of its mirrors, the Text Layout Framework code is already included in
+    the package.  This is also true for the convenience package.
+    
+    For further information visit http://flex.apache.org/download-source.html
+    
+Building Apache Flex PixelBender Files
+=========================
+
+    Apache Flex PixelBender files requires a build tools which must be 
installed
+    prior to building Flex.  The build tools have a proprietary license.
+        
+Install Prerequisites
+---------------------
+
+    Before building the PixelBender files you must install the following 
software and 
+    set the corresponding environment variables using absolute file paths.  
Relative 
+    file paths will result in build errors.
+    
+    The environment variable PIXELBENDER_HOME can also be set in the property 
file 
+    called env.properties. See the env-template.properties file for 
instructions.
+    
+    The Adobe Pixel Bender Toolkit is needed to build these files.
+
+    
==================================================================================
+    SOFTWARE                                    ENVIRONMENT VARIABLE (absolute 
paths)
+    
==================================================================================
+    
+    Java SDK 1.6 or greater (*1)                JAVA_HOME
+        (for Java 1.7 see note at (*2))
+        
+    Ant 1.7.1 or greater (*1)                   ANT_HOME
+        (for Java 1.7 see note at (*2))
+    
+    Adobe Pixel Bender Toolkit (*5)             PIXELBENDER_HOME
+    
+    
==================================================================================
+        
+    *1) The bin directories for ANT_HOME and JAVA_HOME should be added to your 
PATH.
+        
+        On Windows, set PATH to
+            
+            PATH=%PATH%;%ANT_HOME%\bin;%JAVA_HOME%\bin
+            
+        On the Mac (bash), set PATH to
+            
+            export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin"
+            
+         On Linux make sure you path include ANT_HOME and JAVA_HOME.
+
+    *2)  If you are using Java SDK 1.7 or greater on a Mac you must use Ant 
1.8 or 
+         greater. If you use Java 1.7 with Ant 1.7, ant reports the java 
version as 1.6 
+         so the JVM args for the data model (-d32/-d64) will not be set 
correctly and
+         you will get compile errors.
+        
+            
+    *3) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
+            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.
+         On Windows and Mac Set PIXELBENDER_HOME to the absolute path of the 
Pixel Bender
+         Toolkit directory, on Linux set it to be the absolute path of the 
compiled
+         Pixel Bender files.
+
+        
+Using the Binary Distribution
+-----------------------------
+
+    The binary distribution should be usable as-is and not require building.
+    It is meant to be expanded on top of an existing Flex SDK folder.
+
+Building the Source in the Source Distribution
+----------------------------------------------
+
+    To build the source, run:
+        ant build-pixelbender
+
+    The build script is the same script used by the Flex SDK and the default 
targets
+    are set up for the Flex SDK.
+    To clean the build, of everything other than the downloaded third-party 
dependencies 
+    use
+    
+        ant clean 
+    
+    To clean the build, of everything, including the downloaded third-party 
dependencies 
+    use
+        
+        ant super-clean (which is just thirdparty-clean followed by clean)
+        
+    To generate a source distribution package and a binary distribution 
package use
+        
+        ant -Dbuild.number=<YYYYMMDD> -Dbuild.noprompt=  release-pixelbender
+
+    The packages can be found in the "out" subdirectory.
+            
+    To get a brief listing of all the targets type
+    
+        ant -projecthelp
+
+
+Thanks for using Apache Flex.  Enjoy!
+
+                                          The Apache Flex Project
+                                          <http://flex.apache.org>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/19b592d4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2e0e8ce..543f58a 100644
--- a/build.xml
+++ b/build.xml
@@ -837,15 +837,17 @@
                 <include name="CHANGES"/>
                 <include name="LICENSE"/>
                 <include name="NOTICE"/>
-                <include name="README"/>
             </fileset>
         </copy>
         <copy todir="${basedir}/temp" includeEmptyDirs="false">
             <fileset dir="${basedir}">
                 <include name="**/*.pbk"/>
+                <include name="frameworks/projects/framework/build.xml" />
+                <include name="frameworks/projects/spark/build.xml" />
                 <exclude name="**/mustella/**"/>
             </fileset>
         </copy>
+        <copy file="${basedir}/README.pb" tofile="${basedir}/temp/README" />
         <echo file="${basedir}/temp/RELEASE_NOTES">
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/19b592d4/frameworks/projects/framework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/build.xml 
b/frameworks/projects/framework/build.xml
index d18c141..a308bee 100644
--- a/frameworks/projects/framework/build.xml
+++ b/frameworks/projects/framework/build.xml
@@ -192,7 +192,7 @@
 
     <target name="pixelbender-compile" unless="isLinux">
         <!-- diagnose GPU and OpenGL -->
-        <exec executable="${env.PIXELBENDER_HOME}/sniffer_gpu.exe"/>
+        <exec executable="${env.PIXELBENDER_HOME}/sniffer_gpu.exe" 
os="windows"/>
         <exec executable="${env.PIXELBENDER_HOME}/pbutil">
             <arg 
value="${FLEX_HOME}/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk"
 />
             <arg 
value="${FLEX_HOME}/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbj"
 />

Reply via email to