diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 10:35:55 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 13:00:49 +0200 |
| commit | 8384ebda45724b5a4e47dd2a508ecbbc3bca56f4 (patch) | |
| tree | e272dfcc8c35db3b95b62ae8e4ce26b4b8175f89 /build.xml | |
| parent | 20dd825ec6b5d4015ce36cf4373ba1c1d917da94 (diff) | |
| parent | 139f6bf9d709fc18a23530f2f84afa8a1f97b464 (diff) | |
| download | scala-8384ebda45724b5a4e47dd2a508ecbbc3bca56f4.tar.gz scala-8384ebda45724b5a4e47dd2a508ecbbc3bca56f4.tar.bz2 scala-8384ebda45724b5a4e47dd2a508ecbbc3bca56f4.zip | |
Merge commit '139f6bf' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -273,6 +273,10 @@ TODO: <dependency groupId="org.pantsbuild" artifactId="jarjar" version="1.6.0"/> </artifact:dependencies> + <artifact:dependencies pathId="jarlister.classpath"> + <dependency groupId="com.github.rjolly" artifactId="jarlister_2.11" version="1.0"/> + </artifact:dependencies> + <!-- JUnit --> <property name="junit.version" value="4.12"/> <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset"> @@ -787,6 +791,11 @@ TODO: <path refid="aux.libs"/> </path> + <path id="pack.lib.path"> + <pathelement location="${library.jar}"/> + <path refid="jarlister.classpath"/> + </path> + <path id="pack.bin.tool.path"> <pathelement location="${library.jar}"/> <pathelement location="${xml.jar}"/> @@ -1138,7 +1147,10 @@ TODO: <!-- =========================================================================== PACKED QUICK BUILD (PACK) ============================================================================ --> - <target name="pack.lib" depends="quick.lib"> <staged-pack project="library"/></target> + <target name="pack.lib" depends="quick.lib"> <staged-pack project="library"/> + <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.lib.path"/> + <jarlister file="${library.jar}"/> + </target> <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target> |