You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/06/07 11:26:40 UTC
git commit: [flex-asjs] [refs/heads/develop] - - Fine tuned the
configuration to produce the same output as the ant build -- Added
'include-file' elements to include the javascript and css files
Repository: flex-asjs
Updated Branches:
refs/heads/develop 63a3e201c -> 5c852a8b4
- Fine tuned the configuration to produce the same output as the ant build
-- Added 'include-file' elements to include the javascript and css files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c852a8b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c852a8b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c852a8b
Branch: refs/heads/develop
Commit: 5c852a8b4b4601fe7fdb3febe6b396e8c0364a70
Parents: 63a3e20
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Jun 7 13:26:25 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Jun 7 13:26:25 2016 +0200
----------------------------------------------------------------------
frameworks/projects/Binding/pom.xml | 8 +++++++-
frameworks/projects/Charts/pom.xml | 6 ++++++
frameworks/projects/Collections/pom.xml | 6 ++++++
frameworks/projects/Core/pom.xml | 9 ++++++++-
frameworks/projects/CreateJS/pom.xml | 10 ++++++++++
frameworks/projects/DragDrop/pom.xml | 6 ++++++
frameworks/projects/Effects/pom.xml | 6 ++++++
frameworks/projects/Flat/pom.xml | 6 ++++++
frameworks/projects/Formatters/pom.xml | 6 ++++++
frameworks/projects/GoogleMaps/pom.xml | 10 ++++++++++
frameworks/projects/Graphics/pom.xml | 6 ++++++
frameworks/projects/HTML/pom.xml | 18 ++++++++++++++++++
frameworks/projects/HTML5/pom.xml | 10 ++++++++++
frameworks/projects/JQuery/pom.xml | 10 ++++++++++
frameworks/projects/Mobile/pom.xml | 10 ++++++++++
frameworks/projects/Network/pom.xml | 6 ++++++
frameworks/projects/Reflection/pom.xml | 6 ++++++
frameworks/projects/Storage/pom.xml | 10 ++++++++++
frameworks/projects/XML/pom.xml | 8 +++++++-
19 files changed, 154 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Binding/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index d68bb46..7390ec1 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/pom.xml
@@ -40,13 +40,19 @@
<version>0.7.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <includeSources>true</includeSources>
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
</namespace>
</namespaces>
+ <includeSources>true</includeSources>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index 8c3f769..a3879e2 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>ChartsClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Collections/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index 4ed200e..7dba653 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>CollectionsClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Core/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index 70d7d57..16779a7 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>CoreClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
<skipExtern>false</skipExtern>
</configuration>
<dependencies>
@@ -68,7 +74,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <!--scope>external</scope-->
+ <scope>external</scope>
</dependency>
<dependency>
@@ -85,6 +91,7 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
+ <scope>external</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index 6fd5564..02f8dc1 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -49,6 +49,16 @@
<includeClasses>
<includeClass>CreateJSClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/DragDrop/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index dd92d08..74bc925 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>DragDropClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index 3f24da5..b1d8ea3 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>EffectsClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index a578be2..30fcc9c 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>FlatClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index bfc7235..204d6c6 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>FormattersClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index 0bd176b..e5b758a 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -50,6 +50,16 @@
<includeClass>GoogleStubClasses</includeClass>
<includeClass>GoogleMapsClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Graphics/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index ec7a8cd..58f6635 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>GraphicsClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index 2762420..2e522a2 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -46,6 +46,10 @@
<manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
</namespace>
<namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>${project.basedir}/src/main/resources/basic-as-manifest.xml</manifest>
+ </namespace>
+ <namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
<manifest>${project.basedir}/src/main/resources/svg-manifest.xml</manifest>
</namespace>
@@ -53,6 +57,16 @@
<includeClasses>
<includeClass>HTMLClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
@@ -87,6 +101,7 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
+ <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -101,6 +116,7 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
+ <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -115,6 +131,7 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
+ <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -129,6 +146,7 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
+ <scope>external</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/HTML5/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml
index f195b0b..692d4ee 100644
--- a/frameworks/projects/HTML5/pom.xml
+++ b/frameworks/projects/HTML5/pom.xml
@@ -49,6 +49,16 @@
<includeClasses>
<includeClass>HTML5Classes</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/JQuery/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml
index b4e203d..f67cd83 100644
--- a/frameworks/projects/JQuery/pom.xml
+++ b/frameworks/projects/JQuery/pom.xml
@@ -49,6 +49,16 @@
<includeClasses>
<includeClass>JQueryClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Mobile/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml
index 55a1e25..3c65ccc 100644
--- a/frameworks/projects/Mobile/pom.xml
+++ b/frameworks/projects/Mobile/pom.xml
@@ -53,6 +53,16 @@
<includeClasses>
<includeClass>MobileClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Network/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml
index 248b441..3300fd8 100644
--- a/frameworks/projects/Network/pom.xml
+++ b/frameworks/projects/Network/pom.xml
@@ -49,6 +49,12 @@
<includeClasses>
<includeClass>NetworkClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Reflection/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml
index 4fde1ef..6e0002d 100644
--- a/frameworks/projects/Reflection/pom.xml
+++ b/frameworks/projects/Reflection/pom.xml
@@ -41,6 +41,12 @@
<extensions>true</extensions>
<configuration>
<includeSources>true</includeSources>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/Storage/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml
index 43d9aac..c34ab41 100644
--- a/frameworks/projects/Storage/pom.xml
+++ b/frameworks/projects/Storage/pom.xml
@@ -49,6 +49,16 @@
<includeClasses>
<includeClass>StorageClasses</includeClass>
</includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c852a8b/frameworks/projects/XML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml
index b3b8943..41943f0 100644
--- a/frameworks/projects/XML/pom.xml
+++ b/frameworks/projects/XML/pom.xml
@@ -40,13 +40,19 @@
<version>0.7.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <includeSources>true</includeSources>
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
</namespace>
</namespaces>
+ <includeSources>true</includeSources>
+ <includeFiles>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+ </includeFiles>
</configuration>
<dependencies>
<dependency>