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

[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  18c873ff1f4d13f0b311ffcf9ec13284c0917917 (commit)
       via  d54ac400dbffa81f9642242906050174cd0398d9 (commit)
       via  640e087afe503c991f900299eef4f5cb5efd05c7 (commit)
      from  20e0b3d231f14c913d6cf113f08f32c7e2af866f (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 18c873ff1f4d13f0b311ffcf9ec13284c0917917
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Mar 15 09:12:05 2010 +0100

    Added patch to compile xulrunner files from source.

commit d54ac400dbffa81f9642242906050174cd0398d9
Merge: 20e0b3d231f14c913d6cf113f08f32c7e2af866f 640e087afe503c991f900299eef4f5cb5efd05c7
Author: Niels Thykier <nthykier-guest at alioth.debian.org>
Date:   Mon Mar 15 07:58:26 2010 +0000

    Merge branch 'upstream'

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

Summary of changes:
 build.xml                                          |    5 +++++
 debian/patches/compile-xulfiles.patch              |   18 ++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    4 +++-
 .../org.eclipse.swt/components/external.xpt        |  Bin 183 -> 0 bytes
 5 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/build.xml b/build.xml
index 7b4d12b..f7e6915 100644
--- a/build.xml
+++ b/build.xml
@@ -347,6 +347,11 @@
 		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
 			basedir="${basedir}/temp/"/>
 		<delete dir="${basedir}/temp/"/>
+		<echo message="build.xml:  Recompiling ${buildDirectory}/plugins/org.eclipse.swt/components/external.xpt" />
+		<exec dir="${buildDirectory}/plugins/org.eclipse.swt/components/" executable="${xul.compiler}"
+			failonerror="true">
+			<arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
+		</exec>
 	</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
new file mode 100644
index 0000000..cf5ade8
--- /dev/null
+++ b/debian/patches/compile-xulfiles.patch
@@ -0,0 +1,18 @@
+Description: Ensures that *.xpt files are compiled from source.
+Author: Niels Thykier <niels at thykier.net>
+Forwarded: no
+
+--- a/build.xml
++++ b/build.xml
+@@ -347,6 +347,11 @@
+ 		<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
+ 			basedir="${basedir}/temp/"/>
+ 		<delete dir="${basedir}/temp/"/>
++		<echo message="build.xml:  Recompiling ${buildDirectory}/plugins/org.eclipse.swt/components/external.xpt" />
++		<exec dir="${buildDirectory}/plugins/org.eclipse.swt/components/" executable="${xul.compiler}"
++			failonerror="true">
++			<arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
++		</exec>
+ 	</target>
+ 
+ 	<target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
diff --git a/debian/patches/series b/debian/patches/series
index 46f0db4..399d188 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ pdebuild-script.patch
 pdebuild-path-copy-platform.patch
 symlink-system-files.patch
 compile-jarinjarloader.patch
+compile-xulfiles.patch
diff --git a/debian/rules b/debian/rules
index 06cb57e..e4d3eb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,9 @@ override_dh_auto_clean:
 	ant distclean
 
 override_dh_auto_build:
-	ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
+	ant -DbuildArch=$(ECLIPSE_BUILD_ARCH) \
+		-Dxul.compiler=$$(pkg-config --variable=sdkdir libxul | sed "s/-devel//")/xpidl\
+		-Dxul.include=$$(pkg-config --variable=idldir libxul)/unstable/
 
 override_dh_auto_install:
 	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
diff --git a/eclipse/plugins/org.eclipse.swt/components/external.xpt b/eclipse/plugins/org.eclipse.swt/components/external.xpt
deleted file mode 100644
index f57da7e..0000000
Binary files a/eclipse/plugins/org.eclipse.swt/components/external.xpt and /dev/null differ


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