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 2014/10/03 11:46:35 UTC
git commit: [flex-falcon] [refs/heads/falcon-antlr4] - - Added
automatic maven pom generation.
Repository: flex-falcon
Updated Branches:
refs/heads/falcon-antlr4 1908d8ca2 -> f14a80349
- Added automatic maven pom generation.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f14a8034
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f14a8034
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f14a8034
Branch: refs/heads/falcon-antlr4
Commit: f14a803494431c6160179c95a73b8944bcc13a57
Parents: 1908d8c
Author: cdutz <ch...@c-ware.de>
Authored: Fri Oct 3 11:46:22 2014 +0200
Committer: cdutz <ch...@c-ware.de>
Committed: Fri Oct 3 11:46:22 2014 +0200
----------------------------------------------------------------------
build.properties | 2 +-
build.xml | 50 ++++++++++++++++++++++++++++++++++++++++++-
compiler.tests/build.xml | 2 +-
3 files changed, 51 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f14a8034/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 551dea9..4b2ff42 100644
--- a/build.properties
+++ b/build.properties
@@ -17,4 +17,4 @@
##
################################################################################
-release.version = 0.0.2
+release.version = 0.0.2-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f14a8034/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index bf5c809..0701ab3 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,7 @@
-->
-<project name="falcon" default="main" basedir=".">
+<project name="falcon" default="main" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property file="${basedir}/env.properties"/>
<property environment="env"/>
@@ -691,4 +691,52 @@
</exec>
</target>
+ <!--
+ Part of the build that deals with packaging and deploying the artifacts in a maven-friendly way.
+ -->
+
+ <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.3.jar"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <!-- prepare the maven artifacts -->
+ <target name="maven-package" depends="main">
+ <mkdir dir="maven"/>
+ <!--
+ There seems to be a bug in the ant maven tasks, that makes it necessary
+ to write the pom to disk first and then to use that for deploying.
+ -->
+ <artifact:pom id="falcon.pom.data"
+ groupid="org.apache.flex.compiler" artifactid="falcon-compiler"
+ version="${release.version}" packaging="jar">
+ <artifact:dependency groupId="commons-io" artifactId="commons-io" version="2.4"/>
+ <artifact:dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
+ <artifact:dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/>
+ <artifact:dependency groupId="org.sonatype.sisu" artifactId="sisu-guava" version="0.9.9"/>
+ <artifact:dependency groupId="net.sourceforge.jburg" artifactId="jburg" version="1.10.1"/>
+ <artifact:dependency groupId="de.jflex" artifactId="jflex" version="1.6.0"/>
+ <artifact:dependency groupId="org.b1.pack" artifactId="lzma-sdk-4j" version="9.22.0"/>
+ </artifact:pom>
+ <artifact:writepom id="falcon.pom.on.disk" pomrefid="falcon.pom.data" file="maven/falcon-compiler.pom"/>
+ <artifact:pom id="falcon.pom" file="maven/falcon-compiler.pom"/>
+
+ <!--
+ We deploy JBurg without dependencies as ideally we shouldn't need it at all.
+ -->
+ <artifact:pom id="jburg.pom" groupid="net.sourceforge.jburg" artifactid="jburg"
+ version="1.10.1" packaging="jar"/>
+ </target>
+
+ <!-- install the maven artifacts locally -->
+ <target name="maven-install" depends="maven-package">
+ <artifact:install file="compiler/lib/jburg.jar" pomrefid="jburg.pom"/>
+ <artifact:install file="compiler/generated/dist/sdk/lib/compiler.jar" pomrefid="falcon.pom"/>
+ </target>
+
+ <!-- deploy the maven artifacts to a remote maven repository -->
+ <target name="maven-deploy" depends="maven-package">
+ <artifact:deploy file="compiler/generated/dist/sdk/lib/compiler.jar" pomrefid="falcon.pom"/>
+ </target>
+
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f14a8034/compiler.tests/build.xml
----------------------------------------------------------------------
diff --git a/compiler.tests/build.xml b/compiler.tests/build.xml
index 6801404..d3acd6c 100644
--- a/compiler.tests/build.xml
+++ b/compiler.tests/build.xml
@@ -41,7 +41,7 @@
<condition property="playerglobal.version" value="${env.PLAYERGLOBAL_VERSION}">
<isset property="env.PLAYERGLOBAL_VERSION" />
</condition>
- <property name="playerglobal.version" value="11.1" />
+ <property name="playerglobal.version" value="13.0" />
<property name="compiler" value="${compiler.tests}/../compiler"/>
<property name="falcon" value="${compiler}/generated/dist/sdk"/>