don't package zen theme.  Try to not set build-number in flex-config in source 
package but only in binary package


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

Branch: refs/heads/master
Commit: 0bf05aa5cd720117f6f68ded66a2ec745b7520a9
Parents: 62f560e
Author: Alex Harui <aha...@apache.org>
Authored: Mon Jun 30 23:07:56 2014 -0700
Committer: Alex Harui <aha...@apache.org>
Committed: Mon Jun 30 23:07:56 2014 -0700

----------------------------------------------------------------------
 build.xml | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0bf05aa5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index df72b95..1462db8 100644
--- a/build.xml
+++ b/build.xml
@@ -70,6 +70,11 @@
             property="TLF_HOME"
             value="${FLEX_HOME}/frameworks/projects" />
 
+    <tstamp>
+        <format property="build.number.date" pattern="yyyyMMdd" />
+    </tstamp>
+    <property name="build.version" 
value="${release.version}.${build.number.date}" />
+
     <!--
         Optional jars but should be in place for a real release build.
         
@@ -238,9 +243,6 @@
     </target>
 
     <target name="create-description" description="Generate 
flex-sdk-description.xml">
-        <tstamp>
-               <format property="build.number.date" pattern="yyyyMMdd" />
-        </tstamp>
         <echo message="build.number is ${build.number.date}"/>
         <echo file="${basedir}/flex-sdk-description.xml">&lt;?xml 
version="1.0"?&gt;
 &lt;!--
@@ -440,9 +442,6 @@
     </macrodef>
 
        <target name="frameworks-rsls" description="Build signed framework 
RSLs">
-               <tstamp>
-               <format property="build.number.date" pattern="yyyyMMdd" />
-        </tstamp>
         <echo message="build.number is ${build.number.date}"/>
                <!-- textLayout RSL -->
                <create-rsl rsl-dir="${basedir}/frameworks/rsls" 
swc-dir="${basedir}/frameworks/libs" swc-name="textLayout" 
build-number="${release.version}.${build.number.date}"/>
@@ -611,6 +610,9 @@
             <fileset dir="${basedir}/samples" >
                 <exclude name="**/*.swc"/>
                 <exclude name="**/*.swf"/>
+                <!-- zen theme is missing assets.  Don't package it
+                 because FB will fail when it can't find the swc -->
+                <exclude name="zen/**"/>
             </fileset>
         </copy>
         
@@ -691,17 +693,6 @@
         <!-- frameworks/tests -->
         <antcall target="stage-frameworks-tests"/>
 
-        <tstamp>
-               <format property="build.number.date" pattern="yyyyMMdd" />
-        </tstamp>
-        <property name="build.version" 
value="${release.version}.${build.number.date}" />
-
-        <!-- now that config xml files are in temp, fix them up for release. 
-->
-        <echo message="Updating config file air-config.xml with version 
${build.version}"/>
-        <fix-config-file file="${basedir}/temp/frameworks/air-config.xml" 
version="${build.version}" />
-        <echo message="Updating config file flex-config.xml with version 
${build.version}"/>
-        <fix-config-file file="${basedir}/temp/frameworks/flex-config.xml" 
version="${build.version}" />
-        
         <!-- Update all Version.as files in the kit frameworks directory with 
build.number -->
         <antcall target="version-update"/>
     </target>
@@ -999,6 +990,9 @@ There are no known issues.
                 <include name="**/build.xml"/>
                 <include name="**/*.swc"/>
                 <include name="**/*.swf"/>
+                <!-- don't package zen theme as it is missing
+                 some assets and FB fails looking for the swc -->
+                <exclude name="zen/**"/>
             </fileset>
         </copy>
 
@@ -1010,7 +1004,13 @@ There are no known issues.
             </fileset>
         </copy>
                 
-        <antcall target="binary-package-zip"/>        
+        <!-- now that config xml files are in temp, fix them up for release. 
-->
+        <echo message="Updating config file air-config.xml with version 
${build.version}"/>
+        <fix-config-file file="${basedir}/temp/frameworks/air-config.xml" 
version="${build.version}" />
+        <echo message="Updating config file flex-config.xml with version 
${build.version}"/>
+        <fix-config-file file="${basedir}/temp/frameworks/flex-config.xml" 
version="${build.version}" />
+
+        <antcall target="binary-package-zip"/>
         <antcall target="binary-package-tgz"/>        
         <copy todir="${basedir}/out" 
file="${basedir}/apache-flex-sdk-installer-config.xml" />
     </target>
@@ -1184,11 +1184,7 @@ There are no known issues.
 
     <target name="have-greptask" if="have.greptask">
                <taskdef name="grep" classname="ise.antelope.tasks.Find" 
classpathref="anttask.classpath"/>                 
-
-        <tstamp>
-               <format property="build.number.date" pattern="yyyyMMdd" />
-        </tstamp>
-               
+        
         <echo message="Updating all frameworks/projects/**/Version.as files 
with version ${release.version}.${build.number.date}"/>
                
         <!-- Update all Version.as files in the kit frameworks directory-->

Reply via email to