[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. c6d6c655f1ab0af96d0837aa313b98471586405c
Benjamin Drung
bdrung-guest at alioth.debian.org
Sat Oct 24 11:19:22 UTC 2009
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, upstream has been updated
via c6d6c655f1ab0af96d0837aa313b98471586405c (commit)
from ef7a83c001049d386b913b9b2d1eeb4802d89578 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 33 ++++++++++
additionalArchs/rename.sh | 29 +++++++++
build.sh | 6 ++
build.xml | 26 ++++++---
eclipse-build-additionalArchs.tar.bz2 | Bin 0 -> 1013156 bytes
eclipse-build-config/ChangeLog | 4 +
.../productFiles/rcpConfig/build.properties | 4 +
generateAdditionalPlatforms.xml | 62 ++++++++++++++++++++
patches/eclipse-add-archs-executable.patch | 57 ++++++++++++++++++
patches/eclipse-add-archs-filesystem.patch | 39 ++++++++++++
patches/eclipse-add-archs-swt.patch | 52 ++++++++++++++++
patches/eclipse-pde.build-add-package-build.patch | 4 +-
patches/gnomeproxy-makefile.patch | 14 +++++
13 files changed, 320 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e8ce415..9b6533a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2009-10-22 Alexander Kurtakov <akurtako at redhat.com>
+ Fix #292078. (Niels Thykier)
+ * patches/gnomeproxy-makefile.patch: New file.
+ * build.xml: Build libgnomeproxy only on x86.
+
+2009-10-21 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/eclipse-add-ppc64-filesystem.patch: Removed.
+ * patches/eclipse-add-ppc64-swt.patch: Removed.
+ * patches/eclipse-add-archs-executable.patch: New file.
+ * patches/eclipse-add-archs-filesystem.patch: New file.
+ * patches/eclipse-add-archs-swt.patch: New file.
+ * build.xml: Apply new patches adding sparc support and launcher fragments.
+ * eclipse-build-additionalArchs.tar.bz2: Regenerated.
+ * generateAdditionalPlatforms.xml: Generated sparc* fragments.
+ * build.sh: Add support for sparc* archs.
+
+2009-10-20 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/eclipse-pde.build-add-package-build.patch: Execute with /bin/bash. (Niels Thykier)
+
+2009-10-19 Alexander Kurtakov <akurtako at redhat.com>
+
+ * generateAdditionalPlatforms.xml: New file.
+
+2009-10-19 Alexander Kurtakov <akurtako at redhat.com>
+
+ * eclipse-build-additionalArchs.tar.bz2: New file.
+ * additionalArchs/rename.sh: New file.
+ * patches/eclipse-add-ppc64-filesystem.patch: New file.
+ * patches/eclipse-add-ppc64-swt.patch: New file.
+ * build.xml: Add ppc64 support.
+
2009-10-15 Alexander Kurtakov <akurtako at redhat.com>
* patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: New file.
diff --git a/additionalArchs/rename.sh b/additionalArchs/rename.sh
new file mode 100644
index 0000000..5ca0915
--- /dev/null
+++ b/additionalArchs/rename.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+newArch=$1
+
+function moves(){
+for f in $(find -type d); do
+ tofile=$(echo $f | sed "s/ppc/$newArch/")
+ if [ $tofile != $f ]; then
+ cp -pfr $f $tofile
+ fi
+ done
+for f in $(find -type f); do
+ tofile=$(echo $f | sed "s/ppc/$newArch/")
+ if [ $tofile != $f ]; then
+ cp -pfr $f $tofile
+ rm -fr $f
+ fi
+ done
+}
+
+cd org.eclipse.equinox.launcher.gtk.linux.$newArch
+ moves
+cd ..
+cd org.eclipse.core.filesystem.linux.$newArch
+ moves
+cd ..
+cd org.eclipse.swt.gtk.linux.$newArch
+ moves
+cd ..
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 80cf4a8..9802cbd 100755
--- a/build.sh
+++ b/build.sh
@@ -18,6 +18,12 @@ case ${arch} in
arch=ppc64 ;;
x86_64)
arch=x86_64 ;;
+ sparc)
+ arch=sparc ;;
+ sparcv9)
+ arch=sparc ;;
+ sparc64)
+ arch=sparc64 ;;
*)
echo "Unrecognized architecture: $arch" 1>&2
exit 1 ;;
diff --git a/build.xml b/build.xml
index 9fe198e..aea98f9 100644
--- a/build.xml
+++ b/build.xml
@@ -50,6 +50,9 @@
</or>
</and>
</condition>
+ <condition property="build.libgnomeproxy">
+ <equals arg1="${buildArch}" arg2="x86" />
+ </condition>
<target name="setLib64Dir" if="setLib64">
<property name="libDir" value="lib64" />
@@ -125,6 +128,8 @@
<copy todir="${buildDirectory}/features/eclipse-build-feature">
<fileset dir="eclipse-build-feature" />
</copy>
+ <!-- add additional archs -->
+ <untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src/plugins" src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
<!-- prepare ecf build tree -->
<mkdir dir="${buildDirectory}/ecf-src/plugins" />
<move todir="${buildDirectory}/ecf-src/plugins">
@@ -204,10 +209,14 @@
<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
+ <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<!-- end eclipse-build-only patches -->
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
@@ -292,8 +301,14 @@
<echo file="testsbuild-stamp" />
</target>
+ <target name="compile.libgnomeproxy" if="build.libgnomeproxy">
+ <!-- build libgnomeproxy -->
+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
+ <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
+ </target>
+
<target name="compilelibs" unless="compilelibs.complete">
- <!-- TODO: Reenable when libgnomeproxy build is fixed.
<delete verbose="true">
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
<include name="eclipse" />
@@ -301,7 +316,7 @@
<fileset dir="${buildDirectory}">
<include name="**/*.so" />
</fileset>
- </delete>-->
+ </delete>
<ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
@@ -323,12 +338,7 @@
<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
</move>
<!-- build libgnomeproxy -->
- <!-- TODO: Reenable when libgnomeproxy build is fixed.
- <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
- <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/">
- </copy>
- <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/">
- </move>-->
+ <antcall target="compile.libgnomeproxy" />
<!-- build libupdate -->
<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
diff --git a/eclipse-build-additionalArchs.tar.bz2 b/eclipse-build-additionalArchs.tar.bz2
new file mode 100644
index 0000000..5f8c8d7
Binary files /dev/null and b/eclipse-build-additionalArchs.tar.bz2 differ
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index df82e8c..2c87e79 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-22 Alexander Kurtakov <akurtako at redhat.com>
+
+ * productFiles/rcpConfig/build.properties: Add rootfiles for sparc[64].
+
2009-09-30 Andrew Overholt <overholt at redhat.com>
* productFiles/sdk/sdk.product: Update for 3.5.1.
diff --git a/eclipse-build-config/productFiles/rcpConfig/build.properties b/eclipse-build-config/productFiles/rcpConfig/build.properties
index 2715288..77fdd9f 100644
--- a/eclipse-build-config/productFiles/rcpConfig/build.properties
+++ b/eclipse-build-config/productFiles/rcpConfig/build.properties
@@ -25,6 +25,10 @@ root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.platform/abou
root.linux.gtk.ppc.permissions.755=*.so*
root.linux.gtk.ppc64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
root.linux.gtk.ppc64.permissions.755=*.so*
+root.linux.gtk.sparc=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.sparc,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/sparc
+root.linux.gtk.sparc.permissions.755=*.so*
+root.linux.gtk.sparc64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.sparc64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/sparc64
+root.linux.gtk.sparc64.permissions.755=*.so*
root.linux.gtk.s390=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390
root.linux.gtk.s390.permissions.755=*.so*
root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
diff --git a/generateAdditionalPlatforms.xml b/generateAdditionalPlatforms.xml
new file mode 100644
index 0000000..99724a3
--- /dev/null
+++ b/generateAdditionalPlatforms.xml
@@ -0,0 +1,62 @@
+<project name="Pdebuild bootstrap" default="cleanGenerate" basedir=".">
+ <target name="cleanGenerate" depends="clean, createTarball" />
+ <property name="archsDir" value="additionalArchs" />
+ <property name="sourceDir" value="build/eclipse-R3_5_1-fetched-src" />
+
+ <macrodef name="copyPlugin">
+ <attribute name="pluginName" />
+ <attribute name="newArch" />
+ <sequential>
+ <copy todir="${archsDir}/@{pluginName}.@{newArch}">
+ <resources>
+ <fileset dir="${sourceDir}/plugins/@{pluginName}.ppc">
+ <include name="**" />
+ </fileset>
+ </resources>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="generateArch">
+ <attribute name="newArch" />
+ <sequential>
+ <copyPlugin pluginName="org.eclipse.swt.gtk.linux"
+ newArch="@{newArch}" />
+ <copyPlugin pluginName="org.eclipse.core.filesystem.linux"
+ newArch="@{newArch}" />
+ <copyPlugin pluginName="org.eclipse.equinox.launcher.gtk.linux"
+ newArch="@{newArch}" />
+ <exec dir="${archsDir}" executable="sh" failonerror="true">
+ <arg line="rename.sh @{newArch}" />
+ </exec>
+ <replace dir="${archsDir}" value="@{newArch}">
+ <exclude name="rename.sh" />
+ <include name="*@{newArch}/**/*.*" />
+ <excludesfile name="${archsDir}/rename.sh" />
+ <replacetoken>ppc</replacetoken>
+ </replace>
+ </sequential>
+ </macrodef>
+
+ <target name="init">
+ <mkdir dir="${archsDir}" />
+ <ant antfile="build.xml" target="applyPatches" />
+ </target>
+
+ <target name="clean">
+ <delete dir="additionalArchs/*" />
+ </target>
+
+ <target name="generate" depends="init">
+ <generateArch newArch="ppc64" />
+ <generateArch newArch="sparc" />
+ <generateArch newArch="sparc64" />
+ </target>
+
+ <target name="createTarball" depends="generate">
+ <tar destfile="eclipse-build-additionalArchs.tar.bz2"
+ compression="bzip2"
+ basedir="additionalArchs"
+ includes="**/*" />
+ </target>
+</project>
\ No newline at end of file
diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
new file mode 100644
index 0000000..fbc0880
--- /dev/null
+++ b/patches/eclipse-add-archs-executable.patch
@@ -0,0 +1,57 @@
+--- features/org.eclipse.equinox.executable/target.build.properties.real 2009-10-21 14:21:08.843594049 +0300
++++ features/org.eclipse.equinox.executable/target.build.properties 2009-10-21 14:22:18.142845083 +0300
+@@ -25,6 +25,15 @@ root.linux.gtk.x86.permissions.755=libca
+ root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root
+ root.linux.gtk.ppc.permissions.755=libcairo-swt.so
+
++root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
++root.linux.gtk.ppc64.permissions.755=libcairo-swt.so
++
++root.linux.gtk.sparc=bin/gtk/linux/sparc,gtk_root
++root.linux.gtk.sparc.permissions.755=libcairo-swt.so
++
++root.linux.gtk.sparc64=bin/gtk/linux/sparc64,gtk_root
++root.linux.gtk.sparc64.permissions.755=libcairo-swt.so
++
+ root.macosx.carbon.ppc=bin/carbon/macosx/ppc
+ root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
+
+--- features/org.eclipse.equinox.executable/feature.xml.real 2009-10-21 14:35:44.818598403 +0300
++++ features/org.eclipse.equinox.executable/feature.xml 2009-10-21 14:37:07.063593607 +0300
+@@ -97,6 +97,36 @@
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
++ os="linux"
++ ws="gtk"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.sparc"
++ os="linux"
++ ws="gtk"
++ arch="sparc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.sparc64"
++ os="linux"
++ ws="gtk"
++ arch="sparc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.x86"
diff --git a/patches/eclipse-add-archs-filesystem.patch b/patches/eclipse-add-archs-filesystem.patch
new file mode 100644
index 0000000..7d5b8f2
--- /dev/null
+++ b/patches/eclipse-add-archs-filesystem.patch
@@ -0,0 +1,39 @@
+--- ./features/org.eclipse.platform/feature.xml 2009-08-07 18:30:54.000000000 +0300
++++ ./features/org.eclipse.platform/feature.xml 2009-08-07 18:50:29.043863537 +0300
+@@ -440,6 +440,36 @@
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.filesystem.linux.ppc64"
++ os="linux"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.filesystem.linux.sparc"
++ os="linux"
++ arch="sparc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.filesystem.linux.sparc64"
++ os="linux"
++ arch="sparc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.filesystem.linux.x86"
diff --git a/patches/eclipse-add-archs-swt.patch b/patches/eclipse-add-archs-swt.patch
new file mode 100644
index 0000000..e232030
--- /dev/null
+++ b/patches/eclipse-add-archs-swt.patch
@@ -0,0 +1,52 @@
+diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
+--- ./features/org.eclipse.rcp/feature.xml.arches 2008-10-03 09:05:02.000000000 -0400
++++ ./features/org.eclipse.rcp/feature.xml 2008-10-03 09:06:45.000000000 -0400
+@@ -229,6 +229,48 @@
+ unpack="false"/>
+
+ <plugin
++ id="org.eclipse.swt.gtk.linux.ppc64"
++ os="linux"
++ ws="gtk"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++
++
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.sparc"
++ os="linux"
++ ws="gtk"
++ arch="sparc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++
++
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.sparc64"
++ os="linux"
++ ws="gtk"
++ arch="sparc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++
++
++
++ <plugin
+ id="org.eclipse.swt.gtk.solaris.sparc"
+ os="solaris"
+ ws="gtk"
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index 9c32c7c..baa3778 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -212,10 +212,10 @@ diff -N templates/package-build/customTargets.xml
+ plugin projects to be in the 'plugins' directory. The build infrastructure
+ normally arranges the projects during the fetch stage. Since we aren't doing
+ the fetch stage, we have to manually arrange the files -->
-+ <exec dir="${builder}" executable="/bin/sh">
++ <exec dir="${builder}" executable="/bin/bash" failOnError="true">
+ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
+ </exec>
-+ <exec dir="${builder}" executable="/bin/sh">
++ <exec dir="${builder}" executable="/bin/bash" failOnError="true">
+ <arg line="symlink-deps.sh ${buildDirectory} ${orbitDepsDir}" />
+ </exec>
+
diff --git a/patches/gnomeproxy-makefile.patch b/patches/gnomeproxy-makefile.patch
new file mode 100644
index 0000000..326e732
--- /dev/null
+++ b/patches/gnomeproxy-makefile.patch
@@ -0,0 +1,14 @@
+Index: plugins/org.eclipse.core.net/natives/unix/linux/makefile
+===================================================================
+--- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 22:36:19.965754808 +0200
++++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 23:01:39.375006881 +0200
+@@ -18,7 +18,8 @@
+ LIB_NAME = gnomeproxy.so
+ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+
+-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
++INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ \
++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+
+ LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list