[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 6c83c1a6ac1416474e4c6af31bd3e94ca9dcd8d7

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  6c83c1a6ac1416474e4c6af31bd3e94ca9dcd8d7 (commit)
      from  c7162af52ae10026a1c40eb3b736f36ed65dd1a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6c83c1a6ac1416474e4c6af31bd3e94ca9dcd8d7
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Mar 15 08:34:46 2010 +0100

    Added patch to compile jar-in-jar-loader.zip from source.

-----------------------------------------------------------------------

Summary of changes:
 build.xml                                          |   17 ++++++++++-
 debian/patches/compile-jarinjarloader.patch        |   30 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 .../org.eclipse.jdt.ui/jar-in-jar-loader.zip       |  Bin 6523 -> 0 bytes
 4 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/build.xml b/build.xml
index a9c443b..7b4d12b 100644
--- a/build.xml
+++ b/build.xml
@@ -334,7 +334,22 @@
 		<echo file="symlinks-stamp" />
 	</target>
 
-	<target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
+	<target name="prebootstrap" depends="symlinkDeps">
+		<mkdir dir="${basedir}/temp/" />
+		<javac destdir="${basedir}/temp"
+			srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
+			source="1.3"
+			target="1.1"
+			debug="true"
+			optimize="true"
+			fork="true"
+			compiler="modern" />
+		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
+			basedir="${basedir}/temp/"/>
+		<delete dir="${basedir}/temp/"/>
+	</target>
+
+	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
 		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
 		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
 			<classpath>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
new file mode 100644
index 0000000..cbaeafa
--- /dev/null
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -0,0 +1,30 @@
+Description: Regenerates the jar-in-jar-loader.zip file from source.
+Author: Niels Thykier <niels at thykier.net>
+Forwarded: no
+
+--- a/build.xml
++++ b/build.xml
+@@ -334,7 +334,22 @@
+ 		<echo file="symlinks-stamp" />
+ 	</target>
+ 
+-	<target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
++	<target name="prebootstrap" depends="symlinkDeps">
++		<mkdir dir="${basedir}/temp/" />
++		<javac destdir="${basedir}/temp"
++			srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
++			source="1.3"
++			target="1.1"
++			debug="true"
++			optimize="true"
++			fork="true"
++			compiler="modern" />
++		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
++			basedir="${basedir}/temp/"/>
++		<delete dir="${basedir}/temp/"/>
++	</target>
++
++	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
+ 		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
+ 		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ 			<classpath>
diff --git a/debian/patches/series b/debian/patches/series
index 0519225..46f0db4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ eclipse-manpage.patch
 pdebuild-script.patch
 pdebuild-path-copy-platform.patch
 symlink-system-files.patch
+compile-jarinjarloader.patch
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip b/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip
deleted file mode 100644
index bd5cbde..0000000
Binary files a/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip and /dev/null differ


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.