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/03/26 19:44:48 UTC
git commit: [flex-asjs] [refs/heads/develop] - found how to get FB to
think it is v4 but the public versions are 0.0.1
Repository: flex-asjs
Updated Branches:
refs/heads/develop 8699c1c85 -> 1f243593f
found how to get FB to think it is v4 but the public versions are 0.0.1
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1f243593
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1f243593
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1f243593
Branch: refs/heads/develop
Commit: 1f243593fad53ff62c9419329bdfa604ae53c2a7
Parents: 8699c1c
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 26 08:26:36 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 26 08:26:36 2014 -0700
----------------------------------------------------------------------
build.properties | 11 ++++++++---
build.xml | 4 ++--
installer.xml | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1f243593/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index e01c38c..7e78958 100644
--- a/build.properties
+++ b/build.properties
@@ -18,9 +18,14 @@
################################################################################
# flex-sdk-description values
-release = Apache Flex (FlexJS) 0.0.1
-# release version must start with 4 in order for FB to accept it
-release.version = 4.0.1
+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.0.1
+
+# fb.release.version must start with 4 in order for FB to accept it.
+# this property should only go in flex-sdk-description.xml <version> tag
+fb.release.version = 4.0.1
# override on command line with -Dbuild.number=999 or in local.properties
build.number = 0
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1f243593/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 45522ee..37358a7 100644
--- a/build.xml
+++ b/build.xml
@@ -299,8 +299,8 @@
-->
<flex-sdk-description>
-<name>${release} FP${playerglobal.version} AIR${air.version} ${locale}</name>
-<version>${release.version}</version>
+<name>${release.name} ${release.version} FP${playerglobal.version} AIR${air.version} ${locale}</name>
+<version>${fb.release.version}</version>
<build>${build.number.date}</build>
</flex-sdk-description>
</echo>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1f243593/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 9b4233a..e96ae56 100644
--- a/installer.xml
+++ b/installer.xml
@@ -614,8 +614,8 @@
-->
<flex-sdk-description>
-<name>${release} FP${flash.sdk.version} AIR${air.sdk.version} ${bundle}</name>
-<version>${release.version}</version>
+<name>${release.name} ${release.version} FP${flash.sdk.version} AIR${air.sdk.version} ${bundle}</name>
+<version>${fb.release.version}</version>
<build>${flex-sdk-description.build}</build>
</flex-sdk-description>
</echo>