From 7e24174dcc80a5e2fa76c9360d4f0d84cca1696c Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@tipit.to>
Date: Fri, 12 Jun 2009 03:54:30 +0200
Subject: Filled out the deps and lib system with separate dirs for the agent
 and lombok proper, and moved spi into lombok's lib path.

---
 .classpath                                            |  15 ++++++---------
 build.xml                                             |  17 +++++++++++++----
 ...rg.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar | Bin 0 -> 362141 bytes
 ....jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar | Bin 0 -> 30999 bytes
 ...clipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar | Bin 0 -> 153765 bytes
 deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar      | Bin 0 -> 4471784 bytes
 ...rg.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar | Bin 362141 -> 0 bytes
 ....jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar | Bin 30999 -> 0 bytes
 ...clipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar | Bin 153765 -> 0 bytes
 deps/org.eclipse.jdt.core_3.5.0.v_963.jar             | Bin 4471784 -> 0 bytes
 lib/asm-3.1.jar                                       | Bin 43035 -> 0 bytes
 lib/eclipse.agent/asm-3.1.jar                         | Bin 0 -> 43035 bytes
 lib/lombok/spi-0.2.1.jar                              | Bin 0 -> 23519 bytes
 13 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
 create mode 100644 deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
 create mode 100644 deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
 create mode 100644 deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar
 delete mode 100644 deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
 delete mode 100644 deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
 delete mode 100644 deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
 delete mode 100644 deps/org.eclipse.jdt.core_3.5.0.v_963.jar
 delete mode 100644 lib/asm-3.1.jar
 create mode 100644 lib/eclipse.agent/asm-3.1.jar
 create mode 100644 lib/lombok/spi-0.2.1.jar

diff --git a/.classpath b/.classpath
index 728ca1d9..9a89710e 100644
--- a/.classpath
+++ b/.classpath
@@ -3,14 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src_eclipseagent"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/asm-3.1.jar" sourcepath="contrib/asm-3.1-src.zip">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/lombok/contrib/asm-3.1-javadoc.zip!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.core_3.5.0.v_963.jar" sourcepath="/Users/rzwitserloot/newworkspace/org.eclipse.jdt.core/compiler"/>
+	<classpathentry kind="lib" path="lib/eclipse.agent/asm-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/lombok/spi-0.2.1.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
index 2812017d..997cdfd9 100644
--- a/build.xml
+++ b/build.xml
@@ -4,14 +4,23 @@
 	</loadresource>
 	<property name="build.compiler" value="javac1.6" />
 	<path id="lombok.deps.path">
-		<fileset dir="deps">
+		<fileset dir="deps/lombok">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	<path id="lombok.libs.path">
+		<fileset dir="lib/lombok">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+
+	<path id="eclipse.agent.deps.path">
+		<fileset dir="deps/eclipse.agent">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
-	<path id="lombok.libs.path" />
-	<path id="eclipse.agent.deps.path" />
 	<path id="eclipse.agent.libs.path">
-		<fileset dir="lib">
+		<fileset dir="lib/eclipse.agent">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
diff --git a/deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar b/deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
new file mode 100644
index 00000000..e42dc67f
Binary files /dev/null and b/deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar differ
diff --git a/deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar b/deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
new file mode 100644
index 00000000..73286f15
Binary files /dev/null and b/deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar differ
diff --git a/deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar b/deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
new file mode 100644
index 00000000..5a66398a
Binary files /dev/null and b/deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar differ
diff --git a/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar b/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar
new file mode 100644
index 00000000..0db68569
Binary files /dev/null and b/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar differ
diff --git a/deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar b/deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
deleted file mode 100644
index e42dc67f..00000000
Binary files a/deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar and /dev/null differ
diff --git a/deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar b/deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
deleted file mode 100644
index 73286f15..00000000
Binary files a/deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar and /dev/null differ
diff --git a/deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar b/deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
deleted file mode 100644
index 5a66398a..00000000
Binary files a/deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar and /dev/null differ
diff --git a/deps/org.eclipse.jdt.core_3.5.0.v_963.jar b/deps/org.eclipse.jdt.core_3.5.0.v_963.jar
deleted file mode 100644
index 0db68569..00000000
Binary files a/deps/org.eclipse.jdt.core_3.5.0.v_963.jar and /dev/null differ
diff --git a/lib/asm-3.1.jar b/lib/asm-3.1.jar
deleted file mode 100644
index b3baf3fe..00000000
Binary files a/lib/asm-3.1.jar and /dev/null differ
diff --git a/lib/eclipse.agent/asm-3.1.jar b/lib/eclipse.agent/asm-3.1.jar
new file mode 100644
index 00000000..b3baf3fe
Binary files /dev/null and b/lib/eclipse.agent/asm-3.1.jar differ
diff --git a/lib/lombok/spi-0.2.1.jar b/lib/lombok/spi-0.2.1.jar
new file mode 100644
index 00000000..4d234f24
Binary files /dev/null and b/lib/lombok/spi-0.2.1.jar differ
-- 
cgit