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

[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  2e56ff51e44e91f8bce1969332da3b745b8d3cf8 (commit)
      from  18c873ff1f4d13f0b311ffcf9ec13284c0917917 (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 2e56ff51e44e91f8bce1969332da3b745b8d3cf8
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Mar 15 10:26:00 2010 +0100

    Added stamp file for prebootstrap target to avoid issues with install target.

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

Summary of changes:
 build.xml                                   |    5 ++++-
 debian/patches/compile-jarinjarloader.patch |   14 ++++++++++++--
 debian/patches/compile-xulfiles.patch       |    6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index f7e6915..d9abdd2 100644
--- a/build.xml
+++ b/build.xml
@@ -31,6 +31,7 @@
 	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
 	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
 	<uptodate property="symlinks.complete" srcfile="patch-stamp" targetfile="symlinks-stamp" />
+	<uptodate property="prebootstrap.complete" srcfile="symlinks-stamp" targetfile="prebootstrap-stamp" />
 	<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
 	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
 	<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
@@ -334,7 +335,7 @@
 		<echo file="symlinks-stamp" />
 	</target>
 
-	<target name="prebootstrap" depends="symlinkDeps">
+	<target name="prebootstrap" depends="symlinkDeps" unless="prebootstrap.complete">
 		<mkdir dir="${basedir}/temp/" />
 		<javac destdir="${basedir}/temp"
 			srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
@@ -352,6 +353,8 @@
 			failonerror="true">
 			<arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
 		</exec>
+		<!-- Create a stamp file -->
+		<echo file="prebootstrap-stamp" />
 	</target>
 
 	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index cbaeafa..88f7438 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -4,12 +4,20 @@ Forwarded: no
 
 --- a/build.xml
 +++ b/build.xml
-@@ -334,7 +334,22 @@
+@@ -31,6 +31,7 @@
+ 	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
+ 	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
+ 	<uptodate property="symlinks.complete" srcfile="patch-stamp" targetfile="symlinks-stamp" />
++	<uptodate property="prebootstrap.complete" srcfile="symlinks-stamp" targetfile="prebootstrap-stamp" />
+ 	<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
+ 	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
+ 	<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
+@@ -334,7 +335,24 @@
  		<echo file="symlinks-stamp" />
  	</target>
  
 -	<target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
-+	<target name="prebootstrap" depends="symlinkDeps">
++	<target name="prebootstrap" depends="symlinkDeps" unless="prebootstrap.complete">
 +		<mkdir dir="${basedir}/temp/" />
 +		<javac destdir="${basedir}/temp"
 +			srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
@@ -22,6 +30,8 @@ Forwarded: no
 +		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
 +			basedir="${basedir}/temp/"/>
 +		<delete dir="${basedir}/temp/"/>
++		<!-- Create a stamp file -->
++		<echo file="prebootstrap-stamp" />
 +	</target>
 +
 +	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
diff --git a/debian/patches/compile-xulfiles.patch b/debian/patches/compile-xulfiles.patch
index cf5ade8..bddd141 100644
--- a/debian/patches/compile-xulfiles.patch
+++ b/debian/patches/compile-xulfiles.patch
@@ -4,7 +4,7 @@ Forwarded: no
 
 --- a/build.xml
 +++ b/build.xml
-@@ -347,6 +347,11 @@
+@@ -348,6 +348,11 @@
  		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
  			basedir="${basedir}/temp/"/>
  		<delete dir="${basedir}/temp/"/>
@@ -13,6 +13,6 @@ Forwarded: no
 +			failonerror="true">
 +			<arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
 +		</exec>
+ 		<!-- Create a stamp file -->
+ 		<echo file="prebootstrap-stamp" />
  	</target>
- 
- 	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">


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