Merge branch 'shadowLauncher'

1 files changed, 36 insertions, 21 deletions

diff --git a/build.xml b/build.xml
index dbeb6c3d..6339ec92 100644
--- a/build.xml
+++ b/build.xml
@@ -138,7 +138,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	</target>
 	
 	<target name="compile" depends="version, ensureBuildDeps, -unpackLibs" description="Compiles the code.">
-		<!-- ant includes the destination dir on the classpath (and there are good reason to do this), but that also means
+		<!-- ant includes the destination dir on the classpath (and there are good reasons to do this), but that also means
 		 the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile
 		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
 		We re-create the file at the end of this target. -->
@@ -155,16 +155,14 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ivy:compile>
 		
 		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" includeantruntime="false">
-			<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
-			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
 			<src path="src/utils" />
 			<exclude name="lombok/javac/**" />
 			<classpath refid="build.path" />
 		</ivy:compile>
 		
 		<ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6" includeantruntime="false">
-			<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
-			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
 			<src path="src/utils" />
 			<include name="lombok/javac/**" />
 			<classpath location="build/lombok-utils" />
@@ -176,8 +174,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</copy>
 		
 		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false">
-			<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
-			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
+			<src path="src/launch" />
 			<src path="src/core" />
 			<src path="src/installer" />
 			<src path="src/eclipseAgent" />
@@ -187,8 +185,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ivy:compile>
 		
 		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
-			<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
-			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
 			<src path="src/core" />
 			<src path="src/delombok" />
 			<include name="lombok/javac/**" />
@@ -198,7 +195,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ivy:compile>
 		<mkdir dir="build/lombok/META-INF" />
 		<mkdir dir="build/lombok/META-INF/services" />
-		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.core.AnnotationProcessor</echo>
+		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.launch.AnnotationProcessorHider.AnnotationProcessor</echo>
 	</target>
 	
 	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile">
@@ -208,25 +205,40 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<format property="releaseTimestamp" pattern="yyyy-MM-dd" />
 		</tstamp>
 		<echo file="release-timestamp.txt">${releaseTimestamp}</echo>
-		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/com.googlecode.jarjar-jarjar.jar" />
-		<jarjar destfile="dist/lombok-${lombok.version}.jar">
-			<fileset dir="build/lombok">
-				<exclude name="com/sun/tools/javac/**"/>
-			</fileset>
+		<zip destfile="dist/lombok-${lombok.version}.jar">
 			<fileset dir="build" includes="changelog.txt" />
 			<fileset dir="." includes="LICENSE" />
 			<fileset dir="." includes="AUTHORS" />
 			<fileset dir="." includes="release-timestamp.txt" />
-			<rule pattern="com.zwitserloot.cmdreader.**" result="lombok.libs.com.zwitserloot.cmdreader.@1" />
-			<rule pattern="org.objectweb.asm.**" result="lombok.libs.org.objectweb.asm.@1" />
+			<fileset dir="build/lombok">
+				<include name="lombok/*.class" />
+				<include name="lombok/experimental/**" />
+				<include name="lombok/extern/**" />
+				<include name="lombok/launch/**" />
+			</fileset>
+			<mappedresources>
+				<fileset dir="build/lombok">
+					<exclude name="com/sun/tools/javac/**" />
+					<exclude name="lombok/*.class" />
+					<exclude name="lombok/experimental/**" />
+					<exclude name="lombok/extern/**" />
+					<exclude name="lombok/launch/**" />
+				</fileset>
+				<firstmatchmapper>
+					<globmapper from="*.class" to="*.SCL.lombok" />
+					<identitymapper />
+				</firstmatchmapper>
+			</mappedresources>
+		</zip>
+		<jar destfile="dist/lombok-${lombok.version}.jar" update="true">
 			<manifest>
-				<attribute name="Premain-Class" value="lombok.core.Agent" />
-				<attribute name="Agent-Class" value="lombok.core.Agent" />
+				<attribute name="Premain-Class" value="lombok.launch.Agent" />
+				<attribute name="Agent-Class" value="lombok.launch.Agent" />
 				<attribute name="Can-Redefine-Classes" value="true" />
-				<attribute name="Main-Class" value="lombok.core.Main" />
+				<attribute name="Main-Class" value="lombok.launch.Main" />
 				<attribute name="Lombok-Version" value="${lombok.version}" />
 			</manifest>
-		</jarjar>
+		</jar>
 		<delete file="release-timestamp.txt" />
 		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
 		<property name="lombok.dist.built" value="true" />
@@ -251,6 +263,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<conf name="test" sources="contrib" />
 			<module name="lombok" depends="build, test">
 				<srcdir dir="src/core" />
+				<srcdir dir="src/launch" />
 				<srcdir dir="src/utils" />
 				<srcdir dir="src/eclipseAgent" />
 				<srcdir dir="src/installer" />
@@ -280,6 +293,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="eclipse" depends="-addEclipseDeps, deps, contrib" description="Creates eclipse project files and downloads all dependencies. Open this directory as project in eclipse after running this target. This will NOT let you start a debug session for eclipse; use target 'eclipseForDebugging' instead to do that.">
 		<ivy:eclipsegen source="1.6">
 			<srcdir dir="src/core" />
+			<srcdir dir="src/launch" />
 			<srcdir dir="src/utils" />
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/installer" />
@@ -610,6 +624,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		</jar>
 		<jar destfile="dist/lombok-${lombok.version}-sources.jar">
 			<fileset dir="src/core" />
+			<fileset dir="src/launch" />
 			<fileset dir="src/utils" />
 			<fileset dir="src/eclipseAgent" />
 			<fileset dir="src/installer" />