flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - - Added keepAs3Metadata as config option - Added 'Mixin' as new keepable metadata - Removed the error report from the examples that now no longer produce errors - Introduced two new profiles 'build-examples'
Date Fri, 08 Jul 2016 08:17:55 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 9e43d9a58 -> 18ee460ff


- Added keepAs3Metadata as config option
- Added 'Mixin' as new keepable metadata
- Removed the error report from the examples that now no longer produce errors
- Introduced two new profiles 'build-examples' and 'build-distribution' to enable/disable
building of parts of the sdk
- Added fonts to the distribution


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/18ee460f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/18ee460f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/18ee460f

Branch: refs/heads/develop
Commit: 18ee460fff622ed56548288686e488cf730dbaab
Parents: 9e43d9a
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Fri Jul 8 10:17:47 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Fri Jul 8 10:17:47 2016 +0200

----------------------------------------------------------------------
 distribution/pom.xml                         | 14 +++++++++++
 distribution/src/main/assembly/component.xml | 17 +++++++++++++
 examples/flexjs/DesktopMap/pom.xml           |  6 -----
 examples/flexjs/MapSearch/pom.xml            |  4 ---
 examples/flexjs/StorageExample/pom.xml       |  6 +----
 pom.xml                                      | 30 +++++++++++++++++++++--
 6 files changed, 60 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 768956d..5e13708 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -370,6 +370,20 @@
       <type>swc</type>
       <classifier>extern</classifier>
     </dependency>
+
+    <!-- Fonts -->
+    <dependency>
+      <groupId>org.apache.flex.flexjs.framework</groupId>
+      <artifactId>Fonts</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
+      <type>swf</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.flex.flexjs.framework</groupId>
+      <artifactId>Fonts</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/distribution/src/main/assembly/component.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index 63ee1c3..a960a12 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -85,6 +85,23 @@ under the License.
         <include>org.apache.flex.flexjs.externs:*:swc</include>
       </includes>
     </dependencySet>
+
+    <!-- Copy the fonts -->
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>frameworks/fonts</outputDirectory>
+      <includes>
+        <include>org.apache.flex.flexjs.framework:Fonts:swf</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>frameworks/fonts</outputDirectory>
+      <unpack>true</unpack>
+      <includes>
+        <include>org.apache.flex.flexjs.framework:Fonts:war</include>
+      </includes>
+    </dependencySet>
   </dependencySets>
 
   <fileSets>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml
index dc50e20..688f573 100644
--- a/examples/flexjs/DesktopMap/pom.xml
+++ b/examples/flexjs/DesktopMap/pom.xml
@@ -26,12 +26,6 @@
         TODO:
           Flash version:
             Needs AIR
-
-          JavaScript Version:
-            MixinManager.js:46 Uncaught TypeError: Cannot read property 'mixins' of undefined
-            set @ MixinManager.js:46org.apache.flex.core.HTMLElementWrapper.addBead @ HTMLElementWrapper.js:108
-            org.apache.flex.core.Application.start @ Application.js:226
-            (anonymous function) @ index.html:148
   -->
 
   <parent>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml
index a5cfca4..6f6280d 100644
--- a/examples/flexjs/MapSearch/pom.xml
+++ b/examples/flexjs/MapSearch/pom.xml
@@ -30,10 +30,6 @@
           base.js:2189 Uncaught TypeError: Cannot read property 'prototype' of undefined
             goog.inherits @ base.js:2189
             (anonymous function) @ Marker.js:26
-          MixinManager.js:46 Uncaught TypeError: Cannot read property 'mixins' of undefined
-            set @ MixinManager.js:46org.apache.flex.core.HTMLElementWrapper.addBead @ HTMLElementWrapper.js:108
-            org.apache.flex.core.Application.start @ Application.js:226
-            (anonymous function) @ index.html:149
   -->
 
   <parent>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/examples/flexjs/StorageExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml
index e802d1b..85eb7e1 100644
--- a/examples/flexjs/StorageExample/pom.xml
+++ b/examples/flexjs/StorageExample/pom.xml
@@ -25,11 +25,7 @@
   <!--
         TODO:
         JavaScript Version:
-          MixinManager.js:47 Uncaught TypeError: Cannot read property 'mixins' of undefined
-            set @ MixinManager.js:47
-            org.apache.flex.core.HTMLElementWrapper.addBead @ HTMLElementWrapper.js:112
-            org.apache.flex.core.Application.start @ Application.js:232
-            (anonymous function) @ index.html:156
+          Needs to be packaged with Cordova
   -->
 
   <parent>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18ee460f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 844a50e..749ef67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,12 @@
   <name>Apache Flex - ASJS</name>
   <description>The Apache Flex ASJS Project</description>
 
+  <!--
+        This build builds only the framework libraries per default.
+        - In order to build the examples, activate the "build-examples" profile
+        - In order to assemble a distribution, activate the "build-distribution" profile.
+  -->
+
   <scm>
     <connection>scm:git://git.apache.org/flex-asjs.git</connection>
     <developerConnection>scm:git://git.apache.org/flex-asjs.git</developerConnection>
@@ -91,8 +97,6 @@
   </mailingLists>
 
   <modules>
-    <module>distribution</module>
-    <module>examples</module>
     <module>frameworks</module>
   </modules>
 
@@ -107,6 +111,14 @@
           <configuration>
             <targetPlayer>${flash.version}</targetPlayer>
             <debug>${flex.debug}</debug>
+            <keepAs3Metadata>
+              <name>Bindable</name>
+              <name>Managed</name>
+              <name>ChangeEvent</name>
+              <name>NonCommittingChangeEvent</name>
+              <name>Transient</name>
+              <name>Mixin</name>
+            </keepAs3Metadata>
           </configuration>
           <dependencies>
             <dependency>
@@ -127,6 +139,20 @@
         <flex.debug>false</flex.debug>
       </properties>
     </profile>
+
+    <profile>
+      <id>build-examples</id>
+      <modules>
+        <module>examples</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>build-distribution</id>
+      <modules>
+        <module>distribution</module>
+      </modules>
+    </profile>
   </profiles>
 
   <repositories>


Mime
View raw message