incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1365698 - in /incubator/flex/utilities/InstallApacheFlex: build.number build.xml src/InstallApacheFlex-app.xml src/InstallApacheFlex.mxml
Date Wed, 25 Jul 2012 19:08:36 GMT
Author: cframpton
Date: Wed Jul 25 19:08:35 2012
New Revision: 1365698

URL: http://svn.apache.org/viewvc?rev=1365698&view=rev
Log:
Log the installer version number and os in the log file.  Fix build file so version number
in -app.xml is updated correctly - if build.number is loaded at the top of the file, and <buildnumber>
is called to increment the build number, build.number is still the old value because properties
are immutable.

Modified:
    incubator/flex/utilities/InstallApacheFlex/build.number
    incubator/flex/utilities/InstallApacheFlex/build.xml
    incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex-app.xml
    incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml

Modified: incubator/flex/utilities/InstallApacheFlex/build.number
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.number?rev=1365698&r1=1365697&r2=1365698&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.number (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.number Wed Jul 25 19:08:35 2012
@@ -1,3 +1,3 @@
-#Build Number for ANT. Do not edit!
-#Mon Jul 23 02:10:34 PDT 2012
-build.number=8
+#Build Number for ANT. Do not edit!
+#Wed Jul 25 15:03:32 EDT 2012
+build.number=9

Modified: incubator/flex/utilities/InstallApacheFlex/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/build.xml?rev=1365698&r1=1365697&r2=1365698&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/build.xml (original)
+++ incubator/flex/utilities/InstallApacheFlex/build.xml Wed Jul 25 19:08:35 2012
@@ -69,7 +69,7 @@
     <target name="build" depends="init,compile,packagenative,cleanup" 
         description="Compiles and packages application"/>
     
-    <target name="init" depends="clean,createDirs,create-version-xml" 
+    <target name="init" depends="clean,createDirs,update-app-xml,create-version-xml" 
         description="Creates the deploy folders and sets app extension"/>
         
     <target name="clean" description="Cleans up old files.">
@@ -92,6 +92,18 @@
         <mkdir dir="${RELEASE_DIR}"/>
     </target>
 
+    <!-- Make sure version, esp, build.number, in APP_NAME-app.xml is in sync.  -->
+    <target name="update-app-xml" description="Update version in APP_NAME-app.xml.">
+        <echo message="version in ${APP_NAME}-app.xml will be ${release.version}.${build.number}"/>
+        <replaceregexp byline="true">
+            <regexp pattern="&lt;versionNumber&gt;(\d+\.)?(\d+\.)?(\d+)&lt;/versionNumber&gt;"/>
+            <substitution expression="&lt;versionNumber&gt;${release.version}.${build.number}&lt;/versionNumber&gt;"/>
+            <fileset dir="${SOURCE_DIR}">
+                <include name="${APP_NAME}-app.xml"/>
+            </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 
@@ -99,15 +111,8 @@
         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 it will
be updated.">
+    <target name="update-version" description="Update the app version number so the installer
will be updated.">
         <buildnumber/>
-        <replaceregexp byline="true">
-            <regexp pattern="&lt;versionNumber&gt;([0-9\.]+)&lt;/versionNumber&gt;"/>
-            <substitution expression="&lt;versionNumber&gt;${release.version}.${build.number}&lt;/versionNumber&gt;"/>
-            <fileset dir="${SOURCE_DIR}">
-                <include name="${APP_NAME}-app.xml"/>
-            </fileset>
-        </replaceregexp>
     </target>
     
     <target name="packagenative" depends="certificate,packageair"
@@ -147,6 +152,8 @@
             <source-path path-element="${SOURCE_DIR}"/>
             <external-library-path file="${FLEX_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}"/> 
         </mxmlc>
     </target>
 
@@ -199,7 +206,7 @@
     </target>
     
     <target name="create-version-xml" description="Creates version.xml file for update">
-        <echo message="version is ${release.version}.${build.number}"/>
+        <echo message="version in version.xml will be ${release.version}.${build.number}"/>
         <echo file="${RELEASE_DIR}/version.xml">&lt;?xml version="1.0"?&gt;
 &lt;!--
 

Modified: incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex-app.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex-app.xml?rev=1365698&r1=1365697&r2=1365698&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex-app.xml (original)
+++ incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex-app.xml Wed Jul 25 19:08:35
2012
@@ -45,7 +45,7 @@
 	<!-- 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>0.7.8</versionNumber>
+	<versionNumber>0.7.9</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> -->

Modified: incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml?rev=1365698&r1=1365697&r2=1365698&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml Wed Jul 25 19:08:35
2012
@@ -73,6 +73,12 @@ variables are not required because the l
 			import ws.tink.spark.controls.StepItem;
 			
 			/**
+			 * Installer version number for the log file.  
+			 */			
+			private static const INSTALLER_VERSION:String = String(INSTALLER::releaseVersion);
+			private static const INSTALLER_BUILD_NUMBER:String = String(INSTALLER::buildNumber);
+			
+			/**
 			 * The url that stores the current version number of the InstallApacheFlex.{exe|dmg} 

 			 */
 			private var VERSION_URL:String;
@@ -319,6 +325,9 @@ variables are not required because the l
 			
 			protected function main():void
 			{
+			    // Log the Installer version to help with any support issues that arise.
+			    log("Version" + " " + 
+			        INSTALLER_VERSION + "." + INSTALLER_BUILD_NUMBER + " (" + _os + ")");
 				checkVersion();
 				initiateInstallStepsActivity();
 				initializeOptionInstallsDataProvider();



Mime
View raw message