You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Frédéric THOMAS <we...@hotmail.com> on 2013/03/21 23:11:51 UTC
Re: git commit: Fix SDK Build by calling external ant target in flex-tlf
tlf instead of flex-tlf wouldn't cool ? I indicated tlf in the others doc,
as I indicated to clone the flex-sdk to sdk :)
-Fred
-----Message d'origine-----
From: aharui@apache.org
Sent: Thursday, March 21, 2013 11:07 PM
To: commits@flex.apache.org
Subject: git commit: Fix SDK Build by calling external ant target in
flex-tlf
Updated Branches:
refs/heads/develop 839349413 -> b77d12d91
Fix SDK Build by calling external ant target in flex-tlf
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b77d12d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b77d12d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b77d12d9
Branch: refs/heads/develop
Commit: b77d12d918dad18d7ba8207e381f593843ffc872
Parents: 8393494
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 21 15:03:59 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 21 15:06:12 2013 -0700
----------------------------------------------------------------------
frameworks/projects/textLayout/build.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b77d12d9/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml
b/frameworks/projects/textLayout/build.xml
index 9927296..a5dd159 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -30,6 +30,10 @@
<property name="flexTasks.location"
value="${FLEX_HOME}/lib/flexTasks.jar"/>
<property name="project.uri"
value="library://ns.adobe.com/flashx/textLayout"/>
+ <available file="${source.dir}"
+ type="dir"
+ property="src.folder.exists"/>
+
<!-- We use abbreviated token names here as, the 'release'
and 'debug' tokens conflict with those specified in
build.properties
@@ -94,7 +98,7 @@
</macrodef>
- <target name="main" depends="clean,compile" description="Clean build of
textLayout.swc">
+ <target name="main" depends="clean,compile,compile.external"
description="Clean build of textLayout.swc">
<bundle locale="${locale}"/>
</target>
@@ -151,7 +155,7 @@
<bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
</target>
- <target name="clean" depends="bundles-clean" description="Deletes the
combined swc">
+ <target name="clean" depends="bundles-clean,clean-external"
description="Deletes the combined swc">
<delete failonerror="false">
<fileset dir="${basedir}">
<include name="bundles.properties"/>
@@ -173,7 +177,7 @@
</delete>
</target>
- <target name="compile" description="Compiles textLayout.swc">
+ <target name="compile" description="Compiles textLayout.swc"
if="src.folder.exists">
<taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
<compc fork="true"
output="${output.file}">
@@ -187,6 +191,16 @@
</compc>
</target>
+ <target name="compile.external" description="Compile textLayout.swc in
flex-tlf repo" unless="src.folder.exists">
+ <ant dir="${FLEX_HOME}/../flex-tlf/" target="textLayout_flex"/>
+ <copy file="${FLEX_HOME}/../flex-tlf/bin/textLayout.swc"
toDir="${FLEX_HOME}/frameworks/libs" />
+ </target>
+
+ <target name="clean-external" description="clean in flex-tlf repo"
unless="src.folder.exists">
+ <echo message="cleaning flex-tlf" />
+ <ant dir="${FLEX_HOME}/../flex-tlf/" target="clean"/>
+ </target>
+
<target name="clean-temp-docs">
<delete dir="${FLEX_HOME}/tempDoc" failonerror="false"
includeEmptyDirs="true"/>
<delete file="${basedir}/bundles/en_US/packages.dita"
failonerror="false"/>
Re: git commit: Fix SDK Build by calling external ant target in
flex-tlf
Posted by Alex Harui <ah...@adobe.com>.
OK, I will add a variable shortly. And maybe add some smart defaulting.
On 3/21/13 4:24 PM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> Can I rename flex-tlf to tlf in the file system or will that mess up git?
>
> No problems
>
> OK, we'll have to add variables for that ?
>
> I trend to use asf/flex/sdk and asf/flex/tlf and it is what I indicated in
> the readme and maybe on the web site as well, it can be changed but a
> variable would be more flexible.
>
> It's up to you.
>
>
> Thanks,
> -Fred
>
> -----Message d'origine-----
> From: Alex Harui
> Sent: Friday, March 22, 2013 12:10 AM
> To: dev@flex.apache.org
> Subject: Re: git commit: Fix SDK Build by calling external ant target in
> flex-tlf
>
> OK, we'll have to add variables for that.
>
> Can I rename flex-tlf to tlf in the file system or will that mess up git?
>
>
> On 3/21/13 3:11 PM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
>
>> tlf instead of flex-tlf wouldn't cool ? I indicated tlf in the others doc,
>> as I indicated to clone the flex-sdk to sdk :)
>>
>> -Fred
>>
>> -----Message d'origine-----
>> From: aharui@apache.org
>> Sent: Thursday, March 21, 2013 11:07 PM
>> To: commits@flex.apache.org
>> Subject: git commit: Fix SDK Build by calling external ant target in
>> flex-tlf
>>
>> Updated Branches:
>> refs/heads/develop 839349413 -> b77d12d91
>>
>>
>> Fix SDK Build by calling external ant target in flex-tlf
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b77d12d9
>> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b77d12d9
>> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b77d12d9
>>
>> Branch: refs/heads/develop
>> Commit: b77d12d918dad18d7ba8207e381f593843ffc872
>> Parents: 8393494
>> Author: Alex Harui <ah...@apache.org>
>> Authored: Thu Mar 21 15:03:59 2013 -0700
>> Committer: Alex Harui <ah...@apache.org>
>> Committed: Thu Mar 21 15:06:12 2013 -0700
>>
>> ----------------------------------------------------------------------
>> frameworks/projects/textLayout/build.xml | 20 +++++++++++++++++---
>> 1 files changed, 17 insertions(+), 3 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b77d12d9/frameworks/proj>>
e
>> cts/textLayout/build.xml
>> ----------------------------------------------------------------------
>> diff --git a/frameworks/projects/textLayout/build.xml
>> b/frameworks/projects/textLayout/build.xml
>> index 9927296..a5dd159 100644
>> --- a/frameworks/projects/textLayout/build.xml
>> +++ b/frameworks/projects/textLayout/build.xml
>> @@ -30,6 +30,10 @@
>> <property name="flexTasks.location"
>> value="${FLEX_HOME}/lib/flexTasks.jar"/>
>> <property name="project.uri"
>> value="library://ns.adobe.com/flashx/textLayout"/>
>>
>> + <available file="${source.dir}"
>> + type="dir"
>> + property="src.folder.exists"/>
>> +
>> <!-- We use abbreviated token names here as, the 'release'
>> and 'debug' tokens conflict with those specified in
>> build.properties
>> @@ -94,7 +98,7 @@
>> </macrodef>
>>
>>
>> - <target name="main" depends="clean,compile" description="Clean build of
>> textLayout.swc">
>> + <target name="main" depends="clean,compile,compile.external"
>> description="Clean build of textLayout.swc">
>> <bundle locale="${locale}"/>
>> </target>
>>
>> @@ -151,7 +155,7 @@
>> <bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
>> </target>
>>
>> - <target name="clean" depends="bundles-clean" description="Deletes the
>> combined swc">
>> + <target name="clean" depends="bundles-clean,clean-external"
>> description="Deletes the combined swc">
>> <delete failonerror="false">
>> <fileset dir="${basedir}">
>> <include name="bundles.properties"/>
>> @@ -173,7 +177,7 @@
>> </delete>
>> </target>
>>
>> - <target name="compile" description="Compiles textLayout.swc">
>> + <target name="compile" description="Compiles textLayout.swc"
>> if="src.folder.exists">
>> <taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
>> <compc fork="true"
>> output="${output.file}">
>> @@ -187,6 +191,16 @@
>> </compc>
>> </target>
>>
>> + <target name="compile.external" description="Compile textLayout.swc
>> in
>> flex-tlf repo" unless="src.folder.exists">
>> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="textLayout_flex"/>
>> + <copy file="${FLEX_HOME}/../flex-tlf/bin/textLayout.swc"
>> toDir="${FLEX_HOME}/frameworks/libs" />
>> + </target>
>> +
>> + <target name="clean-external" description="clean in flex-tlf repo"
>> unless="src.folder.exists">
>> + <echo message="cleaning flex-tlf" />
>> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="clean"/>
>> + </target>
>> +
>> <target name="clean-temp-docs">
>> <delete dir="${FLEX_HOME}/tempDoc" failonerror="false"
>> includeEmptyDirs="true"/>
>> <delete file="${basedir}/bundles/en_US/packages.dita"
>> failonerror="false"/>
>>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: git commit: Fix SDK Build by calling external ant target in flex-tlf
Posted by Frédéric THOMAS <we...@hotmail.com>.
Can I rename flex-tlf to tlf in the file system or will that mess up git?
No problems
OK, we'll have to add variables for that ?
I trend to use asf/flex/sdk and asf/flex/tlf and it is what I indicated in
the readme and maybe on the web site as well, it can be changed but a
variable would be more flexible.
It's up to you.
Thanks,
-Fred
-----Message d'origine-----
From: Alex Harui
Sent: Friday, March 22, 2013 12:10 AM
To: dev@flex.apache.org
Subject: Re: git commit: Fix SDK Build by calling external ant target in
flex-tlf
OK, we'll have to add variables for that.
Can I rename flex-tlf to tlf in the file system or will that mess up git?
On 3/21/13 3:11 PM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> tlf instead of flex-tlf wouldn't cool ? I indicated tlf in the others doc,
> as I indicated to clone the flex-sdk to sdk :)
>
> -Fred
>
> -----Message d'origine-----
> From: aharui@apache.org
> Sent: Thursday, March 21, 2013 11:07 PM
> To: commits@flex.apache.org
> Subject: git commit: Fix SDK Build by calling external ant target in
> flex-tlf
>
> Updated Branches:
> refs/heads/develop 839349413 -> b77d12d91
>
>
> Fix SDK Build by calling external ant target in flex-tlf
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b77d12d9
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b77d12d9
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b77d12d9
>
> Branch: refs/heads/develop
> Commit: b77d12d918dad18d7ba8207e381f593843ffc872
> Parents: 8393494
> Author: Alex Harui <ah...@apache.org>
> Authored: Thu Mar 21 15:03:59 2013 -0700
> Committer: Alex Harui <ah...@apache.org>
> Committed: Thu Mar 21 15:06:12 2013 -0700
>
> ----------------------------------------------------------------------
> frameworks/projects/textLayout/build.xml | 20 +++++++++++++++++---
> 1 files changed, 17 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b77d12d9/frameworks/proje
> cts/textLayout/build.xml
> ----------------------------------------------------------------------
> diff --git a/frameworks/projects/textLayout/build.xml
> b/frameworks/projects/textLayout/build.xml
> index 9927296..a5dd159 100644
> --- a/frameworks/projects/textLayout/build.xml
> +++ b/frameworks/projects/textLayout/build.xml
> @@ -30,6 +30,10 @@
> <property name="flexTasks.location"
> value="${FLEX_HOME}/lib/flexTasks.jar"/>
> <property name="project.uri"
> value="library://ns.adobe.com/flashx/textLayout"/>
>
> + <available file="${source.dir}"
> + type="dir"
> + property="src.folder.exists"/>
> +
> <!-- We use abbreviated token names here as, the 'release'
> and 'debug' tokens conflict with those specified in
> build.properties
> @@ -94,7 +98,7 @@
> </macrodef>
>
>
> - <target name="main" depends="clean,compile" description="Clean build of
> textLayout.swc">
> + <target name="main" depends="clean,compile,compile.external"
> description="Clean build of textLayout.swc">
> <bundle locale="${locale}"/>
> </target>
>
> @@ -151,7 +155,7 @@
> <bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
> </target>
>
> - <target name="clean" depends="bundles-clean" description="Deletes the
> combined swc">
> + <target name="clean" depends="bundles-clean,clean-external"
> description="Deletes the combined swc">
> <delete failonerror="false">
> <fileset dir="${basedir}">
> <include name="bundles.properties"/>
> @@ -173,7 +177,7 @@
> </delete>
> </target>
>
> - <target name="compile" description="Compiles textLayout.swc">
> + <target name="compile" description="Compiles textLayout.swc"
> if="src.folder.exists">
> <taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
> <compc fork="true"
> output="${output.file}">
> @@ -187,6 +191,16 @@
> </compc>
> </target>
>
> + <target name="compile.external" description="Compile textLayout.swc
> in
> flex-tlf repo" unless="src.folder.exists">
> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="textLayout_flex"/>
> + <copy file="${FLEX_HOME}/../flex-tlf/bin/textLayout.swc"
> toDir="${FLEX_HOME}/frameworks/libs" />
> + </target>
> +
> + <target name="clean-external" description="clean in flex-tlf repo"
> unless="src.folder.exists">
> + <echo message="cleaning flex-tlf" />
> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="clean"/>
> + </target>
> +
> <target name="clean-temp-docs">
> <delete dir="${FLEX_HOME}/tempDoc" failonerror="false"
> includeEmptyDirs="true"/>
> <delete file="${basedir}/bundles/en_US/packages.dita"
> failonerror="false"/>
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: git commit: Fix SDK Build by calling external ant target in flex-tlf
Posted by Frédéric THOMAS <we...@hotmail.com>.
It doesn't matter, I called my fake flex-sdk.git justin and fred :)
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Friday, March 22, 2013 12:25 AM
To: dev@flex.apache.org
Subject: RE: git commit: Fix SDK Build by calling external ant target in
flex-tlf
+1
Isn't it typical to have the remote and local repos have the same name?
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Thursday, March 21, 2013 4:19 PM
To: dev@flex.apache.org
Subject: Re: git commit: Fix SDK Build by calling external ant target in
flex-tlf
Hi,
> Can I rename flex-tlf to tlf in the file system or will that mess up git?
I prefer it to be keep as "flex-tif" ie the same name as the repo's name
rather than just "tlf" as default.
Justin
RE: git commit: Fix SDK Build by calling external ant target in
flex-tlf
Posted by Gordon Smith <go...@adobe.com>.
+1
Isn't it typical to have the remote and local repos have the same name?
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Thursday, March 21, 2013 4:19 PM
To: dev@flex.apache.org
Subject: Re: git commit: Fix SDK Build by calling external ant target in flex-tlf
Hi,
> Can I rename flex-tlf to tlf in the file system or will that mess up git?
I prefer it to be keep as "flex-tif" ie the same name as the repo's name rather than just "tlf" as default.
Justin
Re: git commit: Fix SDK Build by calling external ant target in flex-tlf
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> Can I rename flex-tlf to tlf in the file system or will that mess up git?
I prefer it to be keep as "flex-tif" ie the same name as the repo's name rather than just "tlf" as default.
Justin
Re: git commit: Fix SDK Build by calling external ant target in
flex-tlf
Posted by Alex Harui <ah...@adobe.com>.
OK, we'll have to add variables for that.
Can I rename flex-tlf to tlf in the file system or will that mess up git?
On 3/21/13 3:11 PM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> tlf instead of flex-tlf wouldn't cool ? I indicated tlf in the others doc,
> as I indicated to clone the flex-sdk to sdk :)
>
> -Fred
>
> -----Message d'origine-----
> From: aharui@apache.org
> Sent: Thursday, March 21, 2013 11:07 PM
> To: commits@flex.apache.org
> Subject: git commit: Fix SDK Build by calling external ant target in
> flex-tlf
>
> Updated Branches:
> refs/heads/develop 839349413 -> b77d12d91
>
>
> Fix SDK Build by calling external ant target in flex-tlf
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b77d12d9
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b77d12d9
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b77d12d9
>
> Branch: refs/heads/develop
> Commit: b77d12d918dad18d7ba8207e381f593843ffc872
> Parents: 8393494
> Author: Alex Harui <ah...@apache.org>
> Authored: Thu Mar 21 15:03:59 2013 -0700
> Committer: Alex Harui <ah...@apache.org>
> Committed: Thu Mar 21 15:06:12 2013 -0700
>
> ----------------------------------------------------------------------
> frameworks/projects/textLayout/build.xml | 20 +++++++++++++++++---
> 1 files changed, 17 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b77d12d9/frameworks/proje
> cts/textLayout/build.xml
> ----------------------------------------------------------------------
> diff --git a/frameworks/projects/textLayout/build.xml
> b/frameworks/projects/textLayout/build.xml
> index 9927296..a5dd159 100644
> --- a/frameworks/projects/textLayout/build.xml
> +++ b/frameworks/projects/textLayout/build.xml
> @@ -30,6 +30,10 @@
> <property name="flexTasks.location"
> value="${FLEX_HOME}/lib/flexTasks.jar"/>
> <property name="project.uri"
> value="library://ns.adobe.com/flashx/textLayout"/>
>
> + <available file="${source.dir}"
> + type="dir"
> + property="src.folder.exists"/>
> +
> <!-- We use abbreviated token names here as, the 'release'
> and 'debug' tokens conflict with those specified in
> build.properties
> @@ -94,7 +98,7 @@
> </macrodef>
>
>
> - <target name="main" depends="clean,compile" description="Clean build of
> textLayout.swc">
> + <target name="main" depends="clean,compile,compile.external"
> description="Clean build of textLayout.swc">
> <bundle locale="${locale}"/>
> </target>
>
> @@ -151,7 +155,7 @@
> <bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
> </target>
>
> - <target name="clean" depends="bundles-clean" description="Deletes the
> combined swc">
> + <target name="clean" depends="bundles-clean,clean-external"
> description="Deletes the combined swc">
> <delete failonerror="false">
> <fileset dir="${basedir}">
> <include name="bundles.properties"/>
> @@ -173,7 +177,7 @@
> </delete>
> </target>
>
> - <target name="compile" description="Compiles textLayout.swc">
> + <target name="compile" description="Compiles textLayout.swc"
> if="src.folder.exists">
> <taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
> <compc fork="true"
> output="${output.file}">
> @@ -187,6 +191,16 @@
> </compc>
> </target>
>
> + <target name="compile.external" description="Compile textLayout.swc in
> flex-tlf repo" unless="src.folder.exists">
> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="textLayout_flex"/>
> + <copy file="${FLEX_HOME}/../flex-tlf/bin/textLayout.swc"
> toDir="${FLEX_HOME}/frameworks/libs" />
> + </target>
> +
> + <target name="clean-external" description="clean in flex-tlf repo"
> unless="src.folder.exists">
> + <echo message="cleaning flex-tlf" />
> + <ant dir="${FLEX_HOME}/../flex-tlf/" target="clean"/>
> + </target>
> +
> <target name="clean-temp-docs">
> <delete dir="${FLEX_HOME}/tempDoc" failonerror="false"
> includeEmptyDirs="true"/>
> <delete file="${basedir}/bundles/en_US/packages.dita"
> failonerror="false"/>
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui