You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/11/20 21:19:27 UTC
[38/41] git commit: [flex-asjs] [refs/heads/core_js_to_as] - switch
nightly to 0.6.0
switch nightly to 0.6.0
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/70f0da10
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/70f0da10
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/70f0da10
Branch: refs/heads/core_js_to_as
Commit: 70f0da10a7c77239ca40cbd715dbaa3672cc8950
Parents: 88d8c37
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 16 15:15:24 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 16 15:15:24 2015 -0800
----------------------------------------------------------------------
ApproveFlexJS.xml | 8 ++++----
build.properties | 2 +-
.../CordovaCameraExample/CordovaCameraExample-app.xml | 2 +-
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
examples/flexjs/MapSearch/MapSearch-app.xml | 2 +-
examples/flexjs/pom.xml | 4 ++--
installer.xml | 4 ++--
maven.xml | 2 +-
nightly.properties | 6 +-----
releasecandidate.xml | 11 ++++++++++-
10 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 8575e73..cdf3d85 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -436,7 +436,7 @@
</target>
<target name="get.falcon.if.needed" depends="get.falcon.nightly,get.falcon.rc" unless="FALCON_HOME" />
<target name="get.falcon.nightly" if="falcon.nightly">
- <property name="kit.jx.prefix" value="apache-flex-falconjx-0.5.0"/>
+ <property name="kit.jx.prefix" value="apache-flex-falconjx-0.6.0"/>
<property name="binary.jx.kit" value="${kit.jx.prefix}-bin"/>
<get src="http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/lastSuccessfulBuild/artifact/out/${binary.jx.kit}.zip"
dest="${basedir}/${binary.jx.kit}.zip" verbose="true" skipexisting="true"/>
@@ -468,11 +468,11 @@
<property name="FALCONJX_HOME" value="${basedir}/falconjx/js" />
</target>
<target name="get.falcon.rc" if="falcon.rc">
- <property name="kit.jx.prefix" value="apache-flex-falconjx-0.5.0"/>
+ <property name="kit.jx.prefix" value="apache-flex-falconjx-0.6.0"/>
<property name="binary.jx.kit" value="${kit.jx.prefix}-bin"/>
- <get src="https://dist.apache.org/repos/dist/dev/flex/falcon/0.5.0/rc1/binaries/${binary.jx.kit}.zip"
+ <get src="https://dist.apache.org/repos/dist/dev/flex/falcon/0.6.0/rc1/binaries/${binary.jx.kit}.zip"
dest="${basedir}/${binary.jx.kit}.zip" verbose="true" skipexisting="true"/>
- <get src="https://dist.apache.org/repos/dist/dev/flex/falcon/0.5.0/rc1/binaries/${binary.jx.kit}.zip.md5"
+ <get src="https://dist.apache.org/repos/dist/dev/flex/falcon/0.6.0/rc1/binaries/${binary.jx.kit}.zip.md5"
dest="${basedir}/${binary.jx.kit}.zip.md5" verbose="true" skipexisting="true"/>
<checksum file="${basedir}/${binary.jx.kit}.zip" algorithm="md5" verifyproperty="falcon.md5.ok" />
<condition property="FalconMD5Invalid">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index ad5a887..1742c34 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
release.name = Apache Flex (FlexJS)
# this is the version that appears in the flex-sdk-description <description> tag
# and on the package name. This is the publicly known version of FlexJS
-release.version = 0.5.0
+release.version = 0.6.0
# fb.release.version must start with 4 in order for FB to accept it.
# intellij seems to want it to be at least 4.6 in order to not use certain
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
index e3bc1ff..c882034 100644
--- a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
+++ b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-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>0.5.0</versionNumber>
+ <versionNumber>0.6.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-asjs/blob/70f0da10/examples/flexjs/DesktopMap/DesktopMap-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/DesktopMap-app.xml b/examples/flexjs/DesktopMap/DesktopMap-app.xml
index 4b6c86b..9c10a05 100644
--- a/examples/flexjs/DesktopMap/DesktopMap-app.xml
+++ b/examples/flexjs/DesktopMap/DesktopMap-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>0.5.0</versionNumber>
+ <versionNumber>0.6.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-asjs/blob/70f0da10/examples/flexjs/MapSearch/MapSearch-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/MapSearch-app.xml b/examples/flexjs/MapSearch/MapSearch-app.xml
index c2f3dc8..35715a7 100644
--- a/examples/flexjs/MapSearch/MapSearch-app.xml
+++ b/examples/flexjs/MapSearch/MapSearch-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>0.5.0</versionNumber>
+ <versionNumber>0.6.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-asjs/blob/70f0da10/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 77bb498..4681cba 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.flex.compiler</groupId>
<artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.flex.flexjs</groupId>
<artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 0906ced..c50c7ea 100644
--- a/installer.xml
+++ b/installer.xml
@@ -57,8 +57,8 @@
<property name="air.sdk.version" value="14.0"/>
<property name="flash.sdk.version" value="14.0"/>
- <property name="flexjs.version" value="0.5.0"/>
- <property name="falcon.version" value="0.5.0"/>
+ <property name="flexjs.version" value="0.6.0"/>
+ <property name="falcon.version" value="0.6.0"/>
<property name="swfobject.url.server" value="https://github.com" />
<property name="swfobject.url.folder" value="swfobject/swfobject/archive" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index 2be15e9..e335d2a 100644
--- a/maven.xml
+++ b/maven.xml
@@ -19,7 +19,7 @@
-->
<project default="install" basedir=".">
- <property name="version" value="0.5.0"/>
+ <property name="version" value="0.6.0"/>
<!-- Set type to RELEASE in order to deploy to the release repo -->
<property name="type" value="SNAPSHOT"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/nightly.properties
----------------------------------------------------------------------
diff --git a/nightly.properties b/nightly.properties
index 39f79ed..cc6601a 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -20,14 +20,10 @@
# flags
nightly = true
# path to falconjx nightly
-#falcon.server.url = http://people.apache.org
-#falcon.md5.server.url = http://people.apache.org
-#falcon.folder = ~aharui/nightly/falcon
-#falcon.version = 0.5.0
falcon.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.md5.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.folder = job/flex-falcon/lastSuccessfulBuild/artifact/out
-falcon.version = 0.5.0
+falcon.version = 0.6.0
#need this until Installer 3.2 comes out
jburg.server=http://downloads.sourceforge.net
jburg.folder=project/jburg
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70f0da10/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index a789267..a6e50fb 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -338,7 +338,16 @@
<arg value="update" />
<arg value="trunk/content/installer/sdk-installer-config-4.0.xml" />
</exec>
- <property name="latest.release" value="${config.products.ApacheFlexJS.latestVersion}" />
+ <exec executable="${svn}" dir="${site}" failonerror="true" >
+ <arg value="update" />
+ <arg value="trunk/content/download-flexjs.cmsPage" />
+ </exec>
+ <exec executable="${svn}" dir="${site}" failonerror="true" >
+ <arg value="update" />
+ <arg value="trunk/templates" />
+ </exec>
+ <xmlproperty file="${site}/trunk/content/installer/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
+ <property name="latest.release" value="${config.products.ApacheFlexJS.latestVersion}" />
<replaceregexp byline="true" flags="g">
<regexp pattern="ApacheFlexJS(.*)latestVersion="${latest.release}"(.*)"/>
<substitution expression="ApacheFlexJS\1latestVersion="${release.version}"\2"/>