summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-05-18 12:53:20 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-05-18 12:53:20 +0000
commitddf531d93473f8c10ae563ca28959c5993e0d8e2 (patch)
tree4b29b50df11d52a90ab395e45b57610f8f7e7051 /build.xml
parent3e58057fd1dd2149b5c63ad053986948fe2da691 (diff)
downloadscala-ddf531d93473f8c10ae563ca28959c5993e0d8e2.tar.gz
scala-ddf531d93473f8c10ae563ca28959c5993e0d8e2.tar.bz2
scala-ddf531d93473f8c10ae563ca28959c5993e0d8e2.zip
Applying the one half of Miles's patch.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml35
1 files changed, 32 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index c47bc7889f..dd0446a839 100644
--- a/build.xml
+++ b/build.xml
@@ -513,7 +513,25 @@ PACKED QUICK BUILD (PACK)
</jar>
</target>
- <target name="pack.pre-comp" depends="pack.lib">
+ <target name="pack.pre-libsrc" depends="pack.start">
+ <uptodate
+ property="pack.libsrc.available"
+ targetfile="${build-pack.dir}/lib/scala-library-src.jar"
+ srcfile="${build-quick.dir}/librarysrc.complete"/>
+ </target>
+
+ <target name="pack.libsrc" depends="pack.pre-libsrc">
+ <mkdir dir="${build-pack.dir}/src"/>
+ <jar destfile="${build-pack.dir}/src/scala-library-src.jar">
+ <fileset dir="${src.dir}/library"/>
+ <fileset dir="${src.dir}/actors"/>
+ </jar>
+ <jar destfile="${build-pack.dir}/src/scala-dbc-src.jar">
+ <fileset dir="${src.dir}/dbc"/>
+ </jar>
+ </target>
+
+ <target name="pack.pre-comp" depends="pack.lib">
<uptodate
property="pack.comp.available"
targetfile="${build-pack.dir}/lib/scala-compiler.jar"
@@ -521,8 +539,13 @@ PACKED QUICK BUILD (PACK)
</target>
<target name="pack.comp" depends="pack.pre-comp" unless="pack.comp.available">
- <mkdir dir="${build-pack.dir}/lib"/>
- <jar destfile="${build-pack.dir}/lib/scala-compiler.jar">
+ <mkdir dir="${build-pack.dir}/META-INF"/>
+ <copy file="META-INF/MANIFEST.MF" toDir="${build-pack.dir}/META-INF"/>
+ <manifest file="${build-pack.dir}/META-INF/MANIFEST.MF" mode="update">
+ <attribute name="Bundle-Version" value="${version.number}"/>
+ </manifest>
+ <mkdir dir="${build-pack.dir}/lib"/>
+ <jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
<fileset dir="${build-quick.dir}/classes/compiler"/>
<zipfileset src="${fjbg.jar}"/>
<zipfileset src="${msil.jar}"/>
@@ -598,6 +621,12 @@ PACKED QUICK BUILD (PACK)
</target>
<!-- ===========================================================================
+PACKED QUICK BUILD FOR ECLIPSE PLUGIN DEVELOPMENT (PLUGIN)
+============================================================================ -->
+
+ <target name="plugin.quick" depends="pack.lib, pack.libsrc"/>
+
+<!-- ===========================================================================
BOOTSTRAPPING BUILD (STRAP)
============================================================================ -->