- Added the packaging of the config xml files in the framework directroy as a "org.apache.flex.flexjs.framework:framework" artifact.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/58c24a20 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/58c24a20 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/58c24a20 Branch: refs/heads/master Commit: 58c24a201650b48c537461bdffcb80fc95934e70 Parents: 5c13f2b Author: Christofer Dutz <[email protected]> Authored: Tue Sep 22 19:45:39 2015 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue Sep 22 19:45:39 2015 +0200 ---------------------------------------------------------------------- maven.xml | 36 +++++++++++++++++++++++++++++++ maven/flexjs-framework-framework.pom | 11 ++++++++++ maven/flexjs-framework.pom | 6 ++++++ 3 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven.xml ---------------------------------------------------------------------- diff --git a/maven.xml b/maven.xml index 4f8d48a..c9818b5 100644 --- a/maven.xml +++ b/maven.xml @@ -144,6 +144,19 @@ <param name="fileName" value="frameworks/libs/Network.swc"/> </antcall> + <!-- Zip up the config-xmls --> + <copy file="maven/flexjs-framework-framework.pom" tofile="generated/maven/flexjs-framework-framework.pom"> + <filterchain> + <tokenfilter> + <replacestring from="@VERSION@" to="${maven.version}"/> + </tokenfilter> + </filterchain> + </copy> + <zip destfile="generated/maven/flexjs-framework-framework-configs.zip"> + <fileset dir="frameworks" includes="*.xml"/> + <fileset dir="frameworks" includes="projects/*/*-manifest.xml"/> + </zip> + <copy file="maven/flexjs-framework.pom" tofile="generated/maven/flexjs-framework.pom"> <filterchain> <tokenfilter> @@ -244,6 +257,8 @@ <param name="artifactExtension" value="swc"/> </antcall> + <antcall target="-install-maven-framework-config-artifact"/> + <antcall target="-install-maven-artifact-pom"> <param name="artifactName" value="flexjs-framework"/> </antcall> @@ -316,6 +331,8 @@ <param name="artifactName" value="network"/> </antcall> + <antcall target="-deploy-maven-framework-config-artifact"/> + <antcall target="-deploy-maven-artifact-pom"> <param name="artifactName" value="flexjs-framework"/> </antcall> @@ -393,6 +410,15 @@ </artifact:install> </target> + <target name="-install-maven-framework-config-artifact" depends="-setup-aether-antlib" + xmlns:artifact="antlib:org.eclipse.aether.ant"> + <echo message="Installing Framework config"/> + <artifact:install> + <artifact:pom file="generated/maven/flexjs-framework-framework.pom"/> + <artifact:artifact file="generated/maven/flexjs-framework-framework-configs.zip" classifier="configs"/> + </artifact:install> + </target> + <target name="-install-maven-artifact-file-with-sources" depends="-setup-aether-antlib" xmlns:artifact="antlib:org.eclipse.aether.ant"> <echo message="Installing File: ${artifactName}"/> @@ -412,6 +438,16 @@ </artifact:deploy> </target> + <target name="-deploy-maven-framework-config-artifact" depends="-setup-aether-antlib" + xmlns:artifact="antlib:org.eclipse.aether.ant"> + <echo message="Deploying Framework config"/> + <artifact:install> + <artifact:remoterepo id="${maven.repositoryId}" url="${maven.repositoryUrl}"/> + <artifact:pom file="generated/maven/flexjs-framework-framework.pom"/> + <artifact:artifact file="generated/maven/flexjs-framework-framework-configs.zip" classifier="configs"/> + </artifact:install> + </target> + <target name="-deploy-maven-artifact-file" depends="-setup-aether-antlib" xmlns:artifact="antlib:org.eclipse.aether.ant"> <echo message="Deploying File: ${artifactName} to ${maven.repositoryUrl}"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven/flexjs-framework-framework.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-framework-framework.pom b/maven/flexjs-framework-framework.pom new file mode 100644 index 0000000..163c4b3 --- /dev/null +++ b/maven/flexjs-framework-framework.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>framework</artifactId> + <version>@VERSION@</version> + <packaging>pom</packaging> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven/flexjs-framework.pom ---------------------------------------------------------------------- diff --git a/maven/flexjs-framework.pom b/maven/flexjs-framework.pom index 970e3e6..6466756 100644 --- a/maven/flexjs-framework.pom +++ b/maven/flexjs-framework.pom @@ -36,6 +36,12 @@ <dependencies> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>framework</artifactId> + <version>@VERSION@</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>binding</artifactId> <version>@VERSION@</version> <type>swc</type>
