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 12:16:05 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - - Fine tuned the
configuration to produce the same output as the ant build -- Added a missing
dependency to the 'flexjs-externs-goolemaps' dependency
Repository: flex-asjs
Updated Branches:
refs/heads/develop 5c852a8b4 -> 9b365820f
- Fine tuned the configuration to produce the same output as the ant build
-- Added a missing dependency to the 'flexjs-externs-goolemaps' dependency
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87a5b29a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87a5b29a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87a5b29a
Branch: refs/heads/develop
Commit: 87a5b29a62be5d0ef1a00e2da413a6871cc2cd94
Parents: 5c852a8
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Jun 7 13:45:16 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Jun 7 13:45:16 2016 +0200
----------------------------------------------------------------------
frameworks/projects/GoogleMaps/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87a5b29a/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index e5b758a..38911b5 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -95,6 +95,14 @@
<type>swc</type>
<classifier>extern</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-goolemaps</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>extern</classifier>
+ </dependency>
+
</dependencies>
</project>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - - Fine tuned the
configuration to produce the same output as the ant build -- Added the
flat-as-manifest to the build config (but just for AS compilation) -- Made
the basic-as-manifest only get include
Posted by cd...@apache.org.
- Fine tuned the configuration to produce the same output as the ant build
-- Added the flat-as-manifest to the build config (but just for AS compilation)
-- Made the basic-as-manifest only get included in AS builds
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b365820
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b365820
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b365820
Branch: refs/heads/develop
Commit: 9b365820fb747d54bedf60d7b39a34f6ead33550
Parents: 87a5b29
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Jun 7 14:15:16 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Jun 7 14:15:16 2016 +0200
----------------------------------------------------------------------
frameworks/projects/Flat/pom.xml | 9 +++++++++
frameworks/projects/HTML/pom.xml | 5 +----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b365820/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 30fcc9c..d27c3fd 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -45,12 +45,21 @@
<uri>library://ns.apache.org/flexjs/flat</uri>
<manifest>${project.basedir}/src/main/resources/flat-manifest.xml</manifest>
</namespace>
+ <namespace>
+ <type>as</type>
+ <uri>library://ns.apache.org/flexjs/flat</uri>
+ <manifest>${project.basedir}/src/main/resources/flat-as-manifest.xml</manifest>
+ </namespace>
</namespaces>
<includeClasses>
<includeClass>FlatClasses</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>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b365820/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index 2e522a2..a140cb2 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -46,6 +46,7 @@
<manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
</namespace>
<namespace>
+ <type>as</type>
<uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>${project.basedir}/src/main/resources/basic-as-manifest.xml</manifest>
</namespace>
@@ -101,7 +102,6 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
- <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -116,7 +116,6 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
- <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -131,7 +130,6 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
- <scope>external</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -146,7 +144,6 @@
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
- <scope>external</scope>
</dependency>
</dependencies>