You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2013/03/29 16:48:06 UTC

[1/5] git commit: Added *.report to the exclusion

Updated Branches:
  refs/heads/master fa263c2fd -> 8f5c65014


Added *.report to the exclusion


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

Branch: refs/heads/master
Commit: b72fa525405ccb9c500660e668159e8ff36bc3d3
Parents: fa263c2
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Mar 29 16:19:02 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Mar 29 16:19:02 2013 +0100

----------------------------------------------------------------------
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b72fa525/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index beddc20..965fea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ META-INF/
 *.vms
 *.ser
 *.mxp
+*.report
 bundles.properties
 empty.properties
 css_*.properties


[3/5] git commit: Removed IDE files from being included in the release

Posted by ft...@apache.org.
Removed IDE files from being included in the release


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/976af70d
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/976af70d
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/976af70d

Branch: refs/heads/master
Commit: 976af70de385451ab86de10dc676bb7fd2caf0de
Parents: 14afacf
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Mar 29 16:41:11 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Mar 29 16:41:11 2013 +0100

----------------------------------------------------------------------
 installer/build.xml |  146 +++++++++++++++++++++++----------------------
 1 files changed, 75 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/976af70d/installer/build.xml
----------------------------------------------------------------------
diff --git a/installer/build.xml b/installer/build.xml
index 1787c4c..d9e597b 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -22,7 +22,7 @@
 
     <!--load environment variables prefixed with env -->
     <property environment="env"/>
-	
+
     <!--location of property file -->
     <property file="${basedir}/build.properties" description="Properties for Apache Flex SDK Installer project" />
     <property file="${basedir}/build.number"/>
@@ -33,10 +33,10 @@
     <property name="source.kit" value="${kit.prefix}-src"/>
     <property name="binary.kit" value="${kit.prefix}-bin"/>
 
-    <!-- 
+    <!--
         Properties are immutable so value frozen first time property is set.
-        If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line 
-        use the environment variable, if it exists. Else if windows, use FLEX_HOME_WIN 
+        If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line
+        use the environment variable, if it exists. Else if windows, use FLEX_HOME_WIN
         else use FLEX_HOME_MAC, which are both defined in build.properties.
     -->
     <condition property="FLEX_HOME" value="${env.FLEX_HOME}">
@@ -47,42 +47,42 @@
     </condition>
     <property name="FLEX_HOME" value="${FLEX_HOME_MAC}"/>
 
-    <!-- 
+    <!--
         Properties are immutable so value frozen first time property is set.
-        If AIR_HOME is not set on the command line with -DAIR_HOME=/path/to/air/sdk on the 
-        ant command line use the environment variable, if it exists. Else if windows, use 
+        If AIR_HOME is not set on the command line with -DAIR_HOME=/path/to/air/sdk on the
+        ant command line use the environment variable, if it exists. Else if windows, use
         AIR_HOME_WIN else use AIR_HOME_MAC, which are both defined in build.properties.
     -->
     <condition property="AIR_HOME" value="${env.AIR_HOME}">
         <isset property="env.AIR_HOME" />
     </condition>
     <condition property="AIR_HOME" value="${AIR_HOME_WIN}">
-        <os family="windows"/> 
+        <os family="windows"/>
     </condition>
     <property name="AIR_HOME" value="${AIR_HOME_MAC}"/>
-	
+
     <condition property="cert_pwd_not_found" >
 		<not>
        		<available file="${CERT_PASSWORD_FILE}"/>
 		</not>
     </condition>
-	
+
 	<condition property="KEYSTORE" value="${RELEASE_KEYSTORE_FILE}" >
 		<available file="${CERT_PASSWORD_FILE}"/>
 	</condition>
-	
+
 	<condition property="KEYSTORE" value="temp.p12" >
 		<not>
 			<available file="${CERT_PASSWORD_FILE}"/>
 		</not>
 	</condition>
-	
+
     <condition property="CERT_PASSWORD" value="${TEMP_PASS_CHANGE_THIS}" >
 		<not>
        		<available file="${CERT_PASSWORD_FILE}"/>
 		</not>
     </condition>
-	
+
     <!-- compilers -->
     <property name="ADL" value="${AIR_HOME}/bin/adl"/>
     <property name="ADT" value="${AIR_HOME}/lib/adt.jar"/>
@@ -96,9 +96,9 @@
     </path>
     <taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
 
-    <!-- 
+    <!--
         Optional jars but should be in place for a real release build.
-        
+
         For <rat> apache-rat-0.8.jar and apache-rat-tasks-0.8.jar should be in classpath.
         See rat-report.
     -->
@@ -110,31 +110,31 @@
            <include name=".ant/lib/**/apache-rat*.jar"/>
         </fileset>
     </path>
-    
+
     <condition property="unsupportedOS">
-        <and>   
+        <and>
             <os family="unix" />
             <not>
                 <os family="mac" />
             </not>
        </and>
     </condition>
-    
+
     <!-- AIR package extension -->
     <condition property="extension" value="exe">
         <os family="windows" />
     </condition>
     <property name="extension" value="dmg"/>
 
-    <target name="build" depends="init,certificate,compile,packagenative,cleanup" 
+    <target name="build" depends="init,certificate,compile,packagenative,cleanup"
         description="Compiles and packages application"/>
 
     <target name="release" depends="clean,build,source-package,rat-report,sign,copy-misc"
         description="Build the application and package up the distros for release."/>
-        
-    <target name="init" depends="clean,createDirs,update-version-in-xml-files" 
+
+    <target name="init" depends="clean,createDirs,update-version-in-xml-files"
         description="Creates the deploy folders and sets app extension"/>
-        
+
     <target name="clean" description="Cleans up old files.">
         <delete dir="${BUILD_DIR}" failOnError="false" includeEmptyDirs="true" />
         <delete dir="${LIBRARY_DIR}" failOnError="false" includeEmptyDirs="true" />
@@ -175,12 +175,12 @@
             </fileset>
         </replaceregexp>
     </target>
-    
-    <!-- 
-        Run this target once, and then rebuild, when you make a change to this app 
-        so that the AIR Installer will allow the app to be updated. The build.number 
-        property in the file build.property will be read and then incremented and the 
-        nano version number in the <version> tag in InstallApacheFlex-app.xml will be 
+
+    <!--
+        Run this target once, and then rebuild, when you make a change to this app
+        so that the AIR Installer will allow the app to be updated. The build.number
+        property in the file build.property will be read and then incremented and the
+        nano version number in the <version> tag in InstallApacheFlex-app.xml will be
         updated.
     -->
     <target name="update-version" description="Update the app version number so the installer will be updated.">
@@ -188,13 +188,13 @@
             <format property="touch.year" pattern="yyyy"/>
         </tstamp>
 
-        <propertyfile file="build.number" 
+        <propertyfile file="build.number"
             comment="Copyright ${touch.year} The Apache Software Foundation.">
             <entry key="build.number" type="int" default="0" operation="+"/>
         </propertyfile>
 
     </target>
-    
+
     <target name="packagenative" depends="packageair"
        description="Packages the AIR file from the build directory to create a native installer (exe/dmg) file">
 
@@ -208,12 +208,12 @@
            <arg value="${BUILD_DIR}/${APP_NAME}.air"/>
        </java>
    </target>
-    
+
     <target name="abortBuild" if="unsupportedOS">
         <fail>
             Unable to create a .exe or a .dmg file on this operating system.
-            You must use ADT on the same operating system as that of the native installer file you want to generate. 
-            So, to create an EXE file for Windows, run this build on Windows. To create a DMG file for Mac OS, run this 
+            You must use ADT on the same operating system as that of the native installer file you want to generate.
+            So, to create an EXE file for Windows, run this build on Windows. To create a DMG file for Mac OS, run this
             build on Mac OS.
         </fail>
     </target>
@@ -226,11 +226,11 @@
     <target name="get-as3commons.swc" depends="check-as3commons.swc" unless="as3commons.swc.present"
         description="Download as3commons.swc and fail if checksum mismatch.">
         <mkdir dir="${LIBRARY_DIR}"/>
-        <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc" 
-            dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc" 
+        <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc"
+            dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc"
             verbose="true"/>
-        <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc.md5" 
-            dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc.md5" 
+        <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc.md5"
+            dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc.md5"
             verbose="true"/>
         <checksum file="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc" algorithm="MD5" verifyProperty="isMD5ok"/>
         <delete file="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc.md5" failOnError="false"/>
@@ -240,7 +240,7 @@
             </condition>
         </fail>
     </target>
-    
+
     <target name="compile" depends="get-as3commons.swc"
         description="Compiles the AIR application to a SWF file and places SWF in a temp directory to be packaged.">
         <mxmlc file="${SOURCE_DIR}/${APP_NAME}.${APP_EXTENSION}"
@@ -256,8 +256,8 @@
             <source-path path-element="${COMMON_SOURCE_DIR}"/>
             <external-library-path file="${AIR_HOME}/frameworks/libs/air/airglobal.swc" append="true"/>
             <library-path dir="${LIBRARY_DIR}" includes="*.swc" append="true"/>
-            <define name="INSTALLER::releaseVersion" value="${release.version}"/> 
-            <define name="INSTALLER::buildNumber" value="${build.number}"/> 
+            <define name="INSTALLER::releaseVersion" value="${release.version}"/>
+            <define name="INSTALLER::buildNumber" value="${build.number}"/>
         </mxmlc>
     </target>
 
@@ -309,12 +309,12 @@
             <arg value="${ASSETS_DIR}"/>
         </java>
     </target>
-	
+
 	<target name="copy-misc" description="Copy config files to release directory">
 		<copy file="${basedir}/README" tofile="${RELEASE_DIR}/READme"/>
 	</target>
-    
-    <!-- 
+
+    <!--
         Packages the source distribution with ZIP and TAR_GZIP.
         The source file line endings match the package type.
     -->
@@ -334,13 +334,14 @@
                 <exclude name="**/.flexProperties"/>
 				<exclude name="**/.flexLibProperties"/>
                 <exclude name="**/.project"/>
+                <exclude name="**/.idea/**"/>
             </fileset>
         </copy>
-		
+
 		<copy todir="${BUILD_DIR}/temp/${INSTALLER_PROJECT_NAME}" includeEmptyDirs="false">
 			<fileset dir="${basedir}">
 				<exclude name="*.p12"/>
-				<exclude name="*.password"/>				
+				<exclude name="*.password"/>
                 <exclude name="rat.report"/>
                 <exclude name="libs/**"/>
 				<exclude name="bin/**"/>
@@ -353,6 +354,7 @@
                 <exclude name="**/.flexProperties"/>
 				<exclude name="**/.flexLibProperties"/>
                 <exclude name="**/.project"/>
+                <exclude name="**/.idea/**"/>
 				<!-- These are bumped up to the top-level release directory.  -->
                 <exclude name="DISCLAIMER"/>
                 <exclude name="LICENSE"/>
@@ -378,25 +380,25 @@
         <fixcrlf srcdir="${BUILD_DIR}/temp" eol="crlf" encoding="UTF8" excludes="**/assets/**,**/*.ttf,**/*.png" fixlast="false"/>
 
         <mkdir dir="${RELEASE_DIR}"/>
-        <zip destfile="${RELEASE_DIR}/${source.kit}.zip" 
+        <zip destfile="${RELEASE_DIR}/${source.kit}.zip"
             basedir="${BUILD_DIR}/temp"/>
-        
+
         <fixcrlf srcdir="${BUILD_DIR}/temp" eol="unix" encoding="UTF8" excludes="**/assets/**,**/*.ttf,**/*.png" fixlast="false"/>
 
-        <tar destfile="${RELEASE_DIR}/${source.kit}.tar.gz" 
+        <tar destfile="${RELEASE_DIR}/${source.kit}.tar.gz"
             compression="gzip"
             basedir="${BUILD_DIR}/temp"/>
-        
+
         <delete dir="${BUILD_DIR}/temp"/>
 		<delete dir="${BUILD_DIR}"/>
     </target>
 
-    <!-- 
+    <!--
         Packages the binary distribution with ZIP and TAR_GZIP.
     -->
-    <target name="binary-package" description="Package binary files.">      
+    <target name="binary-package" description="Package binary files.">
         <mkdir dir="${RELEASE_DIR}"/>
-        
+
         <zip destfile="${RELEASE_DIR}/${binary.kit}.zip">
             <fileset dir="${basedir}/release">
                 <exclude name="**/*.zip"/>
@@ -412,22 +414,22 @@
 	<!--
 	    Run the Apache Rat audit tool against the source in the source kit.
 	    The report is written to rat.report.
-	    
-	    You need to place apache-rat-tasks-0.8.jar and apache-rat-0.8.jar in the 
+
+	    You need to place apache-rat-tasks-0.8.jar and apache-rat-0.8.jar in the
 	    anttask.classpath in order to do this.  If the jar isn't found, the report
 	    will not be generated.
-	--> 
+	-->
     <target name="rat-report" depends="rat-taskdef" if="have.rattasks"
         description="Report on licenses in source kit.">
-    
+
         <!-- Unzip the source kit -->
         <unzip src="${RELEASE_DIR}/${source.kit}.zip" dest="${RELEASE_DIR}/temp"/>
-        
+
         <property name="rat.dir" value="${RELEASE_DIR}/temp"/>
 
         <echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.report"/>
 
-        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
             reportFile="${basedir}/rat.report">
             <fileset dir="${rat.dir}">
                 <exclude name="**/Apache License Version 2.txt"/>
@@ -444,6 +446,8 @@
                 <exclude name="**/.project"/>
                 <exclude name="**/.fxpProperties"/>
                 <exclude name="**/.settings/**"/>
+                <exclude name="**/.idea/**"/>
+                <exclude name="**/*.iml"/>
                 <!--          End of source files           -->
                 <!--          Start of binary files           -->
                 <!-- exclude media (png, ico) -->
@@ -454,13 +458,13 @@
                 <!--          End of binary files           -->
             </fileset>
         </rat:report>
-        
+
         <delete dir="${RELEASE_DIR}/temp" failOnError="false"/>
     </target>
 
-    <target name="rat-taskdef" description="Rat taskdef"> 
-        <available property="have.rattasks" 
-            resource="org/apache/rat/anttasks/antlib.xml" 
+    <target name="rat-taskdef" description="Rat taskdef">
+        <available property="have.rattasks"
+            resource="org/apache/rat/anttasks/antlib.xml"
             classpathref="anttask.classpath"/>
 
         <antcall target="have-rattasks"/>
@@ -470,22 +474,22 @@
     <target name="have-rattasks" if="have.rattasks">
         <typedef resource="org/apache/rat/anttasks/antlib.xml"
                  uri="antlib:org.apache.rat.anttasks"
-                 classpathref="anttask.classpath"/>                 
+                 classpathref="anttask.classpath"/>
     </target>
-    
+
     <target name="no-rattasks" unless="have.rattasks">
         <echo message="Rat report not generated."/>
         <echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
         <echo message="not found in anttask.classpath"/>
     </target>
-	
+
 	<target name="sign" >
 		<exec executable="gpg" output="${RELEASE_DIR}/${source.kit}.zip.md5">
 			<arg value="--print-md" />
 			<arg value="MD5" />
 			<arg value="release/${source.kit}.zip" />
 		</exec>
-		
+
 		<exec executable="gpg">
 			<arg value="--armor" />
 			<arg value="--output" />
@@ -493,13 +497,13 @@
 			<arg value="--detach-sig" />
 			<arg value="${RELEASE_DIR}/${source.kit}.zip" />
 		</exec>
-		
+
 		<exec executable="gpg" output="${RELEASE_DIR}/${source.kit}.tar.gz.md5">
 			<arg value="--print-md" />
 			<arg value="MD5" />
 			<arg value="release/${source.kit}.tar.gz" />
 		</exec>
-		
+
 		<exec executable="gpg">
 			<arg value="--armor" />
 			<arg value="--output" />
@@ -507,13 +511,13 @@
 			<arg value="--detach-sig" />
 			<arg value="${RELEASE_DIR}/${source.kit}.tar.gz" />
 		</exec>
-		
+
 		<exec executable="gpg" output="${RELEASE_DIR}/${binary.kit}.${extension}.md5">
 			<arg value="--print-md" />
 			<arg value="MD5" />
 			<arg value="release/${binary.kit}.${extension}" />
 		</exec>
-		
+
 		<exec executable="gpg">
 			<arg value="--armor" />
 			<arg value="--output" />
@@ -522,5 +526,5 @@
 			<arg value="${RELEASE_DIR}/${binary.kit}.${extension}" />
 		</exec>
 	</target>
-	
+
 </project>


[4/5] git commit: Incremented the version to 2.5.3

Posted by ft...@apache.org.
Incremented the version to 2.5.3


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8a3ac87f
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8a3ac87f
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8a3ac87f

Branch: refs/heads/master
Commit: 8a3ac87fea8d329eda4840b204dcf7fa2ca3a948
Parents: 976af70
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Mar 29 16:42:03 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Mar 29 16:42:03 2013 +0100

----------------------------------------------------------------------
 installer/build.number                     |    4 +-
 installer/src/InstallApacheFlex-app.xml    |   30 +++++++++++-----------
 installer/src/sdk-installer-config-2.0.xml |    2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8a3ac87f/installer/build.number
----------------------------------------------------------------------
diff --git a/installer/build.number b/installer/build.number
index 26c4121..522c319 100644
--- a/installer/build.number
+++ b/installer/build.number
@@ -1,6 +1,6 @@
 #Copyright 2013 The Apache Software Foundation.
-#Fri, 15 Mar 2013 20:48:26 +0100
+#Fri, 29 Mar 2013 15:58:04 +0100
 #Copyright 2012 The Apache Software Foundation.
 #Mon, 05 Nov 2012 11:23:11 -0800
 #Mon Oct 22 09:24:43 CEST 2012
-build.number=2
+build.number=3

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8a3ac87f/installer/src/InstallApacheFlex-app.xml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex-app.xml b/installer/src/InstallApacheFlex-app.xml
index b2dc6e9..3317355 100644
--- a/installer/src/InstallApacheFlex-app.xml
+++ b/installer/src/InstallApacheFlex-app.xml
@@ -24,10 +24,10 @@
 	Specifies parameters for identifying, installing, and launching AIR applications.
 
 	xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/3.4
-			The last segment of the namespace specifies the version 
+			The last segment of the namespace specifies the version
 			of the AIR runtime required for this application to run.
-			
-	minimumPatchLevel - The minimum patch level of the AIR runtime required to run 
+
+	minimumPatchLevel - The minimum patch level of the AIR runtime required to run
 			the application. Optional.
 -->
 
@@ -38,15 +38,15 @@
 	<!-- Used as the filename for the application. Required. -->
 	<filename>Apache Flex SDK Installer</filename>
 
-	<!-- The name that is displayed in the AIR application installer. 
+	<!-- The name that is displayed in the AIR application installer.
 	May have multiple values for each language. See samples or xsd schema file. Optional. -->
 	<name>Apache Flex SDK Installer</name>
-	
-	<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+
+	<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
 	Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
 	An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
-	<versionNumber>2.5.2</versionNumber>
-		         
+	<versionNumber>2.5.3</versionNumber>
+
 	<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
 	<!-- <versionLabel></versionLabel> -->
 
@@ -65,7 +65,7 @@
 		<!-- The main SWF or HTML file of the application. Required. -->
 		<!-- Note: In Flash Builder, the SWF reference is set automatically. -->
 		<content>InstallApacheFlex.swf</content>
-		
+
 		<!-- The title of the main window. Optional. -->
 		<!-- <title></title> -->
 
@@ -134,7 +134,7 @@
 	<!-- (i.e., to only mobile devices) then add this element and list -->
 	<!-- only the profiles which your application does support. -->
 	<!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
-	<supportedProfiles>extendedDesktop desktop</supportedProfiles> 
+	<supportedProfiles>extendedDesktop desktop</supportedProfiles>
 
 	<!-- The subpath of the standard default installation location to use. Optional. -->
 	<installFolder>Apache Flex</installFolder>
@@ -160,7 +160,7 @@
 	of the AIR file (true), or the default AIR application installer handles the update (false).
 	Optional. Default false. -->
 	<!-- <customUpdateUI></customUpdateUI> -->
-	
+
 	<!-- Whether the application can be launched when the user clicks a link in a web browser.
 	Optional. Default false. -->
 	<!-- <allowBrowserInvocation></allowBrowserInvocation> -->
@@ -176,13 +176,13 @@
 
 			<!-- The extension to register. Required. -->
 			<!-- <extension></extension> -->
-			
+
 			<!-- The description of the file type. Optional. -->
 			<!-- <description></description> -->
-			
+
 			<!-- The MIME content type. -->
 			<!-- <contentType></contentType> -->
-			
+
 			<!-- The icon to display for the file type. Optional. -->
 			<!-- <icon>
 				<image16x16></image16x16>
@@ -190,7 +190,7 @@
 				<image48x48></image48x48>
 				<image128x128></image128x128>
 			</icon> -->
-			
+
 		<!-- </fileType> -->
 	<!-- </fileTypes> -->
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8a3ac87f/installer/src/sdk-installer-config-2.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/sdk-installer-config-2.0.xml b/installer/src/sdk-installer-config-2.0.xml
index ff35ea8..90438c4 100644
--- a/installer/src/sdk-installer-config-2.0.xml
+++ b/installer/src/sdk-installer-config-2.0.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
 <config>
 	<version>
-		<latest>2.5.2</latest>
+		<latest>2.5.3</latest>
 	</version>
 	<files>
 


[5/5] git commit: Merge branch 'RC4'

Posted by ft...@apache.org.
Merge branch 'RC4'


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8f5c6501
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8f5c6501
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8f5c6501

Branch: refs/heads/master
Commit: 8f5c65014f32ac44142311a8717a0b4fa781fac1
Parents: b72fa52 8a3ac87
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Mar 29 16:46:17 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Mar 29 16:46:17 2013 +0100

----------------------------------------------------------------------
 installer/build.number                             |    4 +-
 installer/build.xml                                |  146 ++++++++-------
 installer/src/InstallApacheFlex-app.xml            |   30 ++--
 .../packageflexsdk/view/components/Tracker.mxml    |   24 ++-
 installer/src/sdk-installer-config-2.0.xml         |    2 +-
 5 files changed, 114 insertions(+), 92 deletions(-)
----------------------------------------------------------------------



[2/5] git commit: Added Apache Header

Posted by ft...@apache.org.
Added Apache Header


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/14afacfa
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/14afacfa
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/14afacfa

Branch: refs/heads/master
Commit: 14afacfa97c75e6bc212750a715ff84b2c166e2a
Parents: b72fa52
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Mar 29 16:40:17 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Mar 29 16:40:17 2013 +0100

----------------------------------------------------------------------
 .../packageflexsdk/view/components/Tracker.mxml    |   24 +++++++++++++--
 1 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/14afacfa/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml
----------------------------------------------------------------------
diff --git a/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml b/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml
index a8abc0e..a3031d3 100644
--- a/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml
+++ b/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
-		 xmlns:s="library://ns.adobe.com/flex/spark" 
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+
+-->
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
+		 xmlns:s="library://ns.adobe.com/flex/spark"
 		 xmlns:mx="library://ns.adobe.com/flex/mx" width="400" height="300">
 	<fx:Script>
 		<![CDATA[
@@ -13,4 +31,4 @@
 		]]>
 	</fx:Script>
 	<mx:HTML id="trackInstallerHTML" width="100%" height="100%" />
-</s:Group>
\ No newline at end of file
+</s:Group>