You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/04/20 08:30:04 UTC
[1/7] git commit: [flex-sdk] - Added AIR version number
Updated Branches:
refs/heads/develop 5d7d26995 -> e9db73c84
Added AIR version number
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ae686402
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ae686402
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ae686402
Branch: refs/heads/develop
Commit: ae686402af5ba8b3a1bc9bfe00be2b567c4fb457
Parents: 5d7d269
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:16:39 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:16:39 2013 +1000
----------------------------------------------------------------------
build.properties | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ae686402/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index da9b4af..52236a3 100644
--- a/build.properties
+++ b/build.properties
@@ -27,6 +27,9 @@ build.number = 0
# Flash player version for which player global swc to use
playerglobal.version = 11.1
+# AIR version number
+air.version = 3.7
+
# Default locale for the SDK
locale = en_US
[7/7] git commit: [flex-sdk] - Fixed to change AIR -> AIR not AIR ->
FP
Posted by jm...@apache.org.
Fixed to change AIR -> AIR not AIR -> FP
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e9db73c8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e9db73c8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e9db73c8
Branch: refs/heads/develop
Commit: e9db73c84f3a5f7fb089dd9f30d417352e783c25
Parents: 1bfe2cf
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:26:05 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:26:05 2013 +1000
----------------------------------------------------------------------
ide/addAIRtoSDK.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e9db73c8/ide/addAIRtoSDK.sh
----------------------------------------------------------------------
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index 4b13a8c..ecaef6c 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -137,7 +137,7 @@ updatePlayerDescription() {
echo Updating ${configFile}
- sed "s/AIR[0-9]\.[0-9]/FP${airversion}/" < "${configFile}" > "${configFile}.tmp"
+ sed "s/AIR[0-9]\.[0-9]/AIR${airversion}/" < "${configFile}" > "${configFile}.tmp"
mv "${configFile}.tmp" "${configFile}"
}
[3/7] git commit: [flex-sdk] - Change script to update Flash Player
version is SDK description file
Posted by jm...@apache.org.
Change script to update Flash Player version is SDK description file
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3c6b8fe5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3c6b8fe5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3c6b8fe5
Branch: refs/heads/develop
Commit: 3c6b8fe5a764864780ae6f0d8cf5ce25fe19fe23
Parents: 5d24f00
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:18:13 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:18:13 2013 +1000
----------------------------------------------------------------------
ide/setFlashPlayerVersion.sh | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3c6b8fe5/ide/setFlashPlayerVersion.sh
----------------------------------------------------------------------
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index c72f298..881f414 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -153,6 +153,7 @@ fi
updatePlayerVersion() {
playerversion=$1
configFile=$2
+
sed "s/<target-player>[0-9][0-9]\.[0-9]<\/target-player>/<target-player>${playerversion}<\/target-player>/" < "${configFile}" > "${configFile}.tmp"
mv "${configFile}.tmp" "${configFile}"
}
@@ -160,71 +161,77 @@ updatePlayerVersion() {
updateSWFVersion() {
swfversion=$1
configFile=$2
+
sed "s/<swf-version>[0-9][0-9]<\/swf-version>/<swf-version>${swfversion}<\/swf-version>/" < "${configFile}" > "${configFile}.tmp"
mv "${configFile}.tmp" "${configFile}"
}
+updatePlayerDescription() {
+ playerversion=$1
+ configFile=$2
+
+ echo Updating ${configFile}
+
+ sed "s/FP[0-9][0-9]\.[0-9]/FP${playerversion}/" < "${configFile}" > "${configFile}.tmp"
+ mv "${configFile}.tmp" "${configFile}"
+}
+
configFiles=(
"${IDE_SDK_DIR}/frameworks/flex-config.xml"
"${IDE_SDK_DIR}/frameworks/air-config.xml"
"${IDE_SDK_DIR}/frameworks/airmobile-config.xml"
)
+updatePlayerDescription "${FLASH_VERSION}" "${IDE_SDK_DIR}/flex-sdk-description.xml"
+
for configFile in "${configFiles[@]}"
do
echo Updating ${configFile}
-
+
+ updatePlayerVersion "${FLASH_VERSION}" "${configFile}"
+
if [ ${FLASH_VERSION} = "11.7" ]
then
- updatePlayerVersion 11.7 "${configFile}"
updateSWFVersion 20 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.6" ]
then
- updatePlayerVersion 11.6 "${configFile}"
updateSWFVersion 19 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.5" ]
then
- updatePlayerVersion 11.5 "${configFile}"
updateSWFVersion 18 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.4" ]
then
- updatePlayerVersion 11.4 "${configFile}"
updateSWFVersion 17 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.3" ]
then
- updatePlayerVersion 11.3 "${configFile}"
updateSWFVersion 16 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.2" ]
then
- updatePlayerVersion 11.2 "${configFile}"
updateSWFVersion 15 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.1" ]
then
- updatePlayerVersion 11.1 "${configFile}"
updateSWFVersion 14 "${configFile}"
fi
if [ ${FLASH_VERSION} = "11.0" ]
then
- updatePlayerVersion 11.0 "${configFile}"
updateSWFVersion 13 "${configFile}"
fi
if [ ${FLASH_VERSION} = "10.3" ]
then
- updatePlayerVersion 10.3 "${configFile}"
updateSWFVersion 12 "${configFile}"
fi
[6/7] git commit: [flex-sdk] - Fixed quote in wrong spot - vars
probably should have { }'s
Posted by jm...@apache.org.
Fixed quote in wrong spot - vars probably should have { }'s
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1bfe2cf2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1bfe2cf2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1bfe2cf2
Branch: refs/heads/develop
Commit: 1bfe2cf26f4bc1e21259adb5b3fb2faec6089d24
Parents: a26918f
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:24:04 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:24:04 2013 +1000
----------------------------------------------------------------------
ide/flashbuilder/makeApacheFlexForFlashBuilder.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1bfe2cf2/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh b/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
index 4c7ce91..9919321 100755
--- a/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
+++ b/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
@@ -104,7 +104,7 @@ curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_SWC_URL" --output "$FLEX_HOME/frameworks/l
# copy the config files formatted for Flash Builder to frameworks
echo "Installing the frameworks config files configured for use with Adobe Flash Builder"
-cp -p -v "$FLEX_HOME/ide/flashbuilder/config/*-config.xml" "$FLEX_HOME/frameworks"
+cp -p -v "$FLEX_HOME"/ide/flashbuilder/config/*-config.xml "$FLEX_HOME/frameworks"
# remove the zipped kits
rm -rf "$tempDir"
[5/7] git commit: [flex-sdk] - Added AIR version to SDK description
Posted by jm...@apache.org.
Added AIR version to SDK description
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a26918f2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a26918f2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a26918f2
Branch: refs/heads/develop
Commit: a26918f22f6e6643b82a1cd99c3292cdc4bf5798
Parents: b9e06c3
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:20:18 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:20:18 2013 +1000
----------------------------------------------------------------------
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a26918f2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6858c89..07da287 100644
--- a/build.xml
+++ b/build.xml
@@ -267,7 +267,7 @@
-->
<flex-sdk-description>
-<name>${release} FP${playerglobal.version} ${locale}</name>
+<name>${release} FP${playerglobal.version} AIR${air.version} ${locale}</name>
<version>${release.version}</version>
<build>${build.number.date}</build>
</flex-sdk-description>
[2/7] git commit: [flex-sdk] - Change to use air.version
Posted by jm...@apache.org.
Change to use air.version
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5d24f00c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5d24f00c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5d24f00c
Branch: refs/heads/develop
Commit: 5d24f00cd984b377ca348df16ed034b5a5df69ac
Parents: ae68640
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:17:24 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:17:24 2013 +1000
----------------------------------------------------------------------
jenkins.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d24f00c/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 6ba8983..32984db 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -44,7 +44,7 @@
<echo message="Be patient. This takes a few minutes..." />
<mkdir dir="${FLEX_HOME}/air"/>
<mkdir dir="${FLEX_HOME}/temp"/>
- <get src="http://airdownload.adobe.com/air/win/download/3.4/AdobeAIRSDK.zip"
+ <get src="http://airdownload.adobe.com/air/win/download/${air.version}/AdobeAIRSDK.zip"
dest="${FLEX_HOME}/temp/AIR Integration Kit.zip"
verbose="false"/>
<unzip dest="${FLEX_HOME}/air/AIR Integration Kit" src="${FLEX_HOME}/temp/AIR Integration Kit.zip" />
[4/7] git commit: [flex-sdk] - Change script to update AIR version is
SDK description file
Posted by jm...@apache.org.
Change script to update AIR version is SDK description file
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b9e06c37
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b9e06c37
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b9e06c37
Branch: refs/heads/develop
Commit: b9e06c37267be04ea6bf54b1cfafea09ff4fa8e4
Parents: 3c6b8fe
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 20 16:19:26 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 20 16:19:26 2013 +1000
----------------------------------------------------------------------
ide/addAIRtoSDK.sh | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b9e06c37/ide/addAIRtoSDK.sh
----------------------------------------------------------------------
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index 66bee66..4b13a8c 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -131,12 +131,24 @@ updateSWFVersion() {
mv "${configFile}.tmp" "${configFile}"
}
+updatePlayerDescription() {
+ airversion=$1
+ configFile=$2
+
+ echo Updating ${configFile}
+
+ sed "s/AIR[0-9]\.[0-9]/FP${airversion}/" < "${configFile}" > "${configFile}.tmp"
+ mv "${configFile}.tmp" "${configFile}"
+}
+
configFiles=(
"${IDE_SDK_DIR}/frameworks/flex-config.xml"
"${IDE_SDK_DIR}/frameworks/air-config.xml"
"${IDE_SDK_DIR}/frameworks/airmobile-config.xml"
)
+updatePlayerDescription "${AIR_VERSION}" "${IDE_SDK_DIR}/flex-sdk-description.xml"
+
for configFile in "${configFiles[@]}"
do
echo Updating ${configFile}