flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1336997 - in /incubator/flex/trunk: build.xml frameworks/air-config.xml frameworks/build.xml frameworks/projects/authoringsupport/build.xml mustella/
Date Fri, 11 May 2012 01:15:03 GMT
Author: cframpton
Date: Fri May 11 01:15:02 2012
New Revision: 1336997

URL: http://svn.apache.org/viewvc?rev=1336997&view=rev
Log:
Fix src package so that unix scripts are included, flash-integration builds, authoringsupport
is turned off until we can find the source for FlexContentHolderThumbnail.swc, add missing
{airHome} token to air-config.xml and ignore mustella/tmp directory.

Modified:
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/air-config.xml
    incubator/flex/trunk/frameworks/build.xml
    incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
    incubator/flex/trunk/mustella/   (props changed)

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1336997&r1=1336996&r2=1336997&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri May 11 01:15:02 2012
@@ -379,14 +379,7 @@
         </copy>  
 
         <!-- bin -->
-        <copy todir="${basedir}/temp/bin" includeEmptyDirs="false">
-            <fileset dir="${basedir}/bin">
-                <include name="*.bat"/>
-                <include name="*.sh"/>
-                <exclude name="adl*"/>
-                <exclude name="adt*"/>
-            </fileset>
-        </copy>  
+        <antcall target="stage-bin"/>
 
         <!-- frameworks -->
         <antcall target="stage-frameworks"/>
@@ -408,7 +401,7 @@
             </fileset>
         </copy>
                 
-        <chmod dir="${basedir}/temp" perm="755" includes="bin/*, **/*.bat, **/*.sh, **/*.linux"
/>
+        <chmod dir="${basedir}/temp" perm="755" includes="**/*.bat, **/*.sh, **/*.linux"
/>
     </target>
     
     <target name="stage-frameworks">
@@ -418,7 +411,6 @@
                 <include name="**"/>
                 <exclude name="**/libs/**"/>
                 <exclude name="**/*.swc"/>
-                <exclude name="**/bundles/**/empty.properties"/>
                 <exclude name="test*/**"/>
                 <exclude name="projects/automation*/**"/>
                 <exclude name="projects/air/**"/>
@@ -441,6 +433,18 @@
         <fix-config-file file="${basedir}/temp/frameworks/flex-config.xml" />
     </target>
 
+    <target name="stage-bin">
+        <copy todir="${basedir}/temp/bin" includeEmptyDirs="false">
+            <fileset dir="${basedir}/bin">
+                <include name="*"/>
+                <exclude name="adl*"/>
+                <exclude name="adt*"/>
+            </fileset>
+        </copy>  
+        <fixcrlf eol="unix" excludes="*.bat" srcdir="${basedir}/temp/bin" />
+        <chmod dir="${basedir}/temp/bin" perm="755" excludes="*.bat"/>
+    </target>
+    
     <target name="stage-modules" unless="no.modules">
         <!-- modules -->
         <copy todir="${basedir}/temp/modules" includeEmptyDirs="false">
@@ -528,46 +532,10 @@
         
         <!-- use this to build frameworks -->
         <copy file="${basedir}/frameworks/build_framework.xml" 
-            tofile="${basedir}/temp/frameworks/build.xml"/>
+            tofile="${basedir}/temp/frameworks/build.xml" failonerror="true" verbose="true"/>
 
         <!-- ant is pre-built and in FLEX_HOME/ant rather than modules/antTasks -->
         <antcall target="stage-antTasks"/>
-
-        <!-- bin -->
-        <copy todir="${basedir}/temp/bin">
-            <fileset dir="${basedir}/bin">
-                <include name="acompc"/>
-                <include name="acompc.bat"/>
-                <include name="amxmlc"/>
-                <include name="amxmlc.bat"/>
-                <include name="asdoc"/>
-                <include name="asdoc.bat"/>
-                <include name="aasdoc"/>
-                <include name="aasdoc.bat"/>
-                <include name="compc"/>
-                <include name="compc.bat"/>
-                <include name="copylocale"/>
-                <include name="copylocale.bat"/>
-                <include name="digest"/>
-                <include name="digest.bat"/>
-                <include name="fcsh"/>
-                <include name="fcsh.bat"/>
-                <include name="fdb"/>
-                <include name="fdb.bat"/>
-                <include name="jvm.config"/>
-                <include name="mxmlc"/>
-                <include name="mxmlc.bat"/>
-                <include name="optimizer"/>
-                <include name="optimizer.bat"/>
-                <include name="swcdepends"/>
-                <include name="swcdepends.bat"/>
-                <include name="swfdump"/>
-                <include name="swfdump.bat"/>
-            </fileset>
-        </copy>
-        <fixcrlf eol="unix" 
-            srcdir="${basedir}/temp/bin" 
-            includes="acompc,amxmlc,asdoc,compc,copylocale,fdb,mxmlc,fcsh,optimizer,digest,fontswf"/>
         
         <!-- frameworks/libs -->
         <copy todir="${basedir}/temp/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/air-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/air-config.xml?rev=1336997&r1=1336996&r2=1336997&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/air-config.xml (original)
+++ incubator/flex/trunk/frameworks/air-config.xml Fri May 11 01:15:02 2012
@@ -80,6 +80,7 @@
          <path-element>libs</path-element>
          <path-element>libs/mx</path-element>
          <path-element>libs/air</path-element>
+         <path-element>{airHome}/frameworks/libs/air</path-element>
          <path-element>locale/{locale}</path-element>
       </library-path>
      

Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1336997&r1=1336996&r2=1336997&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Fri May 11 01:15:02 2012
@@ -78,7 +78,8 @@
         <antcall target="mobiletheme"/>     
         <antcall target="core"/>
         <antcall target="flash_integration"/>
-        <antcall target="authoringsupport"/>
+        <!-- authoringsupport removed until source found for FlexContentHolderThumbnail.swc
found -->
+        <!--antcall target="authoringsupport"/-->
         <antcall target="halo"/>
         <antcall target="wireframe"/>
         <!-- automation removed until sources donated to Apache -->

Modified: incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml?rev=1336997&r1=1336996&r2=1336997&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml Fri May 11 01:15:02
2012
@@ -40,7 +40,11 @@
 
 	<target name="compile" description="Compiles authoringsupport.swc">
 		<echo message="Compiling frameworks/libs/authoringsupport.swc"/>
+		<echo message="Disabled for Apache Flex since source for FlexContentHolderThumbnail.swc
is not available"/>
+	</target>
 
+	<target name="compile-save" description="Compiles authoringsupport.swc">
+		<echo message="Compiling frameworks/libs/authoringsupport.swc"/>
 		<!-- 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"/>
@@ -79,6 +83,10 @@
 	</target>
 
 	<target name="doc" depends="clean-temp-docs" description="updates authoringsupport.swc
with asdoc xml">
+		<echo message="Disabled for Apache Flex since source for FlexContentHolderThumbnail.swc
is not available"/>
+	</target>
+
+	<target name="doc-save" depends="clean-temp-docs" description="updates authoringsupport.swc
with asdoc xml">
 		<!-- Load the <asdoc> 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"/>

Propchange: incubator/flex/trunk/mustella/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 11 01:15:02 2012
@@ -1,2 +1,4 @@
 mustella.swc
 *.class
+classes
+tmp



Mime
View raw message