You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by go...@apache.org on 2013/04/13 07:31:54 UTC

git commit: 'ant super-clean' now cleans all build output.

Updated Branches:
  refs/heads/develop e604699d7 -> 20d68b04c


'ant super-clean' now cleans all build output.

I've used 'git status --ignored' to verify that
'ant super-clean' cleans everything from 'ant main checkintests',
including empty directories.
It's possible that other ant targets create build output
that still doesn't get cleaned.


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

Branch: refs/heads/develop
Commit: 20d68b04cae1853d4c4c19cfe6bcb47b69c7f370
Parents: e604699
Author: Gordon Smith <go...@adobe.com>
Authored: Fri Apr 12 22:20:55 2013 -0700
Committer: Gordon Smith <go...@adobe.com>
Committed: Fri Apr 12 22:20:55 2013 -0700

----------------------------------------------------------------------
 build.xml                                       |    3 +++
 frameworks/build.xml                            |    2 ++
 frameworks/projects/apache/build.xml            |    2 +-
 frameworks/projects/flash-integration/build.xml |    1 +
 modules/asc/build/java/build.xml                |    1 +
 modules/thirdparty/batik/build.xml              |    1 +
 mustella/build.xml                              |    1 +
 7 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c53cff6..54e49bc 100644
--- a/build.xml
+++ b/build.xml
@@ -290,11 +290,14 @@
             <include name="nai/**"/>
             <include name="win/**"/>
         </delete>
+        <delete dir="${basedir}/in"/>
+        <delete dir="${basedir}/lib"/>
         <delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
         <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
         <delete dir="${basedir}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
         <ant dir="${basedir}/asdoc" target="clean" />
         <ant dir="${basedir}/ide/flashbuilder" target="clean" />
+        <ant dir="${basedir}/mustella" target="clean"/>
     </target>
 
     <target name="modules-clean">

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index c407ea4..04c1b8d 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -230,6 +230,7 @@
     </target>
     
     <target name="clean" depends="automation-clean,airsdk-clean" description="Cleans all SWCs and their resource bundles">
+        <delete file="${basedir}/flex-config.xml"/>
         <!-- Delete output from SWC projects -->
         <ant dir="${basedir}/projects/textLayout" target="clean"/>
         <ant dir="${basedir}/projects/framework" target="clean"/>
@@ -260,6 +261,7 @@
             </fileset>
         </delete> 
         <!-- Delete empty folders -->
+        <delete dir="${basedir}/libs"/>
         <delete dir="${basedir}/locale">
             <exclude name="**/metadata.properties"/>
         </delete>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/frameworks/projects/apache/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/apache/build.xml b/frameworks/projects/apache/build.xml
index 657a494..363e896 100644
--- a/frameworks/projects/apache/build.xml
+++ b/frameworks/projects/apache/build.xml
@@ -144,7 +144,7 @@
 				<include name="bundles.properties"/>
 			    <include name="bundles/en_US/packages.dita"/>
 			</fileset>
-			<fileset dir="${FLEX_HOME}/frameworks/libs/apache">
+			<fileset dir="${FLEX_HOME}/frameworks/libs">
 				<include name="apache.swc"/>
 				<include name="apache.swc.incr"/>
 			</fileset>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/frameworks/projects/flash-integration/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/flash-integration/build.xml b/frameworks/projects/flash-integration/build.xml
index 9eef320..ea1ac4a 100644
--- a/frameworks/projects/flash-integration/build.xml
+++ b/frameworks/projects/flash-integration/build.xml
@@ -92,6 +92,7 @@
 				<include name="flash-integration.swc.incr"/>
 			</fileset>
 			<fileset dir="${FLEX_HOME}/frameworks/flash-integration"/>
+			<fileset dir="${FLEX_HOME}/frameworks/projects/flash-integration/libs"/>
 		</delete>
 	</target>
 	

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/modules/asc/build/java/build.xml
----------------------------------------------------------------------
diff --git a/modules/asc/build/java/build.xml b/modules/asc/build/java/build.xml
index 6d4853b..769e3fd 100644
--- a/modules/asc/build/java/build.xml
+++ b/modules/asc/build/java/build.xml
@@ -218,6 +218,7 @@
 			<fileset file="${root.dir}/lib/global.abc"/>
 		</delete>
 		<delete dir="${basedir}/classes" failonerror="false"/>
+        <delete dir="${lib.dir}"/>
 	</target>
 	<target name="with.clover">
 		<taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/modules/thirdparty/batik/build.xml
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/build.xml b/modules/thirdparty/batik/build.xml
index ba74d0d..e0ab1c5 100644
--- a/modules/thirdparty/batik/build.xml
+++ b/modules/thirdparty/batik/build.xml
@@ -1150,6 +1150,7 @@ JAVA=/usr/bin/java
     description="cleans files generated by batik-all-flex-jar">
     <delete file="${FLEX_LIB}/batik-all-flex.jar" failonerror="false"/>
     <delete dir="${build}"/>
+    <delete dir="${basedir}/lib"/>
   </target>
   
   <!--====== END additions for Apache Flex =========-->

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/20d68b04/mustella/build.xml
----------------------------------------------------------------------
diff --git a/mustella/build.xml b/mustella/build.xml
index 11153b2..9cc7332 100644
--- a/mustella/build.xml
+++ b/mustella/build.xml
@@ -900,6 +900,7 @@
                 <include name="*.log"/>
             </fileset>
         </delete>
+        <delete dir="${tmp.dir}"/>
     </target>
 
     <condition property="copy_adt_jar" value="true" >