You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/08/08 08:44:10 UTC
[1/3] git commit: [flex-utilities] [refs/heads/develop] - these also
change when version is updated. Don't change sdk-installer-config-4.0.xml on
website until release is approved
Repository: flex-utilities
Updated Branches:
refs/heads/develop ff2b4c3a4 -> d0becb1f2
these also change when version is updated. Don't change sdk-installer-config-4.0.xml on website until release is approved
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/845126a6
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/845126a6
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/845126a6
Branch: refs/heads/develop
Commit: 845126a64a762893f2c36a4e37a11414bcc4c5f2
Parents: ff2b4c3
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 7 13:13:58 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 7 23:39:47 2014 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex-app.xml | 2 +-
installer/src/installer/sdk-installer-config-4.0.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/845126a6/installer/src/InstallApacheFlex-app.xml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex-app.xml b/installer/src/InstallApacheFlex-app.xml
old mode 100644
new mode 100755
index 4ce3b1f..79ff410
--- a/installer/src/InstallApacheFlex-app.xml
+++ b/installer/src/InstallApacheFlex-app.xml
@@ -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>3.1.0</versionNumber>
+ <versionNumber>3.2.0</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> -->
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/845126a6/installer/src/installer/sdk-installer-config-4.0.xml
----------------------------------------------------------------------
diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml
old mode 100644
new mode 100755
index 3e0c3e5..6a61056
--- a/installer/src/installer/sdk-installer-config-4.0.xml
+++ b/installer/src/installer/sdk-installer-config-4.0.xml
@@ -28,7 +28,7 @@ limitations under the License.
-->
<config>
<version>
- <latest>3.1.0</latest>
+ <latest>3.2.0</latest>
</version>
<languages>
<locale1 id="de_DE" name="Deutsch" path="http://flex.apache.org/installer/properties/de_DE.properties"/>
[3/3] git commit: [flex-utilities] [refs/heads/develop] - fix typos
Posted by ah...@apache.org.
fix typos
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d0becb1f
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d0becb1f
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d0becb1f
Branch: refs/heads/develop
Commit: d0becb1f26c2cad19de5f73310899b127f937261
Parents: f37a23d
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 7 23:44:09 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 7 23:44:09 2014 -0700
----------------------------------------------------------------------
TourDeFlex/LICENSE | 2 +-
TourDeFlex/TourDeFlex3/RELEASE_NOTES | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d0becb1f/TourDeFlex/LICENSE
----------------------------------------------------------------------
diff --git a/TourDeFlex/LICENSE b/TourDeFlex/LICENSE
index 9481cc2..8a9ede5 100644
--- a/TourDeFlex/LICENSE
+++ b/TourDeFlex/LICENSE
@@ -212,7 +212,7 @@ The Open-Sans font is available under Apache License 2.0. For details
see TourDeFlex3/src/effects/assets.
The ping sound effect (ping.mp3) in TourDeFlex3/src/effects/assets is licensed
-under Creative Commons 3.0. The orignal file can be found here:
+under Creative Commons 3.0. The original file can be found here:
http://www.freesound.org/people/cameronmusic/sounds/138420/
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d0becb1f/TourDeFlex/TourDeFlex3/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/RELEASE_NOTES b/TourDeFlex/TourDeFlex3/RELEASE_NOTES
index 58f77f6..d226039 100644
--- a/TourDeFlex/TourDeFlex3/RELEASE_NOTES
+++ b/TourDeFlex/TourDeFlex3/RELEASE_NOTES
@@ -21,4 +21,4 @@ limitations under the License.
Apache Flex Tour De Flex Component Explorer 1.0
------------------------------------------------
-Inital parity release for Adobe's Tour De Flex Component Explorer.
\ No newline at end of file
+Initial parity release for Adobe's Tour De Flex Component Explorer.
\ No newline at end of file
[2/3] git commit: [flex-utilities] [refs/heads/develop] - allow
platform override of variables
Posted by ah...@apache.org.
allow platform override of variables
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f37a23d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f37a23d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f37a23d4
Branch: refs/heads/develop
Commit: f37a23d4d3f41eac5de16f7e9fa29816f896c7f2
Parents: 845126a
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 7 13:15:02 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 7 23:39:48 2014 -0700
----------------------------------------------------------------------
installer/build.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f37a23d4/installer/build.xml
----------------------------------------------------------------------
diff --git a/installer/build.xml b/installer/build.xml
index 3c9aec1..6d76076 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -25,6 +25,39 @@
<!--location of property file -->
<property file="${basedir}/local.properties" />
+ <condition property="CERT_PASSWORD_FILE" value="${CERT_PASSWORD_FILE_WIN}" >
+ <and>
+ <not>
+ <available file="${CERT_PASSWORD_FILE}" />
+ </not>
+ <available file="${CERT_PASSWORD_FILE_WIN}" />
+ </and>
+ </condition>
+ <condition property="CERT_PASSWORD_FILE" value="${CERT_PASSWORD_FILE_MAC}" >
+ <and>
+ <not>
+ <available file="${CERT_PASSWORD_FILE}" />
+ </not>
+ <available file="${CERT_PASSWORD_FILE_MAC}" />
+ </and>
+ </condition>
+ <condition property="RELEASE_KEYSTORE_FILE" value="${RELEASE_KEYSTORE_FILE_WIN}" >
+ <and>
+ <not>
+ <available file="${RELEASE_KEYSTORE_FILE}" />
+ </not>
+ <available file="${RELEASE_KEYSTORE_FILE_WIN}" />
+ </and>
+ </condition>
+ <condition property="RELEASE_KEYSTORE_FILE" value="${RELEASE_KEYSTORE_FILE_MAC}" >
+ <and>
+ <not>
+ <available file="${RELEASE_KEYSTORE_FILE}" />
+ </not>
+ <available file="${RELEASE_KEYSTORE_FILE_MAC}" />
+ </and>
+ </condition>
+
<property file="${basedir}/build.properties" description="Properties for Apache Flex SDK Installer project" />
<property file="${basedir}/build.number"/>
<property file="${CERT_PASSWORD_FILE}"/>
@@ -93,7 +126,7 @@
<condition property="AIR_HOME" value="${AIR_HOME_LINUX}">
<os family="unix"/>
</condition>
-
+
<condition property="cert_pwd_not_found" >
<not>
<available file="${CERT_PASSWORD_FILE}"/>
@@ -566,6 +599,18 @@
</exec>
</target>
+ <target name="sign_dmg" description="sign dmg when on win" >
+ <checksum file="${RELEASE_DIR}/${binary.kit}.dmg" algorithm="md5" forceOverwrite="yes" />
+
+ <exec executable="gpg">
+ <arg value="--armor" />
+ <arg value="--output" />
+ <arg value="${RELEASE_DIR}/${binary.kit}.dmg.asc" />
+ <arg value="--detach-sig" />
+ <arg value="${RELEASE_DIR}/${binary.kit}.dmg" />
+ </exec>
+ </target>
+
<target name="debug" >
<copy file="${SOURCE_DIR}/${APP_NAME}-app.xml" todir="${BUILD_DIR}" />
<mkdir dir="${BUILD_DIR}/installer" />