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/06 04:11:08 UTC
[1/4] git commit: Fixed TLF references form Git move
Updated Branches:
refs/heads/develop 92b4f3fff -> 2d04e0729
Fixed TLF references form Git move
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8f702545
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8f702545
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8f702545
Branch: refs/heads/develop
Commit: 8f70254506602f2ae64bc9d4c034b6515be45885
Parents: 92b4f3f
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 6 13:04:59 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 6 13:04:59 2013 +1100
----------------------------------------------------------------------
asdoc/build.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8f702545/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index b19c960..68c814b 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -81,7 +81,7 @@
<compiler.source-path path-element="${flexlib}/projects/mx/src"/>
<compiler.source-path path-element="${flexlib}/projects/sparkskins/src"/>
<compiler.source-path path-element="${flexlib}/projects/rpc/src"/>
- <compiler.source-path path-element="${flexlib}/projects/textLayout/${tlf.version}/src"/>
+ <compiler.source-path path-element="${tlf.branch}/src"/>
<!--compiler.source-path path-element="${flexlib}/projects/osmf/src"/-->
<compiler.source-path path-element="${flexlib}/projects/advancedgrids/src"/>
<compiler.source-path path-element="${flexlib}/projects/charts/src"/>
@@ -107,7 +107,7 @@
<doc-namespaces uri="http://flex.apache.org/ns"/>
<doc-namespaces uri="http://flex.apache.org/experimental/ns"/>
- <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${flexlib}/projects/textLayout/${tlf.version}/manifest.xml"/>
+ <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${tlf.branch}/manifest.xml"/>
<!-- namespace declaration for asdoc -->
<namespace uri="http://www.adobe.com/2006/airmxml" manifest="${flexlib}/projects/airframework/manifest.xml"/>
[3/4] git commit: Updated TLF referances to git repo
Posted by jm...@apache.org.
Updated TLF referances to git repo
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7174b484
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7174b484
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7174b484
Branch: refs/heads/develop
Commit: 7174b484f9f29e9f6db57f146947192b476c05d9
Parents: e953c94
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 6 13:08:56 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 6 13:08:56 2013 +1100
----------------------------------------------------------------------
frameworks/build_framework.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7174b484/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --git a/frameworks/build_framework.xml b/frameworks/build_framework.xml
index 3549737..6189557 100644
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@ -58,8 +58,7 @@
<property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
<property name="apache.dir" value="${projects.dir}/apache"/>
<property name="experimental.dir" value="${projects.dir}/experimental"/>
- <property name="textLayout.dir" value="${projects.dir}/textLayout"/>
- <property name="textLayout.ver.dir" value="${textLayout.dir}/${tlf.version}"/>
+ <property name="textLayout.dir" value="${tlf.branch}"/>
<property name="experimental.dir" value="${projects.dir}/experimental"/>
<!-- automation -->
@@ -872,10 +871,10 @@
<jvmarg line="${compc.jvm.args}"/>
<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
<include-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
- <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.ver.dir}/manifest.xml"/>
- <source-path path-element="${textLayout.ver.dir}/src"/>
+ <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.dir}/manifest.xml"/>
+ <source-path path-element="${textLayout.dir}/src"/>
<library-path/>
- <include-file name="manifest.xml" path="${textLayout.ver.dir}/manifest.xml"/>
+ <include-file name="manifest.xml" path="${textLayout.dir}/manifest.xml"/>
<static-link-runtime-shared-libraries/>
<define name="CONFIG::debug" value="false"/>
<define name="CONFIG::release" value="true"/>
[2/4] git commit: Changed release number to date format yyyyMMdd as
Git has no simple revision number
Posted by jm...@apache.org.
Changed release number to date format yyyyMMdd as Git has no simple revision 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/e953c944
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e953c944
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e953c944
Branch: refs/heads/develop
Commit: e953c944190bab03362cffbb37e5d62f35898277
Parents: 8f70254
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 6 13:07:18 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 6 13:07:18 2013 +1100
----------------------------------------------------------------------
build.xml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e953c944/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 84e1f8c..c53cff6 100644
--- a/build.xml
+++ b/build.xml
@@ -74,7 +74,7 @@
<target name="main" depends="prebuild,modules,frameworks,post-build" description="Full build">
<tstamp>
- <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
+ <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
<echo>ant main target completed on ${build.datetime}</echo>
</target>
@@ -218,7 +218,10 @@
</target>
<target name="create-description" description="Generate flex-sdk-description.xml">
- <echo message="build.number is ${build.number}"/>
+ <tstamp>
+ <format property="build.number.date" pattern="yyyyMMdd" />
+ </tstamp>
+ <echo message="build.number is ${build.number.date}"/>
<echo file="${basedir}/flex-sdk-description.xml"><?xml version="1.0"?>
<!--
@@ -241,7 +244,7 @@
<flex-sdk-description>
<name>${release} FP${playerglobal.version} ${locale}</name>
<version>${release.version}</version>
-<build>${build.number}</build>
+<build>${build.number.date}</build>
</flex-sdk-description>
</echo>
</target>
@@ -411,27 +414,27 @@
<target name="frameworks-rsls" description="Build signed framework RSLs">
<!-- textLayout RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="textLayout" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="textLayout" build-number="${release.version}.${build.number.date}"/>
<!-- framework RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="framework" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="framework" build-number="${release.version}.${build.number.date}"/>
<!-- mx RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs/mx" swc-name="mx" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs/mx" swc-name="mx" build-number="${release.version}.${build.number.date}"/>
<!-- rpc RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="rpc" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="rpc" build-number="${release.version}.${build.number.date}"/>
<!-- Spark -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark" build-number="${release.version}.${build.number.date}"/>
<!-- sparkskins RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="sparkskins" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="sparkskins" build-number="${release.version}.${build.number.date}"/>
<!-- charts RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="charts" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="charts" build-number="${release.version}.${build.number.date}"/>
<!-- advancedgrids RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="advancedgrids" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="advancedgrids" build-number="${release.version}.${build.number.date}"/>
<!-- spark_dmv RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark_dmv" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="spark_dmv" build-number="${release.version}.${build.number.date}"/>
<!-- apache RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="apache" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="apache" build-number="${release.version}.${build.number.date}"/>
<!-- experimental RSL -->
- <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="experimental" build-number="${release.version}.${build.number}"/>
+ <create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="experimental" build-number="${release.version}.${build.number.date}"/>
</target>
<target name="other.locales" description="Build resource SWCs for additional locales">
@@ -967,7 +970,7 @@
value="<warn-no-explicit-super-call-in-constructor>false"/>
<replacefilter
token="$${build.number}"
- value="${release.version}.${build.number}"/>
+ value="${release.version}.${build.number.date}"/>
</replace>
</sequential>
</macrodef>
@@ -1025,12 +1028,12 @@
<taskdef name="grep" classname="ise.antelope.tasks.Find"
classpathref="anttask.classpath"/>
- <echo message="Updating all frameworks/projects/**/Version.as files with version ${release.version}.${build.number}"/>
+ <echo message="Updating all frameworks/projects/**/Version.as files with version ${release.version}.${build.number.date}"/>
<!-- Update all Version.as files in the kit frameworks directory-->
<replaceregexp>
<regexp pattern='"[0-9].[0-9].[0-9].[0-9]";'/>
- <substitution expression='"${release.version}.${build.number}";'/>
+ <substitution expression='"${release.version}.${build.number.date}";'/>
<fileset dir="${FLEX_HOME}/temp/frameworks/projects">
<include name="**/Version.as"/>
</fileset>
[4/4] git commit: Fixed TLF path to be based on tif.branch not
tlf.version
Posted by jm...@apache.org.
Fixed TLF path to be based on tif.branch not tlf.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/2d04e072
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/2d04e072
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/2d04e072
Branch: refs/heads/develop
Commit: 2d04e0729bffa4591006a513ad0d8ebda21ff8c5
Parents: 7174b48
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Apr 6 13:10:32 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Apr 6 13:10:32 2013 +1100
----------------------------------------------------------------------
frameworks/projects/textLayout/build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2d04e072/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index adb75bb..fdea4cd 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -24,7 +24,7 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
- <property name="source.dir" value="${basedir}/${tlf.version}"/>
+ <property name="source.dir" value="${tlf.branch}"/>
<property name="output.file" value="${FLEX_HOME}/frameworks/libs/textLayout.swc"/>
<property name="output.docs" value="${FLEX_HOME}/tempDoc"/>
<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>