flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [21/25] git commit: [flex-sdk] [refs/heads/release4.11.0] - https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for mobile - fixed manifest files missing ids - fixed missing experimental-mobile-manifest.xml file in framework root - fixed airmobile-co
Date Tue, 08 Oct 2013 15:23:00 GMT
https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for mobile
- fixed manifest files missing ids
- fixed missing experimental-mobile-manifest.xml file in framework root
- fixed airmobile-config.xml and airconfig.xml missing manifest references


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6cf64f2f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6cf64f2f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6cf64f2f

Branch: refs/heads/release4.11.0
Commit: 6cf64f2fe46469f91a413274f7298f81b75c9849
Parents: c1a3874
Author: mamsellem <maurice.amsellem@systar.com>
Authored: Tue Oct 8 15:18:59 2013 +0200
Committer: mamsellem <maurice.amsellem@systar.com>
Committed: Tue Oct 8 15:18:59 2013 +0200

----------------------------------------------------------------------
 frameworks/air-config.xml                       | 18 +++++++++----
 frameworks/airmobile-config.xml                 | 18 +++++++++----
 frameworks/experimental-mobile-manifest.xml     | 28 ++++++++++++++++++++
 .../projects/experimental_mobile/build.xml      |  6 ++++-
 .../projects/experimental_mobile/manifest.xml   |  8 +++---
 5 files changed, 63 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6cf64f2f/frameworks/air-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/air-config.xml b/frameworks/air-config.xml
index eeb2950..70ea434 100644
--- a/frameworks/air-config.xml
+++ b/frameworks/air-config.xml
@@ -103,6 +103,14 @@
             <uri>http://www.adobe.com/2006/mxml</uri>
             <manifest>mxml-manifest.xml</manifest>
          </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/ns</uri>
+            <manifest>apache-manifest.xml</manifest>
+         </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/experimental/ns</uri>
+            <manifest>experimental-manifest.xml</manifest>
+         </namespace>
       </namespaces>
       
       <!-- Enable post-link SWF optimization. -->
@@ -425,11 +433,11 @@
    
    <!-- Metadata added to SWFs via the SWF Metadata tag. -->
    <metadata>
-      <title>Apache Flex 4 Application</title>
-      <description>http://www.adobe.com/products/flex</description>
-      <publisher>Apache Software Founcation</publisher>
-      <creator>unknown</creator>
-      <language>EN</language>
+      <title>Apache Flex Application</title>
+      <description>http://flex.apache.org/</description>
+      <publisher>Apache Software Foundation</publisher>
+      <creator>Apache Software Foundation</creator>
+      <language>en_US</language>
    </metadata>
 
 </flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6cf64f2f/frameworks/airmobile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/airmobile-config.xml b/frameworks/airmobile-config.xml
index 60e4f16..a93546b 100644
--- a/frameworks/airmobile-config.xml
+++ b/frameworks/airmobile-config.xml
@@ -97,6 +97,14 @@
             <uri>library://ns.adobe.com/flex/spark</uri>
             <manifest>spark-manifest.xml</manifest>
          </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/ns</uri>
+            <manifest>apache-manifest.xml</manifest>
+         </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/experimental/ns</uri>
+            <manifest>experimental-mobile-manifest.xml</manifest>
+         </namespace>
       </namespaces>
       
       <!-- Enable post-link SWF optimization. -->
@@ -347,11 +355,11 @@
    
    <!-- Metadata added to SWFs via the SWF Metadata tag. -->
    <metadata>
-      <title>Adobe Flex 4 Application</title>
-      <description>http://www.adobe.com/products/flex</description>
-      <publisher>unknown</publisher>
-      <creator>unknown</creator>
-      <language>EN</language>
+      <title>Apache Flex Application</title>
+      <description>http://flex.apache.org/</description>
+      <publisher>Apache Software Foundation</publisher>
+      <creator>Apache Software Foundation</creator>
+      <language>en_US</language>
    </metadata>
 
 </flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6cf64f2f/frameworks/experimental-mobile-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/experimental-mobile-manifest.xml b/frameworks/experimental-mobile-manifest.xml
new file mode 100644
index 0000000..68e38b8
--- /dev/null
+++ b/frameworks/experimental-mobile-manifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+
+  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.
+-->
+
+<!--
+    Experimental Mobile Components
+-->
+<componentPackage>
+    <component id="MobileGrid" class="spark.components.MobileGrid"/>
+    <component id="MobileGridColumn" class="spark.components.supportClasses.MobileGridColumn"/>
+    <component id="MobileGridBitmapCellRenderer" class="spark.components.itemRenderers.MobileGridBitmapCellRenderer"/>
+    <component id="MobileGridTextCellRenderer" class="spark.components.itemRenderers.MobileGridTextCellRenderer"/>
+</componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6cf64f2f/frameworks/projects/experimental_mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/build.xml b/frameworks/projects/experimental_mobile/build.xml
index 735e5e2..03a9749 100644
--- a/frameworks/projects/experimental_mobile/build.xml
+++ b/frameworks/projects/experimental_mobile/build.xml
@@ -159,7 +159,11 @@
 		</delete>
 	</target>
 
-	<target name="compile" description="Compiles experimental_mobile.swc">
+    <target name="prepare" description="Copies manifests to project directories so the
IDE can find them">
+        <copy file="${FLEX_HOME}/frameworks/experimental-mobile-manifest.xml" tofile="${basedir}/manifest.xml"
overwrite="true"/>
+    </target>
+
+	<target name="compile" depends="prepare" description="Compiles experimental_mobile.swc">
 		<echo message="Compiling frameworks/libs/experimental_mobile.swc"/>
         <echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6cf64f2f/frameworks/projects/experimental_mobile/manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/manifest.xml b/frameworks/projects/experimental_mobile/manifest.xml
index e4762f6..68e38b8 100644
--- a/frameworks/projects/experimental_mobile/manifest.xml
+++ b/frameworks/projects/experimental_mobile/manifest.xml
@@ -21,8 +21,8 @@
     Experimental Mobile Components
 -->
 <componentPackage>
-    <component class="spark.components.MobileGrid"/>
-    <component class="spark.components.supportClasses.MobileGridColumn"/>
-    <component class="spark.components.itemRenderers.MobileGridBitmapCellRenderer"/>
-    <component class="spark.components.itemRenderers.MobileGridTextCellRenderer"/>
+    <component id="MobileGrid" class="spark.components.MobileGrid"/>
+    <component id="MobileGridColumn" class="spark.components.supportClasses.MobileGridColumn"/>
+    <component id="MobileGridBitmapCellRenderer" class="spark.components.itemRenderers.MobileGridBitmapCellRenderer"/>
+    <component id="MobileGridTextCellRenderer" class="spark.components.itemRenderers.MobileGridTextCellRenderer"/>
 </componentPackage>


Mime
View raw message