incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1379630 - in /incubator/flex: site/trunk/content/flex/ utilities/trunk/common/src/org/apache/flex/utilities/common/ utilities/trunk/installer/ utilities/trunk/installer/src/ utilities/trunk/installer/src/org/apache/flex/packageflexsdk/reso...
Date Fri, 31 Aug 2012 21:44:14 GMT
Author: bigosmallm
Date: Fri Aug 31 21:44:14 2012
New Revision: 1379630

URL: http://svn.apache.org/viewvc?rev=1379630&view=rev
Log:
Fixing bugs from RC1 vote comments and bugs. 
Added READme file
Added RELEASE_GUIDE file
Added disclaimer in InstallApacheFlex app
Fixed ant script to include the "common" project in the source distribution

Added:
    incubator/flex/utilities/trunk/installer/RELEASE_GUIDE
Modified:
    incubator/flex/site/trunk/content/flex/sdk-installer-config.xml
    incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
    incubator/flex/utilities/trunk/installer/   (props changed)
    incubator/flex/utilities/trunk/installer/README
    incubator/flex/utilities/trunk/installer/build.number
    incubator/flex/utilities/trunk/installer/build.properties
    incubator/flex/utilities/trunk/installer/build.xml
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
    incubator/flex/utilities/trunk/installer/src/sdk-installer-config.xml

Modified: incubator/flex/site/trunk/content/flex/sdk-installer-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/content/flex/sdk-installer-config.xml?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/sdk-installer-config.xml (original)
+++ incubator/flex/site/trunk/content/flex/sdk-installer-config.xml Fri Aug 31 21:44:14 2012
@@ -30,7 +30,7 @@ limitations under the License.
 			 	- use full URL when binaries are NOT released yet, else use 
 			 	  path relative to mirror
 			 	- if path is relative, don't use starting slash -->
-		<file name="SDKInstallerApp" path="http://people.apache.org/~bigosmallm/installapacheflex_RC1/binaries/"
file="apache-flex-sdk-installer-1.0.0-incubating-bin" />
+		<file name="SDKInstallerApp" path="http://people.apache.org/~bigosmallm/installapacheflex_RC2/binaries/"
file="apache-flex-sdk-installer-1.0.1-incubating-bin" />
 		
 		<!-- Mirror URL CGI -->
 		<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi" />

Modified: incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
(original)
+++ incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
Fri Aug 31 21:44:14 2012
@@ -35,6 +35,8 @@ public class Constants
 	public static const APPLICATION_EXTENSION_WIN:String = ".exe";
 	
 	public static const CONFIG_XML_NAME:String = "sdk-installer-config.xml";
+	public static const DISCLAIMER_PATH:String = "installer-disclaimer.html";
+	
 	
 	public static const SDK_BINARY_FILE_NAME_PREFIX:String = "apache-flex-sdk-";
 	

Propchange: incubator/flex/utilities/trunk/installer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 31 21:44:14 2012
@@ -5,3 +5,4 @@ certificate.p12
 libs
 rat.report
 release
+rc1

Modified: incubator/flex/utilities/trunk/installer/README
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/README?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/README (original)
+++ incubator/flex/utilities/trunk/installer/README Fri Aug 31 21:44:14 2012
@@ -1,62 +1,37 @@
 Apache Flex
 Copyright 2012 The Apache Software Foundation
 
+Overview:
+
+- The InstallApacheFlex AIR application is intended to provide an easy, single-click installation
of the Apache Flex SDK and all its dependencies.  
+- This will make it suitable for working with IDEs such as Flash Builder, FDT, IntelliJ,
FlashDevelop, etc.  
+	The downloaded dependencies include:
+	 - The AIR sdk (Windows vs. Mac) based on the current platform
+	 - FlashPlayerGlobal.swc
+	 - SwfObject
+	 - OSMF
+	 - TLF
+	 
+	Optionally, the application would download these files if the user explicitly agrees:
+	 - BlazeDS
+	 - FontSWF utility
+ 
+	All the file names and urls of the downloaded files are available in installer/src/sdk-installer-config.xml.

+	When the dependencies file names or urls change in future, update the sdk-installer-config.xml
to ensure that the application works correctly.  
+
+- The application uses http://incubator.apache.org/flex/single-mirror-url.cgi to determine
the preferred mirror url to download Apache Flex SDK binary from.
+- Once the Apache Flex SDK binary file is downloaded, a MD5 has is generated from it.  This
hash is compared with the hash from the Apache Flex SDK release site.  
+	If they match, we verify that the downloaded binary file is a valid Apache release and proceed
to unzip the file.  
+- The AIR SDK will downloaded and the relevant files are copied to the required locations
+- The Flash player global swc files and the config files are placed in the required locations
+- Then the rest of the external dependencies and the optional files (if selected by user)
are downloaded and copied into the appropriate locations.  
+
 Prerequisites and dependencies:
 
-1.  This project also needs the project 'common' that is available here: https://svn.apache.org/repos/asf/incubator/flex/utilities/trunk/common
+1.  This project also needs the project 'common' that is in the source distribution.  Make
sure that the 'common' project lives in the same directory as the 'installer' project is.
 
+Just unzipping the source distribution would normally take care of this.  
 
 2.  Run: ant get-as3commons.swc
 This step downloads the required libraries and saves it in the libs directory
 
-3.  In Flash Builder, add a linked resource called: APACHE_FLEX_UTILITIES_ROOT and point
it to the directory path where the projects: 'installer' and 'common' are located.  
-
-Steps to follow in preparation for a release of InstallApacheFlex
-
-1.    Check out the code from https://svn.apache.org/repos/asf/incubator/flex/utilities/trunk
-
-2.a.  If it is a major release, 
-		- bump up the "release.version" property in the build.properties file 
-		- reset the build.number property in the build.number file to 0
-
-2.b.  If it is a minor release, run: ant update-version
-
-3.  Open build.properties and update the following:
-	- Modify the KEYSTORE_DIR and CERT_PASSWORD_DIR variables with the correct directory paths
-	(You need to obtain theinstallapacheflex_self.p12 file and its password from the previous
release manager for InstallApacheFlex)
-	
-4.  Run: 
-ant build
-
-This step 
-	- downloads all the necessary files, 
-	- updates the version numbers in InstallApacheFlex-app.xml and sdk-installer-config.xml
-	- creates the .exe or .dmg file depending on the OS you are working on
-	
-5.  Run: 
-ant source-package
-
-This step creates the source release files as a .zip file and a tar.gz file 
-
-
-6.  Run:
-
-cd release
-
-gpg --armor --output apache-flex-sdk-installer-1.0.0-incubating-bin.exe.asc --detach-sig
apache-flex-sdk-installer-1.0.0-incubating-bin.exe
-gpg --armor --output apache-flex-sdk-installer-1.0.0-incubating-src.tar.gz.asc --detach-sig
apache-flex-sdk-installer-1.0.0-incubating-src.tar.gz
-gpg --armor --output apache-flex-sdk-installer-1.0.0-incubating-src.zip.asc --detach-sig
apache-flex-sdk-installer-1.0.0-incubating-src.zip
-
-This step creates the release artifacts InstallApacheFlex.exe.asc, apache-flex-sdk-installer-1.0.0-incubating-src.tar.gz.asc
and apache-flex-sdk-installer-1.0.0-incubating-src.zip.asc
-
-7.  Run:
-gpg --print-md MD5 apache-flex-sdk-installer-1.0.0-incubating-bin.exe > apache-flex-sdk-installer-1.0.0-incubating-bin.exe.md5
-gpg --print-md MD5 apache-flex-sdk-installer-1.0.0-incubating-src.tar.gz > apache-flex-sdk-installer-1.0.0-incubating-src.tar.gz.md5
-gpg --print-md MD5 apache-flex-sdk-installer-1.0.0-incubating-src.zip > apache-flex-sdk-installer-1.0.0-incubating-src.zip.md5
-
-8. In the /installer directory, run:
-ant rat-report
-
-This step creates the rat.report file.  Inspect the report to make sure there are no violations.
 
-
-9. 
-Upload all the files under the /release directory to the release manager's personal space
at people.apache.org.
\ No newline at end of file
+3.  In Flash Builder, add a linked resource called: APACHE_FLEX_UTILITIES_ROOT and point
it to the directory path where the projects: 'installer' and 'common' are located.  
\ No newline at end of file

Added: incubator/flex/utilities/trunk/installer/RELEASE_GUIDE
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/RELEASE_GUIDE?rev=1379630&view=auto
==============================================================================
--- incubator/flex/utilities/trunk/installer/RELEASE_GUIDE (added)
+++ incubator/flex/utilities/trunk/installer/RELEASE_GUIDE Fri Aug 31 21:44:14 2012
@@ -0,0 +1,53 @@
+Apache Flex
+Copyright 2012 The Apache Software Foundation
+
+Steps to follow in preparation for a release of InstallApacheFlex
+
+1.    Check out the code from https://svn.apache.org/repos/asf/incubator/flex/utilities/trunk
+
+2.a.  If it is a major release, 
+		- bump up the "release.version" property in the build.properties file 
+		- reset the build.number property in the build.number file to 0
+
+2.b.  If it is a minor release, run: ant update-version
+
+3.  Open build.properties and update the following:
+	- Modify the KEYSTORE_DIR and CERT_PASSWORD_DIR variables with the correct directory paths
+	(You need to obtain theinstallapacheflex_self.p12 file and its password from the previous
release manager for InstallApacheFlex)
+	
+4.  Run: 
+ant build
+
+This step 
+	- downloads all the necessary files, 
+	- updates the version numbers in InstallApacheFlex-app.xml and sdk-installer-config.xml
+	- creates the .exe or .dmg file depending on the OS you are working on
+	
+5.  Run: 
+ant source-package
+
+This step creates the source release files as a .zip file and a tar.gz file 
+
+
+6.  Run:
+
+cd release
+
+gpg --armor --output apache-flex-sdk-installer-1.0.1-incubating-bin.exe.asc --detach-sig
apache-flex-sdk-installer-1.0.1-incubating-bin.exe
+gpg --armor --output apache-flex-sdk-installer-1.0.1-incubating-src.tar.gz.asc --detach-sig
apache-flex-sdk-installer-1.0.1-incubating-src.tar.gz
+gpg --armor --output apache-flex-sdk-installer-1.0.1-incubating-src.zip.asc --detach-sig
apache-flex-sdk-installer-1.0.1-incubating-src.zip
+
+This step creates the release artifacts InstallApacheFlex.exe.asc, apache-flex-sdk-installer-1.0.1-incubating-src.tar.gz.asc
and apache-flex-sdk-installer-1.0.0-incubating-src.zip.asc
+
+7.  Run:
+gpg --print-md MD5 apache-flex-sdk-installer-1.0.1-incubating-bin.exe > apache-flex-sdk-installer-1.0.1-incubating-bin.exe.md5
+gpg --print-md MD5 apache-flex-sdk-installer-1.0.1-incubating-src.tar.gz > apache-flex-sdk-installer-1.0.1-incubating-src.tar.gz.md5
+gpg --print-md MD5 apache-flex-sdk-installer-1.0.1-incubating-src.zip > apache-flex-sdk-installer-1.0.1-incubating-src.zip.md5
+
+8. In the /installer directory, run:
+ant rat-report
+
+This step creates the rat.report file.  Inspect the report to make sure there are no violations.
 
+
+9. 
+Upload all the files under the /release directory to the release manager's personal space
at people.apache.org.
\ No newline at end of file

Modified: incubator/flex/utilities/trunk/installer/build.number
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.number?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.number (original)
+++ incubator/flex/utilities/trunk/installer/build.number Fri Aug 31 21:44:14 2012
@@ -1,5 +1,5 @@
 #Copyright 2012 The Apache Software Foundation.
-#Thu, 30 Aug 2012 02:40:30 -0700
+#Fri, 31 Aug 2012 13:45:25 -0700
 #Build Number for ANT. Do not edit!
 #Sat Aug 11 23:37:41 PDT 2012
-build.number=0
+build.number=1

Modified: incubator/flex/utilities/trunk/installer/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.properties?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.properties (original)
+++ incubator/flex/utilities/trunk/installer/build.properties Fri Aug 31 21:44:14 2012
@@ -21,10 +21,6 @@
 #nano version number is added by build script
 release.version=1.0
 
-#The URLs for the IDE Installer Apps
-installer.url.win=http://people.apache.org/~bigosmallm/installapacheflex/InstallApacheFlex.exe
-installer.url.mac=http://people.apache.org/~bigosmallm/installapacheflex/InstallApacheFlex.dmg
-
 #Flex Locations
 //FLEX_HOME=../ApacheFlex
 FLEX_HOME_WIN=C:/Program Files (x86)/Adobe/Adobe Flash Builder 4.6/sdks/ApacheFlex4.8.0
@@ -44,7 +40,10 @@ ASSETS_DIR=${basedir}/src/assets
 LIBRARY_DIR=${basedir}/libs
 RELEASE_DIR=${basedir}/release
 BUILD_DIR=${basedir}/build
-COMMON_SOURCE_DIR=${basedir}/../common/src
+INSTALLER_PROJECT_NAME=installer
+COMMON_PROJECT_NAME=common
+COMMON_PROJECT_DIR=${basedir}/../${COMMON_PROJECT_NAME}
+COMMON_SOURCE_DIR=${COMMON_PROJECT_DIR}/src
 
 #Etc Settings
 DEBUG_FLAG=false

Modified: incubator/flex/utilities/trunk/installer/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.xml?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.xml (original)
+++ incubator/flex/utilities/trunk/installer/build.xml Fri Aug 31 21:44:14 2012
@@ -280,16 +280,34 @@
     -->
     <target name="source-package" description="Package source files.">
         <mkdir dir="${BUILD_DIR}/temp"/>
-        <copy todir="${BUILD_DIR}/temp" includeEmptyDirs="false">
-            <fileset dir="${basedir}">
+        <copy todir="${BUILD_DIR}/temp/${COMMON_PROJECT_NAME}" includeEmptyDirs="false">
+			<fileset dir="${COMMON_PROJECT_DIR}">
                 <exclude name="certificate.p12"/>
                 <exclude name="rat.report"/>
                 <exclude name="libs/**"/>
+				<exclude name="bin/**"/>
 				<exclude name="bin-debug/**"/>
                 <exclude name="release/**"/>
+				<exclude name=".settings/**"/>
             </fileset>
         </copy>
-        
+		
+		<copy todir="${BUILD_DIR}/temp/${INSTALLER_PROJECT_NAME}" includeEmptyDirs="false">
+			<fileset dir="${basedir}">
+                <exclude name="certificate.p12"/>
+                <exclude name="rat.report"/>
+                <exclude name="libs/**"/>
+				<exclude name="bin/**"/>
+				<exclude name="bin-debug/**"/>
+				<exclude name="build/**"/>
+                <exclude name="release/**"/>
+				<exclude name="rc1/**"/>
+				<exclude name=".settings/**"/>
+			</fileset>
+        </copy>
+		
+		<copy file="${basedir}/READme" todir="${RELEASE_DIR}"/>
+		
         <fixcrlf srcdir="${BUILD_DIR}/temp" eol="crlf"/>
 
         <mkdir dir="${RELEASE_DIR}"/>
@@ -303,6 +321,7 @@
             basedir="${BUILD_DIR}/temp"/>
         
         <delete dir="${BUILD_DIR}/temp"/>
+		<delete dir="${BUILD_DIR}"/>
     </target>
 
     <!-- 

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml Fri Aug 31 21:44:14
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>1.0.0</versionNumber>
+	<versionNumber>1.0.1</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/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Fri Aug 31 21:44:14
2012
@@ -1798,6 +1798,14 @@ variables are not required because the l
 			return result;
 		}
 		
+		protected function showDisclaimer():void
+		{
+			var request:URLRequest = new URLRequest(
+				Constants.APACHE_FLEX_URL + Constants.DISCLAIMER_PATH);
+			
+			navigateToURL(request, "_blank");
+		}
+		
 	]]></fx:Script>
 	
 	<fx:Declarations>
@@ -1848,6 +1856,10 @@ variables are not required because the l
 		paddingRight="20" 
 		paddingTop="5" 
 		horizontalAlign="right">
+		<s:Button 
+			label="{_viewResourceConstants.BTN_DISCLAIMER}"
+			click="{showDisclaimer()}"
+			/>
 		<s:Spacer width="100%" />
 		<s:Label id="langLabel" 
 				 horizontalCenter="0" 

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Fri Aug 31 21:44:14 2012
@@ -303,6 +303,7 @@ public class RuntimeLocale
 		content["BTN_LABEL_INSTALL_LOG"]="INSTALL LOG";
 		content["BTN_LABEL_MPL_LICENSE"]="SHOW MPL LICENSE";
 		content["BTN_LABEL_NEXT"]="NEXT";
+		content["BTN_DISCLAIMER"]="Disclaimer";
 		content["BTN_LABEL_OPEN_APACHE_FLEX_FOLDER"]="OPEN APACHE FLEX FOLDER";
 		content["ERROR_CONFIG_XML_LOAD"]="Error while trying to load XML configuration file: ";
 		content["ERROR_DIR_NOT_EMPTY"]="The selected directory is not empty";

Modified: incubator/flex/utilities/trunk/installer/src/sdk-installer-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/sdk-installer-config.xml?rev=1379630&r1=1379629&r2=1379630&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/sdk-installer-config.xml (original)
+++ incubator/flex/utilities/trunk/installer/src/sdk-installer-config.xml Fri Aug 31 21:44:14
2012
@@ -21,7 +21,7 @@ limitations under the License.
 
 <config>
 	<version>
-		<latest>1.0.0</latest>
+		<latest>1.0.1</latest>
 	</version>
 	<files>
 	
@@ -30,7 +30,7 @@ limitations under the License.
 			 	- use full URL when binaries are NOT released yet, else use 
 			 	  path relative to mirror
 			 	- if path is relative, don't use starting slash -->
-		<file name="SDKInstallerApp" path="http://people.apache.org/~bigosmallm/installapacheflex_RC1/binaries/"
file="apache-flex-sdk-installer-1.0.0-incubating-bin" />
+		<file name="SDKInstallerApp" path="http://people.apache.org/~bigosmallm/installapacheflex_RC2/binaries/"
file="apache-flex-sdk-installer-1.0.1-incubating-bin" />
 		
 		<!-- Mirror URL CGI -->
 		<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi" />



Mime
View raw message