Author: bigosmallm
Date: Sun Jan 6 09:04:13 2013
New Revision: 1429480
URL: http://svn.apache.org/viewvc?rev=1429480&view=rev
Log:
Prepping for RC3 - updated build.number,
installer/src/InstallApacheFlex-app.xml, etc.
Removed references to incubator in files
Updated config xml to point to correct RC3 url
Updated config xml to remove reference to incubator
Fixed build.xml so that artifacts are signed by the ant release command itself
Fixed RELEASE_GUIDE to update the release steps
Modified:
flex/site/trunk/content/sdk-installer-config-2.0.xml
flex/utilities/trunk/installer/README
flex/utilities/trunk/installer/RELEASE_GUIDE
flex/utilities/trunk/installer/build.number
flex/utilities/trunk/installer/build.xml
flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml
flex/utilities/trunk/installer/src/sdk-installer-config-2.0.xml
flex/utilities/trunk/installerBadge/README
Modified: flex/site/trunk/content/sdk-installer-config-2.0.xml
URL:
http://svn.apache.org/viewvc/flex/site/trunk/content/sdk-installer-config-2.0.xml?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/site/trunk/content/sdk-installer-config-2.0.xml (original)
+++ flex/site/trunk/content/sdk-installer-config-2.0.xml Sun Jan 6 09:04:13
2013
@@ -21,7 +21,7 @@ limitations under the License.
<config>
<version>
- <latest>2.0.1</latest>
+ <latest>2.0.2</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="https://people.apache.org/~bigosmallm/installapacheflex_2.0_RC2/binaries/";
file="apache-flex-sdk-installer-2.0.1-bin" />
+ <file name="SDKInstallerApp"
path="https://dist.apache.org/repos/dist/dev/flex/installer/2.0/rc3/binaries/";
file="apache-flex-sdk-installer-2.0.2-bin" />
<!-- Mirror URL CGI -->
<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi"
/>
@@ -40,7 +40,7 @@ limitations under the License.
- path is relative to mirror URL
- don't use starting slash
- for the second and later releases, remove the
extension from the file name -->
- <file name="ApacheFlexSDK"
path="incubator/flex/4.9.0/binaries/" file="apache-flex-sdk-4.9.0-bin" />
+ <file name="ApacheFlexSDK" path="flex/4.9.0/binaries/"
file="apache-flex-sdk-4.9.0-bin" />
<!-- Adobe AIR SDK -->
<file name="AdobeAIRSDKWin"
path="http://airdownload.adobe.com/air/win/download/3.4/";
file="AdobeAIRSDK.zip" />
Modified: flex/utilities/trunk/installer/README
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/README?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/README (original)
+++ flex/utilities/trunk/installer/README Sun Jan 6 09:04:13 2013
@@ -21,7 +21,7 @@ limitations under the License.
Overview:
=========
-- The InstallApacheFlex AIR application provides an easy, single-click
installation of the
+- The Apache Flex SDK Installer AIR application provides 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 Adobe Flash Builder, FDT, IntelliJ IDEA, FlashDevelop, etc.
The application downloads the following dependencies:
@@ -40,7 +40,7 @@ Overview:
When the dependencies file names or urls change in future, update the
sdk-installer-config-2.0.xml to ensure that the application works
correctly.
-- The application uses http://incubator.apache.org/flex/single-mirror-url.cgi
to determine
+- The application uses http://flex.apache.org/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 hash is generated
for it.
@@ -59,7 +59,7 @@ Overview:
- From the 2.0 version, by default, Apache Flex SDK Installer 2.0 downloads
Adobe Flash Player 11.1
and Adobe AIR SDK 3.4. If you want to change it to any other supported
combination, you save
- a copy of the config file found at:
http://incubator.apache.org/flex/sdk-installer-config-2.0.xml,
+ a copy of the config file found at:
http://flex.apache.org/sdk-installer-config-2.0.xml,
modify the download urls to point to the required versions. Then run
the app from command line
mode with the optional command line parameter: -config=<path to config
file>
Modified: flex/utilities/trunk/installer/RELEASE_GUIDE
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/RELEASE_GUIDE?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/RELEASE_GUIDE (original)
+++ flex/utilities/trunk/installer/RELEASE_GUIDE Sun Jan 6 09:04:13 2013
@@ -19,7 +19,7 @@ limitations under the License.
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
+1. Check out the code from
https://svn.apache.org/repos/asf/flex/utilities/trunk
2.a. If it is a major release,
- bump up the "release.version" property in the
build.properties file
@@ -36,34 +36,13 @@ Steps to follow in preparation for a rel
If you do so the certificate files will be packaged into the source
release. That would be very bad.
4. Run:
-ant release
+ ant release
This step
- downloads all the necessary files,
- updates the version numbers in InstallApacheFlex-app.xml and
sdk-installer-config-2.0.xml
- creates the .exe or .dmg file depending on the OS you are working on
- creates the source release files as a .zip file and a tar.gz file
+ - signs the artifacts to create corresponding .asc and .md5 files
(assumes that you have a pgp id and keypair set up and prompts for the
passphrase)
-5. Run:
-
-cd release
-
-gpg --armor --output apache-flex-sdk-installer-2.0.1-bin.exe.asc --detach-sig
apache-flex-sdk-installer-2.0.1-bin.exe (on Windows)
-gpg --armor --output apache-flex-sdk-installer-2.0.1-bin.dmg.asc --detach-sig
apache-flex-sdk-installer-2.0.1-bin.dmg (on Mac)
-gpg --armor --output apache-flex-sdk-installer-2.0.1-src.tar.gz.asc
--detach-sig apache-flex-sdk-installer-2.0.1-src.tar.gz
-gpg --armor --output apache-flex-sdk-installer-2.0.1-src.zip.asc --detach-sig
apache-flex-sdk-installer-2.0.1-src.zip
-
-This step creates the release artifacts InstallApacheFlex.exe.asc,
apache-flex-sdk-installer-2.0.1-src.tar.gz.asc and
apache-flex-sdk-installer-2.0.1-src.zip.asc
-
-6. Run:
-gpg --print-md MD5 apache-flex-sdk-installer-2.0.1-bin.exe >
apache-flex-sdk-installer-2.0.1-bin.exe.md5 (On Windows)
-gpg --print-md MD5 apache-flex-sdk-installer-2.0.1-bin.dmg >
apache-flex-sdk-installer-2.0.1-bin.dmg.md5 (On Mac)
-gpg --print-md MD5 apache-flex-sdk-installer-2.0.1-src.tar.gz >
apache-flex-sdk-installer-2.0.1-src.tar.gz.md5
-gpg --print-md MD5 apache-flex-sdk-installer-2.0.1-src.zip >
apache-flex-sdk-installer-2.0.1-src.zip.md5
-
-7. 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.
-
-8. Upload all the files under the /release directory to the release manager's
personal space at people.apache.org before calling a VOTE.
\ No newline at end of file
+5. Upload all the files under the /release directory to the
https://dist.apache.org/repos/dist/dev/flex/installer/{version}/{RCversion}/
before calling a VOTE.
\ No newline at end of file
Modified: flex/utilities/trunk/installer/build.number
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/build.number?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/build.number (original)
+++ flex/utilities/trunk/installer/build.number Sun Jan 6 09:04:13 2013
@@ -1,6 +1,6 @@
#Copyright 2013 The Apache Software Foundation.
-#Thu, 03 Jan 2013 15:19:17 -0800
+#Sat, 05 Jan 2013 22:09:49 -0800
#Copyright 2012 The Apache Software Foundation.
#Mon, 05 Nov 2012 11:23:11 -0800
#Mon Oct 22 09:24:43 CEST 2012
-build.number=1
+build.number=2
Modified: flex/utilities/trunk/installer/build.xml
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/build.xml?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/build.xml (original)
+++ flex/utilities/trunk/installer/build.xml Sun Jan 6 09:04:13 2013
@@ -126,10 +126,10 @@
</condition>
<property name="extension" value="dmg"/>
- <target name="build"
depends="init,certificate,compile,packagenative,copy-config,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"
+ <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"
@@ -310,8 +310,8 @@
</java>
</target>
- <target name="copy-config" description="Copy config files to release
directory">
- <copy file="${SOURCE_DIR}/${APP_CONFIG_XML_NAME}.xml"
todir="${RELEASE_DIR}"/>
+ <target name="copy-misc" description="Copy config files to release
directory">
+ <copy file="${basedir}/README" tofile="${RELEASE_DIR}/READme"/>
</target>
<!--
@@ -477,5 +477,50 @@
<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>
+
+ <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" />
+ <arg value="${RELEASE_DIR}/${source.kit}.zip.asc" />
+ <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" />
+ <arg value="${RELEASE_DIR}/${source.kit}.tar.gz.asc" />
+ <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" />
+ <arg
value="${RELEASE_DIR}/${binary.kit}.${extension}.asc" />
+ <arg value="--detach-sig" />
+ <arg value="${RELEASE_DIR}/${binary.kit}.${extension}"
/>
+ </exec>
+ </target>
+
</project>
Modified: flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml (original)
+++ flex/utilities/trunk/installer/src/InstallApacheFlex-app.xml Sun Jan 6
09:04:13 2013
@@ -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>2.0.1</versionNumber>
+ <versionNumber>2.0.2</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: flex/utilities/trunk/installer/src/sdk-installer-config-2.0.xml
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/src/sdk-installer-config-2.0.xml?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installer/src/sdk-installer-config-2.0.xml (original)
+++ flex/utilities/trunk/installer/src/sdk-installer-config-2.0.xml Sun Jan 6
09:04:13 2013
@@ -21,7 +21,7 @@ limitations under the License.
<config>
<version>
- <latest>2.0.1</latest>
+ <latest>2.0.2</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="https://people.apache.org/~bigosmallm/installapacheflex_2.0_RC2/binaries/";
file="apache-flex-sdk-installer-2.0.1-bin" />
+ <file name="SDKInstallerApp"
path="https://dist.apache.org/repos/dist/dev/flex/installer/2.0/rc3/binaries/";
file="apache-flex-sdk-installer-2.0.2-bin" />
<!-- Mirror URL CGI -->
<file name="MirrorURLCGI" path="" file="single-mirror-url.cgi"
/>
@@ -40,7 +40,7 @@ limitations under the License.
- path is relative to mirror URL
- don't use starting slash
- for the second and later releases, remove the
extension from the file name -->
- <file name="ApacheFlexSDK"
path="incubator/flex/4.9.0/binaries/" file="apache-flex-sdk-4.9.0-bin" />
+ <file name="ApacheFlexSDK" path="flex/4.9.0/binaries/"
file="apache-flex-sdk-4.9.0-bin" />
<!-- Adobe AIR SDK -->
<file name="AdobeAIRSDKWin"
path="http://airdownload.adobe.com/air/win/download/3.4/";
file="AdobeAIRSDK.zip" />
Modified: flex/utilities/trunk/installerBadge/README
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installerBadge/README?rev=1429480&r1=1429479&r2=1429480&view=diff
==============================================================================
--- flex/utilities/trunk/installerBadge/README (original)
+++ flex/utilities/trunk/installerBadge/README Sun Jan 6 09:04:13 2013
@@ -1,7 +1,7 @@
The code implements functionality to be viewed through an iframe on another
domain. Please use one of these to embed the badge on your site or
communications:
Regular size (302 x 302)
-<iframe name="afSDKInstallBadgeRegular"
src="http://incubator.apache.org/flex/installerbadge/index.html";
frameborder="0" height="302" marginheight="0" marginwidth="0" scrolling="no"
width="302"></iframe>
+<iframe name="afSDKInstallBadgeRegular"
src="http://flex.apache.org/installerbadge/index.html"; frameborder="0"
height="302" marginheight="0" marginwidth="0" scrolling="no"
width="302"></iframe>
Small size (402 x 84)
-<iframe name="afSDKInstallBadgeSmall"
src="http://incubator.apache.org/flex/installerbadge/index.html";
frameborder="0" height="84" marginheight="0" marginwidth="0" scrolling="no"
width="402"></iframe>
\ No newline at end of file
+<iframe name="afSDKInstallBadgeSmall"
src="http://flex.apache.org/installerbadge/index.html"; frameborder="0"
height="84" marginheight="0" marginwidth="0" scrolling="no"
width="402"></iframe>
\ No newline at end of file
