Updated Branches: refs/heads/develop 705e95e72 -> 2187226c7
tidy up the pb release packaging Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/2187226c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/2187226c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/2187226c Branch: refs/heads/develop Commit: 2187226c72f27a762571bde53b34f8c4ed69899d Parents: 705e95e Author: Alex Harui <[email protected]> Authored: Mon Jan 6 10:54:12 2014 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Jan 6 10:54:12 2014 -0800 ---------------------------------------------------------------------- README.pb | 23 ++++++++++++----------- build.xml | 22 +++++++++++++--------- pixelbender.xml | 5 +++-- 3 files changed, 28 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2187226c/README.pb ---------------------------------------------------------------------- diff --git a/README.pb b/README.pb index c13e163..1668ae7 100644 --- a/README.pb +++ b/README.pb @@ -7,12 +7,12 @@ Apache Flex (Flex) For detailed information about Apache Flex please visit http://flex.apache.org/ - The Apache Flex Pixel Bender package contains Pixel Bender shaders used by the + The Apache Flex Pixel Bender package contains Adobe Pixel Bender shaders used by the Apache Flex SDK. - To compile the Pixel Bender shaders, run: + To compile the shaders, run: - ant -f pixelbender.xml. + ant -f pixelbender.xml While Apache Flex runs on a large set of platforms, the Adobe Pixel Bender compiler used to compile the shaders is only supported on: @@ -45,7 +45,7 @@ Getting the latest sources via git git checkout develop The above sequence actually checks out the entire Apache Flex SDK. The - Pixel Bender files are a subset of files from this repository. + Apache Flex Pixel Bender files are a subset of files from this repository. Building Apache Flex Pixel Bender Files ========================= @@ -56,9 +56,9 @@ Building Apache Flex Pixel Bender Files Install Prerequisites --------------------- - Before building the Pixel Bender 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. + Before building the Apache Flex Pixel Bender 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. @@ -90,7 +90,7 @@ Install Prerequisites export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin" - There is no Pixel Bender compiler for Linux. + There is no Adobe Pixel Bender compiler for Linux. *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 @@ -104,9 +104,10 @@ Install Prerequisites 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. + Download the Adobe Pixel Bender Toolkit for your platform and install or unzip + it. + On Windows and Mac Set PIXELBENDER_HOME to the absolute path of the Adobe Pixel + Bender Toolkit directory. Using the Binary Distribution http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2187226c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 772a4b5..40a8973 100644 --- a/build.xml +++ b/build.xml @@ -44,7 +44,7 @@ <property name="javac.src" value="1.5"/> <property name="kit.prefix" value="apache-flex-sdk-${release.version}"/> - <property name="kit-pixelbender.prefix" value="apache-flex-sdk-pixelbender-1.0.0"/> + <property name="kit-pixelbender.prefix" value="apache-flex-sdk-pixel-bender-1.0.0"/> <property name="source.kit" value="${kit.prefix}-src"/> <property name="binary.kit" value="${kit.prefix}-bin"/> <property name="source-pixelbender.kit" value="${kit-pixelbender.prefix}-src"/> @@ -109,7 +109,7 @@ <target name="release-pixelbender" depends="check-compile-env,check-runtime-env,source-package-pixelbender,binary-package-pixelbender" - description="Creates source and binary kits for Apache Flex's PixelBender package."/> + description="Creates source and binary kits for Apache Flex's Pixel Bender package."/> <target name="source-release" depends="super-clean,create-description,create-config,source-package" @@ -521,7 +521,7 @@ </target> <target name="source-package-pixelbender" depends="stage-source-pixelbender,source-package-zip-pixelbender,source-package-tgz-pixelbender" - description="Package PixelBender source files required to build in zip and tar-gzip file"> + description="Package Pixel Bender source files required to build in zip and tar-gzip file"> </target> <!-- @@ -788,7 +788,7 @@ </target> <target name="stage-source-pixelbender" - description="Package PixelBender source files required to build in zip file"> + description="Package Pixel Bender source files required to build in zip file"> <antcall target="clean-temp"/> @@ -825,7 +825,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This package contains PixelBender shaders used by the Apache Flex SDK. +Apache Flex Pixel Bender Package 1.0.0 +===================================== + +This package contains Adobe Pixel Bender shaders used by the Apache +Flex SDK. See the README for instructions on compiling the shaders on Windows and Mac. There is no compiler for Linux. @@ -1064,7 +1068,7 @@ There are no known issues. <zip destfile="${basedir}/out/${binary.kit}.zip" basedir="${basedir}/temp"/> </target> <target name="binary-package-zip-pixelbender" unless="no.zip" - description="Zips up the PixelBender files in the temp directory into the binary zipfile."> + description="Zips up the Pixel Bender files in the temp directory into the binary zipfile."> <mkdir dir="${basedir}/out"/> <zip destfile="${basedir}/out/${binary-pixelbender.kit}.zip" basedir="${basedir}/temp"/> @@ -1085,7 +1089,7 @@ There are no known issues. </target> <target name="binary-package-pixelbender" depends="build-pixelbender" - description="Package PixelBender binary files in zip and tar-gzip file."> + description="Package Pixel Bender binary files in zip and tar-gzip file."> <antcall target="stage-source-pixelbender"/> @@ -1870,8 +1874,8 @@ There are no known issues. </target> <target name="archive-pbj"> - <echo message="Creating an archive of the compiled PixelBender files" /> - <echo message="The compiled PixelBender files are taken from '${env.PIXELBENDER_COMPILED_HOME}'" /> + <echo message="Creating an archive of the compiled Pixel Bender files" /> + <echo message="The compiled Pixel Bender files are taken from '${env.PIXELBENDER_COMPILED_HOME}'" /> <tar destfile="${basedir}/out/pb.tar"> <tarfileset dir="${env.PIXELBENDER_COMPILED_HOME}"> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2187226c/pixelbender.xml ---------------------------------------------------------------------- diff --git a/pixelbender.xml b/pixelbender.xml index ecc7de3..56f2570 100644 --- a/pixelbender.xml +++ b/pixelbender.xml @@ -18,7 +18,7 @@ --> -<project name="framework" default="main" basedir="."> +<project name="pixel bender" default="main" basedir="."> <property file="${basedir}/env.properties"/> <property environment="env"/> @@ -32,7 +32,7 @@ <ant dir="${basedir}/frameworks/projects/spark" target="pixelbender-compile"/> </target> - <target name="clean" depends="clean-pixelbender" description="Cleans third party downloaded files." /> + <target name="clean" depends="clean-pixelbender" description="Cleans Pixel Bender PBJ files." /> <target name="clean-pixelbender" > <delete> @@ -86,6 +86,7 @@ description="copies PBK and PBJ files to Flex SDK folder"> <copy todir="${FLEX_HOME}" > <fileset dir="${basedir}"> + <include name="**/*.pbk" /> <include name="**/*.pbj" /> </fileset> </copy>
