You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/02/10 21:56:44 UTC
[4/4] git commit: [flex-asjs] [refs/heads/dual] - get Maven builds to
work now that Basic holds most of the components that HTML did but back to
being unwrapped
get Maven builds to work now that Basic holds most of the components that HTML did but back to being unwrapped
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d2c7a7e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d2c7a7e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d2c7a7e2
Branch: refs/heads/dual
Commit: d2c7a7e229ab97d5cd2b1017b538ce2fc25765e4
Parents: 567aa48
Author: Alex Harui <ah...@apache.org>
Authored: Fri Feb 10 13:56:26 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Feb 10 13:56:26 2017 -0800
----------------------------------------------------------------------
build.xml | 5 ++++-
examples/build.xml | 6 ++++++
frameworks/projects/Charts/pom.xml | 4 ++--
frameworks/projects/CreateJS/pom.xml | 4 ++--
frameworks/projects/Effects/pom.xml | 4 ++--
frameworks/projects/Express/pom.xml | 4 ++--
frameworks/projects/Flat/pom.xml | 4 ++--
frameworks/projects/FontAwesome/pom.xml | 4 ++--
frameworks/projects/Formatters/pom.xml | 4 ++--
frameworks/projects/GoogleMaps/pom.xml | 4 ++--
frameworks/projects/HTML/pom.xml | 22 ++++++++++++---------
frameworks/projects/HTML5/pom.xml | 4 ++--
frameworks/projects/JQuery/pom.xml | 4 ++--
frameworks/projects/MaterialDesignLite/pom.xml | 13 ++++++++++++
frameworks/projects/Mobile/pom.xml | 4 ++--
manualtests/build.xml | 1 +
16 files changed, 59 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index befe655..bf4e15f 100644
--- a/build.xml
+++ b/build.xml
@@ -430,12 +430,15 @@
Cleanup
-->
- <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/>
+ <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads.">
+ <delete dir="${basedir}/mustella/tests/basicTests/bin"/>
+ </target>
<target name="thirdparty-clean" description="Removes all thirdparty downloads.">
<ant dir="${basedir}/frameworks" target="thirdparty-clean"/>
<delete dir="${basedir}/in"/>
<delete dir="${basedir}/lib"/>
+ <delete dir="${basedir}/marmotinni/java/lib/selenium/libs"/>
</target>
<target name="clean" depends="examples-clean,frameworks-clean,package-clean,checkintests-clean"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/examples/build.xml
----------------------------------------------------------------------
diff --git a/examples/build.xml b/examples/build.xml
index 13e5a02..422766f 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -82,11 +82,13 @@
<ant dir="${basedir}/flexjs/DataBindingExample_Flat"/>
<ant dir="${basedir}/flexjs/DataGridExample"/>
<ant dir="${basedir}/flexjs/DesktopMap"/>
+ <ant dir="${basedir}/flexjs/FlexTeamPage_MDL"/>
<ant dir="${basedir}/flexjs/FlexWebsiteStatsViewer"/>
<ant dir="${basedir}/flexjs/FlexJSStore"/>
<ant dir="${basedir}/flexjs/FlexJSStore_jquery"/>
<ant dir="${basedir}/flexjs/HelloWorld"/>
<ant dir="${basedir}/flexjs/MapSearch"/>
+ <ant dir="${basedir}/flexjs/MDLExample"/>
<ant dir="${basedir}/flexjs/MobileMap"/>
<ant dir="${basedir}/flexjs/MobileStocks"/>
<ant dir="${basedir}/flexjs/MobileTrader"/>
@@ -94,6 +96,7 @@
<ant dir="${basedir}/flexjs/StorageExample"/>
<ant dir="${basedir}/flexjs/StyleExample"/>
<ant dir="${basedir}/flexjs/TodoListSampleApp"/>
+ <ant dir="${basedir}/flexjs/TeamPage"/>
<ant dir="${basedir}/flexjs/TreeExample"/>
<ant dir="${basedir}/native/ButtonExample"/>
<ant dir="${basedir}/native/USStatesMap"/>
@@ -118,11 +121,13 @@
<ant dir="${basedir}/flexjs/DataBindingExample_Flat" target="clean"/>
<ant dir="${basedir}/flexjs/DataGridExample" target="clean"/>
<ant dir="${basedir}/flexjs/DesktopMap" target="clean"/>
+ <ant dir="${basedir}/flexjs/FlexTeamPage_MDL" target="clean"/>
<ant dir="${basedir}/flexjs/FlexWebsiteStatsViewer" target="clean"/>
<ant dir="${basedir}/flexjs/FlexJSStore" target="clean"/>
<ant dir="${basedir}/flexjs/FlexJSStore_jquery" target="clean"/>
<ant dir="${basedir}/flexjs/HelloWorld" target="clean"/>
<ant dir="${basedir}/flexjs/MapSearch" target="clean"/>
+ <ant dir="${basedir}/flexjs/MDLExample" target="clean"/>
<ant dir="${basedir}/flexjs/MobileTrader" target="clean"/>
<ant dir="${basedir}/flexjs/MobileStocks" target="clean"/>
<ant dir="${basedir}/flexjs/MobileMap" target="clean"/>
@@ -130,6 +135,7 @@
<ant dir="${basedir}/flexjs/StorageExample" target="clean"/>
<ant dir="${basedir}/flexjs/StyleExample" target="clean"/>
<ant dir="${basedir}/flexjs/TodoListSampleApp" target="clean"/>
+ <ant dir="${basedir}/flexjs/TeamPage" target="clean"/>
<ant dir="${basedir}/flexjs/TreeExample" target="clean"/>
<ant dir="${basedir}/native/ButtonExample" target="clean"/>
<ant dir="${basedir}/native/USStatesMap" target="clean"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index 2b4424e..4c86723 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -116,13 +116,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index cd1c3ae..d89a088 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -77,13 +77,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index 3db961f..7237092 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -71,13 +71,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Express/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/pom.xml b/frameworks/projects/Express/pom.xml
index a7cb570..1031992 100644
--- a/frameworks/projects/Express/pom.xml
+++ b/frameworks/projects/Express/pom.xml
@@ -122,13 +122,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 36f8fee..e63eb14 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -101,13 +101,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/FontAwesome/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/FontAwesome/pom.xml b/frameworks/projects/FontAwesome/pom.xml
index 6e06992..9390208 100644
--- a/frameworks/projects/FontAwesome/pom.xml
+++ b/frameworks/projects/FontAwesome/pom.xml
@@ -122,13 +122,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 8fd94d0..5d4a225 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -71,13 +71,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index 71e6134..64b93ab 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -78,13 +78,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index 5eab490..c15805a 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -46,15 +46,6 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
<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>
- <namespace>
- <uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>${project.basedir}/src/main/resources/svg-manifest.xml</manifest>
- </namespace>
</namespaces>
<includeClasses>
<includeClass>HTMLClasses</includeClass>
@@ -123,6 +114,19 @@
<type>swc</type>
<classifier>typedefs</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/HTML5/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml
index d6bfecf..e6a4b2c 100644
--- a/frameworks/projects/HTML5/pom.xml
+++ b/frameworks/projects/HTML5/pom.xml
@@ -77,13 +77,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/JQuery/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml
index 414c049..324ee6a 100644
--- a/frameworks/projects/JQuery/pom.xml
+++ b/frameworks/projects/JQuery/pom.xml
@@ -77,13 +77,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/MaterialDesignLite/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/pom.xml b/frameworks/projects/MaterialDesignLite/pom.xml
index ca2ca23..e619d9b 100644
--- a/frameworks/projects/MaterialDesignLite/pom.xml
+++ b/frameworks/projects/MaterialDesignLite/pom.xml
@@ -122,6 +122,19 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>HTML</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/frameworks/projects/Mobile/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml
index d11f863..a251782 100644
--- a/frameworks/projects/Mobile/pom.xml
+++ b/frameworks/projects/Mobile/pom.xml
@@ -94,13 +94,13 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
+ <artifactId>Basic</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
<classifier>typedefs</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2c7a7e2/manualtests/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/build.xml b/manualtests/build.xml
index ad8350c..fc658f3 100644
--- a/manualtests/build.xml
+++ b/manualtests/build.xml
@@ -104,6 +104,7 @@
<target name="clean" description="Cleans all SWCs and their resource bundles">
<ant dir="${basedir}/ContainerTest" target="clean"/>
+ <ant dir="${basedir}/DataBindingTestbed" target="clean"/>
<ant dir="${basedir}/DateChooserExample" target="clean"/>
<ant dir="${basedir}/EffectsExample" target="clean"/>
<ant dir="${basedir}/FlexJSTest_basic" target="clean"/>