Repository: flex-asjs Updated Branches: refs/heads/develop d2cc69432 -> d00203a53
Adjusted the maven artifact generation to the latest changes. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/866e6c0d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/866e6c0d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/866e6c0d Branch: refs/heads/develop Commit: 866e6c0dccfce088bff5664d546dfe749a86173d Parents: fe4cd22 Author: Christofer Dutz <[email protected]> Authored: Fri May 8 10:04:08 2015 +0200 Committer: Christofer Dutz <[email protected]> Committed: Fri May 8 10:04:08 2015 +0200 ---------------------------------------------------------------------- maven.xml | 222 ++++++++++++++++++++++++++++++++---- maven/flexjs-artifact.pom | 11 ++ maven/flexjs-framework.pom | 88 ++++++++++++-- maven/flexjs-js.pom | 11 -- maven/flexjs-jx.pom | 11 -- maven/flexjs-mxmlc-classes.pom | 11 -- maven/flexjs-ui.pom | 11 -- 7 files changed, 286 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven.xml ---------------------------------------------------------------------- diff --git a/maven.xml b/maven.xml index 3fa508f..6198c46 100644 --- a/maven.xml +++ b/maven.xml @@ -49,24 +49,96 @@ <mkdir dir="generated/maven"/> <antcall target="-pack-maven-artifact"> - <param name="moduleName" value="FlexJSJX"/> - <param name="artifactName" value="flexjs-jx"/> - <param name="fileName" value="frameworks/as/libs/FlexJSJX.swc"/> + <param name="moduleName" value="Binding"/> + <param name="artifactName" value="binding"/> + <param name="fileName" value="frameworks/libs/Binding.swc"/> </antcall> <antcall target="-pack-maven-artifact"> - <param name="moduleName" value="FlexJSUI"/> - <param name="artifactName" value="flexjs-ui"/> - <param name="fileName" value="frameworks/as/libs/FlexJSUI.swc"/> + <param name="moduleName" value="Charts"/> + <param name="artifactName" value="charts"/> + <param name="fileName" value="frameworks/libs/Charts.swc"/> </antcall> <antcall target="-pack-maven-artifact"> - <param name="moduleName" value="MXMLCClasses"/> - <param name="artifactName" value="flexjs-mxmlc-classes"/> - <param name="fileName" value="frameworks/as/libs/MXMLCClasses.swc"/> + <param name="moduleName" value="Collections"/> + <param name="artifactName" value="collections"/> + <param name="fileName" value="frameworks/libs/Collections.swc"/> </antcall> - <copy file="maven/flexjs-js.pom" tofile="generated/maven/flexjs-js.pom"> + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Core"/> + <param name="artifactName" value="core"/> + <param name="fileName" value="frameworks/libs/Core.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="CreateJS"/> + <param name="artifactName" value="createjs"/> + <param name="fileName" value="frameworks/libs/CreateJS.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="DragDrop"/> + <param name="artifactName" value="dragdrop"/> + <param name="fileName" value="frameworks/libs/DragDrop.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Effects"/> + <param name="artifactName" value="effects"/> + <param name="fileName" value="frameworks/libs/Effects.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Formatters"/> + <param name="artifactName" value="formatters"/> + <param name="fileName" value="frameworks/libs/Formatters.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="GoogleMaps"/> + <param name="artifactName" value="googlemaps"/> + <param name="fileName" value="frameworks/libs/GoogleMaps.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Graphics"/> + <param name="artifactName" value="graphics"/> + <param name="fileName" value="frameworks/libs/Graphics.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="HTML"/> + <param name="artifactName" value="html"/> + <param name="fileName" value="frameworks/libs/HTML.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="HTML5"/> + <param name="artifactName" value="html5"/> + <param name="fileName" value="frameworks/libs/HTML5.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="JQuery"/> + <param name="artifactName" value="jquery"/> + <param name="fileName" value="frameworks/libs/JQuery.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Mobile"/> + <param name="artifactName" value="mobile"/> + <param name="fileName" value="frameworks/libs/Mobile.swc"/> + </antcall> + + <antcall target="-pack-maven-artifact"> + <param name="moduleName" value="Network"/> + <param name="artifactName" value="network"/> + <param name="fileName" value="frameworks/libs/Network.swc"/> + </antcall> + + <copy file="maven/flexjs-framework.pom" tofile="generated/maven/flexjs-framework.pom"> <filterchain> <tokenfilter> <replacestring from="@VERSION@" to="${maven.version}"/> @@ -87,23 +159,78 @@ <echo message="Installing Maven artifacts ..."/> <antcall target="-install-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-jx"/> + <param name="artifactName" value="binding"/> <param name="artifactExtension" value="swc"/> </antcall> <antcall target="-install-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-ui"/> + <param name="artifactName" value="charts"/> <param name="artifactExtension" value="swc"/> </antcall> <antcall target="-install-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-mxmlc-classes"/> + <param name="artifactName" value="collections"/> <param name="artifactExtension" value="swc"/> </antcall> - <antcall target="-install-maven-artifact-file"> - <param name="artifactName" value="flexjs-js"/> - <param name="artifactExtension" value="jar"/> + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="core"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="createjs"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="dragdrop"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="effects"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="formatters"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="googlemaps"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="graphics"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="html"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="html5"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="jquery"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="mobile"/> + <param name="artifactExtension" value="swc"/> + </antcall> + + <antcall target="-install-maven-artifact-file-with-sources"> + <param name="artifactName" value="network"/> + <param name="artifactExtension" value="swc"/> </antcall> <antcall target="-install-maven-artifact-pom"> @@ -115,19 +242,63 @@ <echo message="Deploying Maven artifacts to repository with id ${maven.repositoryId} and url ${maven.repositoryUrl} ..."/> <antcall target="-deploy-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-jx"/> + <param name="artifactName" value="binding"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="charts"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="collections"/> </antcall> <antcall target="-deploy-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-ui"/> + <param name="artifactName" value="core"/> </antcall> <antcall target="-deploy-maven-artifact-file-with-sources"> - <param name="artifactName" value="flexjs-mxmlc-classes"/> + <param name="artifactName" value="createjs"/> </antcall> - <antcall target="-deploy-maven-artifact-file"> - <param name="artifactName" value="flexjs-js"/> + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="dragdrop"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="effects"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="formatters"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="googlemaps"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="graphics"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="html"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="html5"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="jquery"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="mobile"/> + </antcall> + + <antcall target="-deploy-maven-artifact-file-with-sources"> + <param name="artifactName" value="network"/> </antcall> <antcall target="-deploy-maven-artifact-pom"> @@ -162,17 +333,19 @@ <target name="-pack-maven-artifact"> <echo message="Packing module ${moduleName} as Maven artifact ${artifactName}"/> - <copy file="maven/${artifactName}.pom" tofile="generated/maven/${artifactName}.pom"> + <copy file="maven/flexjs-artifact.pom" tofile="generated/maven/${artifactName}.pom"> <filterchain> <tokenfilter> + <replacestring from="@ARTIFACT@" to="${artifactName}"/> <replacestring from="@VERSION@" to="${maven.version}"/> </tokenfilter> </filterchain> </copy> <copy file="${fileName}" tofile="generated/maven/${artifactName}.swc"/> <zip destfile="generated/maven/${artifactName}-sources.jar"> - <fileset dir="frameworks/as/projects/${moduleName}/src"/> - <!--fileset dir="${moduleName}/generated/src"/--> + <fileset dir="frameworks/projects/${moduleName}/as/src"/> + <fileset dir="frameworks/projects/${moduleName}/asjs/src" erroronmissingdir="false"/> + <fileset dir="frameworks/projects/${moduleName}/js/src"/> </zip> </target> @@ -181,6 +354,7 @@ <copy file="maven/${artifactName}.pom" tofile="generated/maven/${artifactName}.pom"> <filterchain> <tokenfilter> + <replacestring from="@ARTIFACT@" to="${artifactName}"/> <replacestring from="@VERSION@" to="${maven.version}"/> </tokenfilter> </filterchain> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-artifact.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-artifact.pom b/maven/flexjs-artifact.pom new file mode 100644 index 0000000..81534b6 --- /dev/null +++ b/maven/flexjs-artifact.pom @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>@ARTIFACT@</artifactId> + <version>@VERSION@</version> + <packaging>swc</packaging> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-framework.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-framework.pom b/maven/flexjs-framework.pom index c5d0039..86941cf 100644 --- a/maven/flexjs-framework.pom +++ b/maven/flexjs-framework.pom @@ -9,8 +9,8 @@ <version>14</version> </parent> - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-framework</artifactId> + <groupId>org.apache.flex.flexjs</groupId> + <artifactId>framework</artifactId> <version>@VERSION@</version> <packaging>pom</packaging> @@ -35,28 +35,94 @@ <dependencies> <dependency> - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-jx</artifactId> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>binding</artifactId> <version>@VERSION@</version> <type>swc</type> </dependency> <dependency> - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-ui</artifactId> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>charts</artifactId> <version>@VERSION@</version> <type>swc</type> </dependency> <dependency> - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-mxmlc-classes</artifactId> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>collections</artifactId> <version>@VERSION@</version> <type>swc</type> </dependency> <dependency> - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-js</artifactId> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>core</artifactId> <version>@VERSION@</version> - <type>jar</type> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>createjs</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>dragdrop</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>effects</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>formatters</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>googlemaps</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>graphics</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>html</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>html5</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>jquery</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>mobile</artifactId> + <version>@VERSION@</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>network</artifactId> + <version>@VERSION@</version> + <type>swc</type> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-js.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-js.pom b/maven/flexjs-js.pom deleted file mode 100644 index 87c8aaf..0000000 --- a/maven/flexjs-js.pom +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-js</artifactId> - <version>@VERSION@</version> - <packaging>jar</packaging> - -</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-jx.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-jx.pom b/maven/flexjs-jx.pom deleted file mode 100644 index ccae6f3..0000000 --- a/maven/flexjs-jx.pom +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-jx</artifactId> - <version>@VERSION@</version> - <packaging>swc</packaging> - -</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-mxmlc-classes.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-mxmlc-classes.pom b/maven/flexjs-mxmlc-classes.pom deleted file mode 100644 index 40fa9cc..0000000 --- a/maven/flexjs-mxmlc-classes.pom +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-mxmlc-classes</artifactId> - <version>@VERSION@</version> - <packaging>swc</packaging> - -</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866e6c0d/maven/flexjs-ui.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-ui.pom b/maven/flexjs-ui.pom deleted file mode 100644 index aba6615..0000000 --- a/maven/flexjs-ui.pom +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.flex.framework.flexjs</groupId> - <artifactId>flexjs-ui</artifactId> - <version>@VERSION@</version> - <packaging>swc</packaging> - -</project>
