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/06/04 00:43:05 UTC
[1/8] git commit: [flex-sdk] [refs/heads/develop] - Changed Linux to
use zip of compile pixel bender files
Updated Branches:
refs/heads/develop aef1d4556 -> 6054e2ff3
Changed Linux to use zip of compile pixel bender files
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c8175a25
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c8175a25
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c8175a25
Branch: refs/heads/develop
Commit: c8175a253b7796941db48cc8a786ef316156581b
Parents: aef1d45
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 06:59:27 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 06:59:27 2013 +1000
----------------------------------------------------------------------
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c8175a25/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 56fe943..7196f28 100644
--- a/build.xml
+++ b/build.xml
@@ -206,7 +206,7 @@
<condition property="pbutil.exe.exists">
<and>
<os family="unix"/>
- <available file="${env.PIXELBENDER_HOME}/pbutil" type="file"/>
+ <available file="${env.PIXELBENDER_HOME}/pb.tar.gz" type="file"/>
</and>
</condition>
[5/8] git commit: [flex-sdk] [refs/heads/develop] - Changed build
files to us zip of pixel bender files on Linux
Posted by jm...@apache.org.
Changed build files to us zip of pixel bender files on Linux
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9a4e7cbc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9a4e7cbc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9a4e7cbc
Branch: refs/heads/develop
Commit: 9a4e7cbca2026a7b5386ffdb31b46fb5827a9ddf
Parents: a59ab44
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 07:43:46 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 07:43:46 2013 +1000
----------------------------------------------------------------------
frameworks/projects/framework/build.xml | 26 +++++-
.../projects/mobiletheme/compile-configAIR2.xml | 63 +++++++++++++
.../mobiletheme/src/MobileThemeClassesAIR2.as | 73 +++++++++++++++
3 files changed, 160 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a4e7cbc/frameworks/projects/framework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/build.xml b/frameworks/projects/framework/build.xml
index bbaaa54..a22ee88 100644
--- a/frameworks/projects/framework/build.xml
+++ b/frameworks/projects/framework/build.xml
@@ -83,6 +83,21 @@
</sequential>
</macrodef>
+ <condition property="isMac" value="true">
+ <os family="mac"/>
+ </condition>
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
+
<target name="main" depends="clean,compile" description="Clean build of framework.swc and en_US">
<bundle locale="${locale}"/>
</target>
@@ -175,7 +190,14 @@
</delete>
</target>
- <target name="pixelbender-compile">
+ <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <echo message="Unziping pixel bender files" />
+ <gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
+ <untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
+ <delete file="${FLEX_HOME}/pb.tar" />
+ </target>
+
+ <target name="pixelbender-compile" unless="isLinux">
<exec executable="${env.PIXELBENDER_HOME}/pbutil">
<arg value="${FLEX_HOME}/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk" />
<arg value="${FLEX_HOME}/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbj" />
@@ -231,7 +253,7 @@
</mxmlc>
</target>
- <target name="compile" depends="assets-compile,pixelbender-compile" description="Compiles framework.swc">
+ <target name="compile" depends="assets-compile,pixelbender-compile,pixelbender-unzip" description="Compiles framework.swc">
<echo message="Compiling frameworks/libs/framework.swc"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a4e7cbc/frameworks/projects/mobiletheme/compile-configAIR2.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/compile-configAIR2.xml b/frameworks/projects/mobiletheme/compile-configAIR2.xml
new file mode 100644
index 0000000..341147b
--- /dev/null
+++ b/frameworks/projects/mobiletheme/compile-configAIR2.xml
@@ -0,0 +1,63 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/spark.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ <path-element>../../libs/mobile/mobilecomponents.swc</path-element>
+ </external-library-path>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>../../spark-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+
+ </compiler>
+
+ <include-classes>
+ <class>MobileThemeClassesAIR2</class>
+ </include-classes>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>defaults.css</path>
+ </include-file>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a4e7cbc/frameworks/projects/mobiletheme/src/MobileThemeClassesAIR2.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/MobileThemeClassesAIR2.as b/frameworks/projects/mobiletheme/src/MobileThemeClassesAIR2.as
new file mode 100644
index 0000000..9e79108
--- /dev/null
+++ b/frameworks/projects/mobiletheme/src/MobileThemeClassesAIR2.as
@@ -0,0 +1,73 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package
+{
+
+internal class MobileThemeClassesAIR2
+{
+
+/**
+ * @private
+ * This class is used to link additional classes into mobile.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ */
+import spark.skins.mobile.ActionBarSkin; ActionBarSkin;
+import spark.skins.mobile.BeveledActionButtonSkin; BeveledActionButtonSkin;
+import spark.skins.mobile.BeveledBackButtonSkin; BeveledBackButtonSkin;
+import spark.skins.mobile.ButtonBarSkin; spark.skins.mobile.ButtonBarSkin;
+import spark.skins.mobile.ButtonSkin; spark.skins.mobile.ButtonSkin;
+import spark.skins.mobile.CalloutSkin; spark.skins.mobile.CalloutSkin;
+import spark.skins.mobile.CalloutActionBarSkin; spark.skins.mobile.CalloutActionBarSkin;
+import spark.skins.mobile.CalloutViewNavigatorSkin; spark.skins.mobile.CalloutViewNavigatorSkin;
+import spark.skins.mobile.CheckBoxSkin; spark.skins.mobile.CheckBoxSkin;
+import spark.skins.mobile.DefaultBeveledActionButtonSkin; spark.skins.mobile.DefaultBeveledActionButtonSkin;
+import spark.skins.mobile.DefaultBeveledBackButtonSkin; spark.skins.mobile.DefaultBeveledBackButtonSkin;
+import spark.skins.mobile.DefaultButtonSkin; spark.skins.mobile.DefaultButtonSkin;
+import spark.skins.mobile.DefaultTransparentActionButtonSkin; spark.skins.mobile.DefaultTransparentActionButtonSkin;
+import spark.skins.mobile.DefaultTransparentNavigationButtonSkin; spark.skins.mobile.DefaultTransparentNavigationButtonSkin;
+import spark.skins.mobile.DateSpinnerSkin; spark.skins.mobile.DateSpinnerSkin;
+import spark.skins.mobile.HScrollBarSkin; spark.skins.mobile.HScrollBarSkin;
+import spark.skins.mobile.HSliderSkin; spark.skins.mobile.HSliderSkin;
+import spark.skins.mobile.ImageSkin; spark.skins.mobile.ImageSkin;
+import spark.skins.mobile.ListSkin; spark.skins.mobile.ListSkin;
+import spark.skins.mobile.RadioButtonSkin; spark.skins.mobile.RadioButtonSkin;
+import spark.skins.mobile.SpinnerListContainerSkin; SpinnerListContainerSkin;
+import spark.skins.mobile.SpinnerListScrollerSkin; SpinnerListScrollerSkin;
+import spark.skins.mobile.SpinnerListSkin; SpinnerListSkin;
+import spark.skins.mobile.SkinnableContainerSkin; SkinnableContainerSkin;
+import spark.skins.mobile.SplitViewNavigatorSkin; SplitViewNavigatorSkin;
+import spark.skins.mobile.TabbedViewNavigatorApplicationSkin; TabbedViewNavigatorApplicationSkin;
+import spark.skins.mobile.TabbedViewNavigatorSkin; TabbedViewNavigatorSkin;
+import spark.skins.mobile.TabbedViewNavigatorTabBarSkin; TabbedViewNavigatorTabBarSkin;
+import spark.skins.mobile.TextAreaSkin; TextAreaSkin;
+import spark.skins.mobile.TextAreaHScrollBarSkin; TextAreaHScrollBarSkin;
+import spark.skins.mobile.TextAreaVScrollBarSkin; TextAreaVScrollBarSkin;
+import spark.skins.mobile.TextInputSkin; TextInputSkin;
+import spark.skins.mobile.ToggleSwitchSkin; ToggleSwitchSkin;
+import spark.skins.mobile.TransparentActionButtonSkin; TransparentActionButtonSkin;
+import spark.skins.mobile.TransparentNavigationButtonSkin; TransparentNavigationButtonSkin;
+import spark.skins.mobile.ViewMenuItemSkin; ViewMenuItemSkin;
+import spark.skins.mobile.ViewMenuSkin; ViewMenuSkin;
+import spark.skins.mobile.ViewNavigatorApplicationSkin; ViewNavigatorApplicationSkin;
+import spark.skins.mobile.ViewNavigatorSkin; ViewNavigatorSkin;
+import spark.skins.mobile.VScrollBarSkin; spark.skins.mobile.VScrollBarSkin;
+}
+}
[8/8] git commit: [flex-sdk] [refs/heads/develop] - set configMiod
initially to empty
Posted by jm...@apache.org.
set configMiod initially to empty
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6054e2ff
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6054e2ff
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6054e2ff
Branch: refs/heads/develop
Commit: 6054e2ff33f068e17ffb97e1508915330f78bf24
Parents: d7da76e
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 08:41:02 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 08:41:02 2013 +1000
----------------------------------------------------------------------
frameworks/projects/mobilecomponents/build.xml | 3 +++
frameworks/projects/mobiletheme/build.xml | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6054e2ff/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index 8813ed6..06bec59 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -26,6 +26,9 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
+
+ <property name="configMod" value=""/>
+
<macrodef name="bundle">
<attribute name="locale"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6054e2ff/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index 42aaaff..e627bb5 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -26,6 +26,8 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
+
+ <property name="configMod" value=""/>
<condition property="isMac">
<os family="mac"/>
[4/8] git commit: [flex-sdk] [refs/heads/develop] - Changed build
files to us zip of pixel bender files on Linux
Posted by jm...@apache.org.
Changed build files to us zip of pixel bender files on Linux
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a59ab44e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a59ab44e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a59ab44e
Branch: refs/heads/develop
Commit: a59ab44e26d84a84d05b7d06fb7d5c57236ed288
Parents: e306116
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 07:31:33 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 07:31:33 2013 +1000
----------------------------------------------------------------------
frameworks/projects/spark/build.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a59ab44e/frameworks/projects/spark/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/build.xml b/frameworks/projects/spark/build.xml
index 550f950..c526808 100644
--- a/frameworks/projects/spark/build.xml
+++ b/frameworks/projects/spark/build.xml
@@ -84,6 +84,21 @@
</sequential>
</macrodef>
+ <condition property="isMac" value="true">
+ <os family="mac"/>
+ </condition>
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
+
<target name="main" depends="clean,compile" description="Clean build of spark.swc and en_US">
<bundle locale="${locale}"/>
</target>
@@ -175,9 +190,16 @@
</delete>
</target>
- <target name="compile" depends="pixelbender-compile, swc-compile" description="Compiles spark.swc"/>
+ <target name="compile" depends="pixelbender-compile, pixelbender-unzip, swc-compile" description="Compiles spark.swc"/>
+
+ <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <echo message="Unziping pixel bender files" />
+ <gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
+ <untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
+ <delete file="${FLEX_HOME}/pb.tar" />
+ </target>
- <target name="pixelbender-compile">
+ <target name="pixelbender-compile" unless="isLinux">
<exec executable="${env.PIXELBENDER_HOME}/pbutil">
<arg value="${FLEX_HOME}/frameworks/projects/spark/asdoc/en_US/spark/effects/examples/assets/twist.pbk" />
<arg value="${FLEX_HOME}/frameworks/projects/spark/asdoc/en_US/spark/effects/examples/assets/twist.pbj" />
[6/8] git commit: [flex-sdk] [refs/heads/develop] - fix up platform
conditionals
Posted by jm...@apache.org.
fix up platform conditionals
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5c852d6b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5c852d6b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5c852d6b
Branch: refs/heads/develop
Commit: 5c852d6b5e3e7fbfa9234045a67e5724338c729f
Parents: 9a4e7cb
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 08:30:17 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 08:30:17 2013 +1000
----------------------------------------------------------------------
frameworks/build.xml | 2 +-
frameworks/projects/framework/build.xml | 4 ++--
frameworks/projects/mobilecomponents/build.xml | 4 ++--
frameworks/projects/mobiletheme/build.xml | 4 ++--
frameworks/projects/spark/build.xml | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index b028332..488e7e1 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -40,7 +40,7 @@
</condition>
<!-- Property for the platform. -->
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/framework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/build.xml b/frameworks/projects/framework/build.xml
index a22ee88..67e8383 100644
--- a/frameworks/projects/framework/build.xml
+++ b/frameworks/projects/framework/build.xml
@@ -83,7 +83,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -190,7 +190,7 @@
</delete>
</target>
- <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <target name="pixelbender-unzip" if="isLinux">
<echo message="Unziping pixel bender files" />
<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index b333ef1..8813ed6 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -82,7 +82,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -171,7 +171,7 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <target name="configMod" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index cc8575d..42aaaff 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -27,7 +27,7 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -54,7 +54,7 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <target name="configMod" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/spark/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/build.xml b/frameworks/projects/spark/build.xml
index c526808..f5420c1 100644
--- a/frameworks/projects/spark/build.xml
+++ b/frameworks/projects/spark/build.xml
@@ -84,7 +84,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -192,7 +192,7 @@
<target name="compile" depends="pixelbender-compile, pixelbender-unzip, swc-compile" description="Compiles spark.swc"/>
- <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <target name="pixelbender-unzip" if="isLinux">
<echo message="Unziping pixel bender files" />
<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
[2/8] git commit: [flex-sdk] [refs/heads/develop] - Added version of
files for Linux /AIR 2
Posted by jm...@apache.org.
Added version of files for Linux /AIR 2
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/975a0f51
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/975a0f51
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/975a0f51
Branch: refs/heads/develop
Commit: 975a0f51a105181f1f98527cd531f817a964ab69
Parents: c8175a2
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 07:00:34 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 07:00:34 2013 +1000
----------------------------------------------------------------------
.../mobilecomponents/compile-configAIR2.xml | 66 +++++++++++++++
.../src/MobileComponentsClassesAIR2.as | 39 +++++++++
2 files changed, 105 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/975a0f51/frameworks/projects/mobilecomponents/compile-configAIR2.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/compile-configAIR2.xml b/frameworks/projects/mobilecomponents/compile-configAIR2.xml
new file mode 100644
index 0000000..f74e1f7
--- /dev/null
+++ b/frameworks/projects/mobilecomponents/compile-configAIR2.xml
@@ -0,0 +1,66 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/spark.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ </external-library-path>
+
+ <keep-as3-metadata>
+ <name>SkinPart</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-classes>
+ <class>MobileComponentsClassesAIR2</class>
+ <class>spark.transitions.FlipViewTransitionMode</class>
+ <class>spark.transitions.ZoomViewTransitionMode</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ </include-namespaces>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/975a0f51/frameworks/projects/mobilecomponents/src/MobileComponentsClassesAIR2.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/MobileComponentsClassesAIR2.as b/frameworks/projects/mobilecomponents/src/MobileComponentsClassesAIR2.as
new file mode 100644
index 0000000..17f8e56
--- /dev/null
+++ b/frameworks/projects/mobilecomponents/src/MobileComponentsClassesAIR2.as
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package
+{
+
+internal class MobileComponentsClassesAIR2
+{
+
+/**
+ * @private
+ * This class is used to link additional classes into mobilecomponents.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ * For example, Button does not have a reference to ButtonSkin,
+ * but ButtonSkin needs to be in framework.swc along with Button.
+ */
+ import spark.preloaders.SplashScreen; SplashScreen;
+ import spark.components.supportClasses.StyleableTextField; StyleableTextField;
+ import spark.components.ActionBarDefaultButtonAppearance; ActionBarDefaultButtonAppearance;
+ import spark.components.ContentBackgroundAppearance; ContentBackgroundAppearance;
+}
+}
[7/8] git commit: [flex-sdk] [refs/heads/develop] - fixed spacing
Posted by jm...@apache.org.
fixed spacing
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d7da76e3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d7da76e3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d7da76e3
Branch: refs/heads/develop
Commit: d7da76e3ed8917509169e6c0278cadfb07717bc4
Parents: 5c852d6
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 08:36:09 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 08:36:09 2013 +1000
----------------------------------------------------------------------
frameworks/projects/framework/build.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d7da76e3/frameworks/projects/framework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/build.xml b/frameworks/projects/framework/build.xml
index 67e8383..24fe0a0 100644
--- a/frameworks/projects/framework/build.xml
+++ b/frameworks/projects/framework/build.xml
@@ -191,10 +191,10 @@
</target>
<target name="pixelbender-unzip" if="isLinux">
- <echo message="Unziping pixel bender files" />
- <gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
- <untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
- <delete file="${FLEX_HOME}/pb.tar" />
+ <echo message="Unziping pixel bender files" />
+ <gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
+ <untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
+ <delete file="${FLEX_HOME}/pb.tar" />
</target>
<target name="pixelbender-compile" unless="isLinux">
[3/8] git commit: [flex-sdk] [refs/heads/develop] - Changed build
files to us zip of pixel bender files on Linux
Posted by jm...@apache.org.
Changed build files to us zip of pixel bender files on Linux
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e3061168
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e3061168
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e3061168
Branch: refs/heads/develop
Commit: e306116827bca35fd15d7b425b00fea595687534
Parents: 975a0f5
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 07:27:17 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 07:27:17 2013 +1000
----------------------------------------------------------------------
build.xml | 2 +-
frameworks/projects/mobilecomponents/build.xml | 23 +++++++++++++++++-
frameworks/projects/mobiletheme/build.xml | 23 +++++++++++++++++-
3 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7196f28..95323a3 100644
--- a/build.xml
+++ b/build.xml
@@ -217,7 +217,7 @@
</and>
</condition>
- <fail message="The directory ${env.PIXELBENDER_HOME} does not contain the pbutil executable"
+ <fail message="The directory ${env.PIXELBENDER_HOME} does not contain the pbutil executable or pb files"
unless="pbutil.exe.exists"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index 817139e..b333ef1 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -82,6 +82,21 @@
</sequential>
</macrodef>
+ <condition property="isMac" value="true">
+ <os family="mac"/>
+ </condition>
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
+
<target name="main" depends="clean,compile" description="Clean build of mobilecomponents.swc and en_US">
<bundle locale="${locale}"/>
</target>
@@ -156,7 +171,11 @@
</delete>
</target>
- <target name="compile" description="Compiles mobilecomponents.swc">
+ <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <property name="configMod" value="AIR2"/>
+ </target>
+
+ <target name="compile" description="Compiles mobilecomponents.swc" depends="configMod">
<echo message="Compiling frameworks/libs/mobile/mobilecomponents.swc"/>
<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
@@ -179,7 +198,7 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/libs/mobile/mobilecomponents.swc">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="compile-config.xml" />
+ <load-config filename="compile-config${configMod}.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
</compc>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index 7139da9..cc8575d 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -27,6 +27,21 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
+ <condition property="isMac" value="true">
+ <os family="mac"/>
+ </condition>
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
+
<target name="main" depends="clean,compile" description="Clean build of mobile.swc"/>
<target name="clean">
@@ -39,7 +54,11 @@
</delete>
</target>
- <target name="compile" description="Compiles mobile.swc">
+ <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <property name="configMod" value="AIR2"/>
+ </target>
+
+ <target name="compile" description="Compiles mobile.swc" depends="configMod">
<echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->
@@ -61,7 +80,7 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/themes/Mobile/mobile.swc">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="compile-config.xml" />
+ <load-config filename="compile-config${configMod}.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</compc>