summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2012-03-31 09:57:28 -0400
committerJosh Suereth <joshua.suereth@gmail.com>2012-03-31 09:57:28 -0400
commit69d2999a4b7c8b5e002404437d066fd418b5c1fa (patch)
tree3fb01b11af48873b329e2136b733887d6b81c116 /build.xml
parent724976cab39f006c9bfaffb50ef2e55c1885ad68 (diff)
downloadscala-69d2999a4b7c8b5e002404437d066fd418b5c1fa.tar.gz
scala-69d2999a4b7c8b5e002404437d066fd418b5c1fa.tar.bz2
scala-69d2999a4b7c8b5e002404437d066fd418b5c1fa.zip
Maven repository dependencies are now added to distributions.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index c5850e2000..c1ab09c4e4 100644
--- a/build.xml
+++ b/build.xml
@@ -246,7 +246,7 @@ INITIALISATION
<!-- Resolve maven dependencies -->
<target name="init.maven.jars" depends="init.maven.tasks">
- <artifact:dependencies pathId="dependency.classpath">
+ <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>
@@ -1016,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/**"/>