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 2015/10/13 04:35:05 UTC

[1/2] git commit: [flex-falcon] [refs/heads/develop] - compiler wasn't listening for player version override

Repository: flex-falcon
Updated Branches:
  refs/heads/develop dbb747f10 -> be2d4066e


compiler wasn't listening for player version override


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2ec57643
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2ec57643
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2ec57643

Branch: refs/heads/develop
Commit: 2ec576430bd5c9370129c1e44d285e8d33bc49f2
Parents: dbb747f
Author: Alex Harui <ah...@apache.org>
Authored: Mon Oct 12 19:34:12 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Oct 12 19:34:12 2015 -0700

----------------------------------------------------------------------
 compiler/build.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ec57643/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 5e22951..4b01b3c 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -42,6 +42,9 @@
     <property file="${compiler}/local.properties"/>
     <property name="javadoc.params" value="" />
     
+    <condition property="playerglobal.version" value="${env.PLAYERGLOBAL_VERSION}">
+        <isset property="env.PLAYERGLOBAL_VERSION" />
+    </condition>
 	<property name="playerglobal.version" value="11.1" />
     <property name="env.FLEX_HOME" value="${compiler}/generated/dist/sdk"/>
     <property name="env.PLAYERGLOBAL_HOME" value="${compiler}/generated/dist/sdk/frameworks/libs/player"/>


[2/2] git commit: [flex-falcon] [refs/heads/develop] - use nightly if no rc specified

Posted by ah...@apache.org.
use nightly if no rc specified


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/be2d4066
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/be2d4066
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/be2d4066

Branch: refs/heads/develop
Commit: be2d4066e42087f0f99c9f76725ed32c01236967
Parents: 2ec5764
Author: Alex Harui <ah...@apache.org>
Authored: Mon Oct 12 19:36:22 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Oct 12 19:36:22 2015 -0700

----------------------------------------------------------------------
 ApproveFalcon.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/be2d4066/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 32bbf12..b3985ad 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -108,6 +108,13 @@
     <fail message="The release version is not set.  Specify -Drelease.version=&lt;release version (e.g. 3.1, 3.2, etc)&gt;"
     unless="release.version"/>
 
+    <condition property="package.url.path"
+        value="http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/lastSuccessfulBuild/artifact/out">
+        <not>
+            <isset property="rc" />
+        </not>
+    </condition>
+
 	<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/falcon/${release.version}/rc${rc}" />
 	<property name="package.url.name" value="apache-flex-falconjx-${release.version}-src" />