diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-02 13:18:08 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-02 13:18:08 -0700 |
| commit | 40334826eb573eed527cbd396ab406e7376edbcc (patch) | |
| tree | 706a862b6e38f18ac9658ef79492d857d85d4b46 /build.xml | |
| parent | 03f32bd22f85bf3a6f8824dbe4a7a989e717c071 (diff) | |
| parent | 9452d939331ee28313f0c9b2de260ee32d46af27 (diff) | |
| download | scala-40334826eb573eed527cbd396ab406e7376edbcc.tar.gz scala-40334826eb573eed527cbd396ab406e7376edbcc.tar.bz2 scala-40334826eb573eed527cbd396ab406e7376edbcc.zip | |
Merge branch 'develop'
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 23 |
1 files changed, 21 insertions, 2 deletions
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="sabbus" default="build"> +<project name="sabbus" default="build" xmlns:artifact="urn:maven-artifact-ant"> <description> SuperSabbus for Scala core, builds the scala library and compiler. It can also package it as a simple distribution, tests it for stable bootstrapping and against the Scala test suite. </description> @@ -238,6 +238,19 @@ INITIALISATION </touch> </target> + <!-- Add our maven ant tasks --> + <target name="init.maven.tasks" depends="init.jars.check"> + <path id="maven-ant-tasks.classpath" path="${lib.dir}/ant/maven-ant-tasks-2.1.1.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> + </target> + + <!-- Resolve maven dependencies --> + <target name="init.maven.jars" depends="init.maven.tasks"> + <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset"> + <dependency groupId="org.skife.com.typesafe.config" artifactId="typesafe-config" version="0.3.0"/> + </artifact:dependencies> + </target> + <!-- Determines OSGi string + maven extension. --> <target name="init.hasbuildnum"> <condition property="version.hasbuildnum"> @@ -296,7 +309,7 @@ INITIALISATION <target name="init.version.done" depends="init.version.release, init.version.snapshot"/> - <target name="init" depends="init.jars, init.version.done"> + <target name="init" depends="init.jars, init.maven.jars, init.version.done"> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. --> <property name="scalac.args.optimise" value=""/> <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.) @@ -337,6 +350,7 @@ INITIALISATION </fileset> <pathelement location="${ant.jar}"/> <path refid="lib.extra"/> + <path refid="dependency.classpath"/> </path> <!-- And print-out what we are building --> @@ -1002,6 +1016,11 @@ PACKED QUICK BUILD (PACK) <target name="pack.lib" depends="pack.pre-lib" unless="pack.lib.available"> <mkdir dir="${build-pack.dir}/lib"/> + <!-- First copy maven dependencies --> + <copy todir="${build-pack.dir}/lib"> + <fileset refid="dependency.fileset" /> + <mapper type="flatten" /> + </copy> <jar destfile="${build-pack.dir}/lib/scala-library.jar"> <fileset dir="${build-quick.dir}/classes/library"> <exclude name="scala/dbc/**"/> |