X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fbuild.xml;h=9b178defe66a59021edbec0287b652ba09fdaa0a;hb=e21b77118f72c9c82ef379b3d044f042371f6d04;hp=7ae8c365d07dca7e13ec532b506aef5d505060f4;hpb=232d9943c82cfd0dd3bd9b2e86fedcc6265aea38;p=debian%2Fopenrocket

diff --git a/core/build.xml b/core/build.xml
index 7ae8c365..9b178def 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -67,25 +67,51 @@
 		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
 	</target>
 	
-	
-	<!-- JAR -->
-	<target name="jar" depends="build" description="Create the OpenRocket jar file">
-		<copy todir="${dist.dir}/">
-			<fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes fileformat.txt" />
-			<fileset dir="resources/"/>
+	<!-- Executible Eclipse-Jar-In-Jar style JAR -->
+	<target name="jar" depends="core-jar" description="Create the OpenRocket jar-in-jar Executable">
+		<mkdir dir="${jar.dir}" />
+		<jar destfile="${jar.file}">
+			<manifest>
+				<attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader" />
+				<attribute name="Rsrc-Main-Class" value="${main-class}" />
+				<attribute name="SplashScreen-Image" value="pix/splashscreen.png" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Rsrc-Class-Path" value="./ main/${ant.project.name}-Core.jar lib/jfreechart-1.0.13.jar lib/jcommon-1.0.16.jar lib/gluegen-rt.jar lib/miglayout15-swing.jar lib/iText-5.0.2.jar lib/jogl.all.jar lib/opencsv-2.3.jar lib/OrangeExtensions-1.2.jar" />
+			</manifest>
+
+			<!-- Unzip the Eclipse JIJ Loader -->
+			<zipfileset src="lib/jar-in-jar-loader.jar" />
+			
+			<!-- Include, in the root of the JAR, the resources needed by OR -->
 			<fileset dir="src/" includes="META-INF/" />
-		</copy>
-		<mkdir dir="${jar.dir}"/>
-		<jar destfile="${jar.file}" basedir="${dist.dir}">
+			<fileset dir="resources/" />
+			
+			<!-- Include the core OpenRocket JAR -->
+			<zipfileset dir="${build.dir}/" prefix="main">
+				<include name="${ant.project.name}-Core.jar"/>
+			</zipfileset>
+			
+			<!-- Include libraries needed by OR -->
+			<zipfileset dir="${lib.dir}" prefix="lib">
+				<include name="*.jar"/>
+			</zipfileset>
+			<zipfileset dir="${lib.dir}/jogl" prefix="lib">
+				<include name="*.jar"/>
+			</zipfileset>
+			
+			<!-- Include metafiles about OR -->
+			<fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes fileformat.txt" />
+		</jar>
+	</target>
+	
+	
+	<!-- Core OpenRocket JAR -->
+	<target name="core-jar" depends="build" description="Create the OpenRocket code-only jar file">
+		<jar destfile="${build.dir}/${ant.project.name}-Core.jar" basedir="${dist.dir}">
 			<manifest>
 				<attribute name="Main-Class" value="${main-class}"/>
 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
 			</manifest>
-			<zipfileset src="lib/miglayout15-swing.jar" />
-			<zipfileset src="lib/jcommon-1.0.16.jar" />
-			<zipfileset src="lib/jfreechart-1.0.13.jar" />
-			<zipfileset src="lib/iText-5.0.2.jar" />
-			<zipfileset src="lib/opencsv-2.3.jar" />
 		</jar>
 	</target>
 
@@ -111,8 +137,7 @@
 
 		<for param="vendor-dir">
 			<dirset dir="resources-src/datafiles/rocksim_components"
-				includes="*"
-				excludes="giantleaprocketry"/>
+				includes="*"/>
 			<sequential>
 				<propertyregex property="vendor"
 					override="true"