You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2013/04/05 14:02:42 UTC
[1/5] git commit: FLEX-33451: Fixed TLF
Updated Branches:
refs/heads/develop 66325004f -> 92b4f3fff
FLEX-33451: Fixed 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/bd52b305
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/bd52b305
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/bd52b305
Branch: refs/heads/develop
Commit: bd52b305226a326a514cc930ce79d89d6d940db0
Parents: 6282657
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Tue Mar 26 14:28:02 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Tue Mar 26 14:35:34 2013 +0100
----------------------------------------------------------------------
frameworks/projects/textLayout/build.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/bd52b305/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index 7437408..adb75bb 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -30,15 +30,15 @@
<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>
<property name="project.uri" value="library://ns.adobe.com/flashx/textLayout"/>
- <available file="${FLEX_HOME}/../flex-tlf"
+ <available file="${FLEX_HOME}/../flex-tlf/textLayout"
type="dir"
property="tlf.branch"
- value="${FLEX_HOME}/../flex-tlf" />
+ value="${FLEX_HOME}/../flex-tlf/textLayout" />
- <available file="${FLEX_HOME}/../tlf"
+ <available file="${FLEX_HOME}/../tlf/textLayout"
type="dir"
property="tlf.branch"
- value="${FLEX_HOME}/../tlf" />
+ value="${FLEX_HOME}/../tlf/textLayout" />
<available file="${source.dir}"
type="dir"
@@ -76,9 +76,9 @@
<attribute name="locale"/>
<sequential>
<echo message="creating 'fat-swc' in textLayout_rb.swc for @{locale}"/>
- <mkdir dir="${source.dir}/bundles/@{locale}/docs" />
+ <mkdir dir="${tlf.branch}/bundles/@{locale}/docs" />
<zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/textLayout_rb.swc" update="true">
- <zipfileset dir="${source.dir}/bundles/@{locale}/docs" prefix="docs">
+ <zipfileset dir="${tlf.branch}/bundles/@{locale}/docs" prefix="docs">
<include name="*.*"/>
<exclude name="ASDoc_Config.xml"/>
<exclude name="overviews.xml"/>
@@ -195,20 +195,20 @@
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+source.dir=${source.dir}" />
+ <arg value="+source.dir=${tlf.branch}" />
<define name="CONFIG::debug" value="${dbg}"/>
<define name="CONFIG::release" value="${rel}"/>
</compc>
</target>
<target name="compile.external" description="Compile textLayout.swc in flex-tlf repo" unless="src.folder.exists">
- <ant dir="${tlf.branch}" target="textLayout_flex"/>
- <copy file="${tlf.branch}/bin/textLayout.swc" toDir="${FLEX_HOME}/frameworks/libs" />
+ <ant dir="${tlf.branch}/.." target="textLayout_flex"/>
+ <copy file="${tlf.branch}/../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 ${tlf.branch}" />
- <ant dir="${tlf.branch}" target="clean"/>
+ <ant dir="${tlf.branch}/.." target="clean"/>
</target>
<target name="clean-temp-docs">
@@ -238,13 +238,13 @@
<!-- Call asdoc to generate dita xml files -->
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
- <compiler.source-path path-element="${source.dir}/src"/>
+ <compiler.source-path path-element="${tlf.branch}/src"/>
<compiler.show-actionscript-warnings>false</compiler.show-actionscript-warnings>
<doc-classes class="flashx.textLayout.CoreClasses"/>
<doc-classes class="flashx.textLayout.EditClasses"/>
<doc-classes class="flashx.textLayout.ConversionClasses"/>
<doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
- <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${source.dir}/manifest.xml"/>
+ <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${tlf.branch}/manifest.xml"/>
<jvmarg line="${asdoc.jvm.args}"/>
<static-link-runtime-shared-libraries/>
<define name="CONFIG::debug" value="${dbg}"/>
[4/5] git commit: Merge branch 'FLEX-33451' into develop
Posted by ft...@apache.org.
Merge branch 'FLEX-33451' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d7a7a692
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d7a7a692
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d7a7a692
Branch: refs/heads/develop
Commit: d7a7a6925e4f4c391d3b422eeb551a5efa43c80f
Parents: 6632500 e5e1ab3
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Apr 5 13:54:49 2013 +0200
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Apr 5 13:54:49 2013 +0200
----------------------------------------------------------------------
.gitignore | 6 +++++-
frameworks/build.xml | 3 +++
frameworks/projects/textLayout/build.xml | 24 ++++++++++++------------
3 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d7a7a692/.gitignore
----------------------------------------------------------------------
[2/5] git commit: FLEX-33451: Temporarily remove asdoc generation for
the experimental lib
Posted by ft...@apache.org.
FLEX-33451: Temporarily remove asdoc generation for the experimental lib
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5c981472
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5c981472
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5c981472
Branch: refs/heads/develop
Commit: 5c98147267d2e743b55fb614bf1f69c2c91f09dc
Parents: bd52b30
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Tue Mar 26 14:30:03 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Tue Mar 26 14:35:38 2013 +0100
----------------------------------------------------------------------
frameworks/build.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c981472/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 2046123..c407ea4 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -213,7 +213,10 @@
<ant dir="${basedir}/projects/automation" target="doc" />
-->
<ant dir="${basedir}/projects/apache" target="doc" />
+ <!-- removed until until errors resolved -->
+ <!--
<ant dir="${basedir}/projects/experimental" target="doc" />
+ -->
</target>
<!--
[5/5] git commit: Fixed: Removed duplicated lines coming from the
Gordon's commits
Posted by ft...@apache.org.
Fixed: Removed duplicated lines coming from the Gordon's commits
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/92b4f3ff
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/92b4f3ff
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/92b4f3ff
Branch: refs/heads/develop
Commit: 92b4f3ffffce72421f4396da7b449be688f70450
Parents: d7a7a69
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Fri Apr 5 13:59:16 2013 +0200
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Fri Apr 5 13:59:16 2013 +0200
----------------------------------------------------------------------
.gitignore | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/92b4f3ff/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6a8ac4f..0b4f141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,6 @@ build.log
release
out
gen
-flex-sdk-description.xml
-frameworks/projects/*/bundles.properties
-frameworks/projects/spark/manifest.xml
#Apache Flex Projects
lib/
[3/5] git commit: FLEX-33451: Fixed .gitignore for release build
Posted by ft...@apache.org.
FLEX-33451: Fixed .gitignore for release build
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e5e1ab3e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e5e1ab3e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e5e1ab3e
Branch: refs/heads/develop
Commit: e5e1ab3e4aac024df2ec461f7087aeeddef8c1a5
Parents: 5c98147
Author: Frédéric THOMAS <ft...@apache.org>
Authored: Tue Mar 26 14:31:29 2013 +0100
Committer: Frédéric THOMAS <ft...@apache.org>
Committed: Tue Mar 26 14:44:10 2013 +0100
----------------------------------------------------------------------
.gitignore | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e5e1ab3e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0c84fc3..0b4f141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,18 +35,22 @@ flex2/
thirdparty/
META-INF/
3.0.33/
-3.0.33
+tempDoc/
*.pbj
*.vms
*.ser
*.mxp
+bundles.properties
css_*.properties
FXGException_*.properties
FXGLog_*.properties
FABridge.js
+frameworks/projects/spark/manifest.xml
env.properties
local.properties
+flex-sdk-description.xml
+packages.dita
#OS junk files
[Tt]humbs.db