summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorRaphael Jolly <rjolly@users.sourceforge.net>2016-02-09 22:16:22 +0100
committerRaphael Jolly <rjolly@users.sourceforge.net>2016-05-21 10:40:07 +0200
commita412ea04ba0ba41dbac469b89e1412f0c56fce3f (patch)
tree2196a33d3d34068731c2b64f911b39c6e4e2a115 /build.xml
parent0d0671ae10ef552d66861248fa087306c960520e (diff)
downloadscala-a412ea04ba0ba41dbac469b89e1412f0c56fce3f.tar.gz
scala-a412ea04ba0ba41dbac469b89e1412f0c56fce3f.tar.bz2
scala-a412ea04ba0ba41dbac469b89e1412f0c56fce3f.zip
Use jarlister in build
The goal of this change is to exercize the "manifest classpath" mechanism, meant to bring the compiler its needed classes as resources, listed in jar manifests, as opposed to files, thus enabling to use the compiler in sandboxed environments (and also the scripting engine for that matter).
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 7b49544447..e0b2f353e1 100644
--- a/build.xml
+++ b/build.xml
@@ -279,6 +279,10 @@ TODO:
<dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/>
</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.11"/>
<artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
@@ -867,6 +871,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}"/>
@@ -1230,7 +1239,10 @@ TODO:
<!-- ===========================================================================
PACKED QUICK BUILD (PACK)
============================================================================ -->
- <target name="pack.lib" depends="quick.lib, forkjoin.done"> <staged-pack project="library"/></target>
+ <target name="pack.lib" depends="quick.lib, forkjoin.done"> <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>