Skip to content
Browse files

Moving most of runtime-bootstrap to the runtime jar, leaving only the…

… Ceylon class loader and launcher
  • Loading branch information...
1 parent 549edd3 commit f836f63210f17f009af3726dd0104950172b8b4e @quintesse quintesse committed Feb 20, 2013
Showing with 28 additions and 13 deletions.
  1. +28 −13 build.xml
View
41 build.xml
@@ -184,6 +184,30 @@
destdir="${build.classes}"
classpathref="compiler.classpath"
includeantruntime="false"/>
+ <javac debug="true"
+ srcdir="${runtime-bootstrap.src}"
+ destdir="${build.classes}"
+ classpathref="compiler.classpath"
+ includeantruntime="false"/>
+ <!-- Need an extra pass for Java 7 testing -->
+ <delete dir="${build.bootstrap}">
+ <include name="**/*Main5.class"/>
+ <include name="**/Java7Checker.class"/>
+ </delete>
+ <javac debug="true"
+ srcdir="${runtime-bootstrap.src}"
+ destdir="${build.classes}"
+ classpathref="compiler.classpath"
+ source="1.5"
+ target="1.5"
+ includeantruntime="false">
+ <include name="**/*Main5.java"/>
+ <include name="**/Java7Checker.java"/>
+ </javac>
+ <!-- Include META-INF -->
+ <copy todir="${build.classes}">
+ <fileset dir="${runtime-bootstrap.src}" excludes="**/*.java"/>
+ </copy>
</target>
<!-- Rule to build runtime jar -->
@@ -203,22 +227,13 @@
srcdir="${runtime-bootstrap.src}"
destdir="${build.bootstrap}"
classpathref="compiler.classpath"
- includeantruntime="false"/>
- <!-- Need an extra pass for Java 7 testing -->
- <delete dir="${build.bootstrap}">
- <include name="**/*Main5.class"/>
- <include name="**/Java7Checker.class"/>
- </delete>
- <javac debug="true"
- srcdir="${runtime-bootstrap.src}"
- destdir="${build.bootstrap}"
- classpathref="compiler.classpath"
source="1.5"
target="1.5"
includeantruntime="false">
- <include name="**/*Main5.java"/>
- <include name="**/Java7Checker.java"/>
+ <include name="**/Launcher.java"/>
+ <include name="**/CeylonClassLoader.java"/>
</javac>
+ <!-- Include META-INF -->
<copy todir="${build.bootstrap}">
<fileset dir="${runtime-bootstrap.src}" excludes="**/*.java"/>
</copy>
@@ -227,7 +242,7 @@
<!-- Rule to build runtime jar -->
<target name="bootstrap.jar" depends="bootstrap.classes">
<mkdir dir="${build.lib}"/>
- <jar destfile="${bootstrap.lib}">
+ <jar destfile="${bootstrap.lib}" filesetmanifest="merge">
<fileset dir="${build.bootstrap}">
</fileset>
</jar>

0 comments on commit f836f63

Please sign in to comment.
Something went wrong with that request. Please try again.