Author: doko
Date: 2006-10-16 12:01:15 +0000 (Mon, 16 Oct 2006)
New Revision: 2617
Added:
trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-platform-gcj.install
trunk/eclipse/debian/eclipse-platform.install
trunk/eclipse/debian/extra/links.txt
trunk/eclipse/debian/extra/package-links.txt
trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
trunk/eclipse/debian/patches/eclipse-jsch.dpatch
trunk/eclipse/debian/rules
Log:
[ Michael Koch]
* Build icu4j as a eclipse plugin.
[ Matthias Klose ]
* debian/rules: Uses bashisms, set SHELL.
* Speed up native build on multiprocessor machines.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-10-12 20:25:01 UTC (rev 2616)
+++ trunk/eclipse/debian/changelog 2006-10-16 12:01:15 UTC (rev 2617)
@@ -40,6 +40,7 @@
* Moved all files to /usr/lib/eclipse to make all plugins work.
* debian/control.in: eclipse-jdt-common, eclipse-pde-common,
eclipse-platform-common, eclipse-rcp-common: Removed.
+ * Build icu4j as a eclipse plugin.
[ Matthias Klose ]
* Build-depend on java-gcj-compat-dev (>> 1.0.65-4), remove explicit build
@@ -56,6 +57,8 @@
* debian/patches/eclipse-libswt-xpcomgcc4.dpatch: New, taken from FC.
* debian/patches/eclipse-libswt-firefox.dpatch: Updated from FC.
* debian/patches/eclipse-libswt-firefox2.dpatch: New, taken from FC.
+ * debian/rules: Uses bashisms, set SHELL.
+ * Speed up native build on multiprocessor machines.
-- Michael Koch <[EMAIL PROTECTED]> Tue, 3 Oct 2006 17:22:09 +0000
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-10-12 20:25:01 UTC (rev 2616)
+++ trunk/eclipse/debian/control 2006-10-16 12:01:15 UTC (rev 2617)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28),
libicu4j-java (>= 3.4.5), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6),
libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev,
classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3),
libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28),
libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, mozilla-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -187,7 +187,7 @@
Package: libswt3.2-gtk-java
Architecture: any
Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
-Recommends: libswt3.2-gtk-gcj, ${shlibs:Depends}
+Recommends: libswt3.2-gtk-gcj, mozilla-browser (>= 2:1.7.0)
Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java,
eclipse-rcp (<< 3.1.2-2)
Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java,
libswt-gtk-3.2-java
Description: Fast and rich GUI toolkit for Java, gtk2 version
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-10-12 20:25:01 UTC (rev 2616)
+++ trunk/eclipse/debian/control.in 2006-10-16 12:01:15 UTC (rev 2617)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28),
libicu4j-java (>= 3.4.5), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6),
libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev,
classpath-doc, pkg-config, [EMAIL PROTECTED]@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28),
libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config,
[EMAIL PROTECTED]@
Standards-Version: 3.7.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/eclipse-platform-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.install 2006-10-12 20:25:01 UTC
(rev 2616)
+++ trunk/eclipse/debian/eclipse-platform-gcj.install 2006-10-16 12:01:15 UTC
(rev 2617)
@@ -1,6 +1,7 @@
/usr/lib/gcj/eclipse/org.apache.lucene_*.jar.??
/usr/lib/gcj/eclipse/com.ibm.icu_*.??
+/usr/lib/gcj/eclipse/com.ibm.icu.base_*.??
/usr/lib/gcj/eclipse/com.jcraft.jsch_*.jar.??
/usr/lib/gcj/eclipse/org.eclipse.platform_*/platform.jar.??
/usr/lib/gcj/eclipse/org.eclipse.platform_*/startup.jar.??
Modified: trunk/eclipse/debian/eclipse-platform.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform.install 2006-10-12 20:25:01 UTC
(rev 2616)
+++ trunk/eclipse/debian/eclipse-platform.install 2006-10-16 12:01:15 UTC
(rev 2617)
@@ -6,7 +6,8 @@
debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
-debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*
+debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*.jar
+debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu.base_*.jar
debian/tmp/usr/lib/eclipse/plugins/com.jcraft.jsch_*
debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*
debian/tmp/usr/lib/eclipse/plugins/org.apache.lucene_*
Modified: trunk/eclipse/debian/extra/links.txt
===================================================================
--- trunk/eclipse/debian/extra/links.txt 2006-10-12 20:25:01 UTC (rev
2616)
+++ trunk/eclipse/debian/extra/links.txt 2006-10-16 12:01:15 UTC (rev
2617)
@@ -42,5 +42,3 @@
/usr/share/java/lucene-1.4.3.jar
org.apache.lucene/lucene-1.4.3.jar
/usr/share/java/junit.jar org.junit/junit.jar
/usr/share/java/jsch.jar
../baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
-/usr/share/java/icu4j.jar
../baseLocation/plugins/com.ibm.icu_3.4.5.jar
-/usr/share/java/icu4j.jar
../baseLocation/plugins/com.ibm.icu.base_3.4.5.jar
Modified: trunk/eclipse/debian/extra/package-links.txt
===================================================================
--- trunk/eclipse/debian/extra/package-links.txt 2006-10-12 20:25:01 UTC
(rev 2616)
+++ trunk/eclipse/debian/extra/package-links.txt 2006-10-16 12:01:15 UTC
(rev 2617)
@@ -42,5 +42,3 @@
/usr/share/java/lucene-1.4.3.jar
org.apache.lucene_1.4.3/lucene-1.4.103.v20060601.jar
/usr/share/java/jsch.jar com.jcraft.jsch_0.1.28.jar
/usr/share/java/junit.jar org.junit_3.8.1/junit.jar
-/usr/share/java/icu4j.jar com.ibm.icu_3.4.5.jar
-/usr/share/java/icu4j.jar com.ibm.icu.base_3.4.5.jar
Modified: trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2006-10-12
20:25:01 UTC (rev 2616)
+++ trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2006-10-16
12:01:15 UTC (rev 2617)
@@ -21,23 +21,15 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~
2006-08-13 15:56:59.639482784 +0200
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
2006-08-13 16:49:26.615069776 +0200
-@@ -52,7 +52,7 @@
- if [ "${JAVA_HOME}" = "" ]; then
-
JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
- fi
-- AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
- XTEST_LIB_PATH=/usr/X11R6/lib
- if [ "${GECKO_SDK}" = "" ]; then
-
GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
-@@ -69,7 +69,7 @@
- if [ "${JAVA_HOME}" = "" ]; then
- JAVA_HOME=/opt/IBMJava2-ppc-142
- fi
-- AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/powerpc
- XTEST_LIB_PATH=/usr/X11R6/lib
-
OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ppc
- makefile="make_linux.mak"
+--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~
2006-10-16 12:14:04.218388000 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
2006-10-16 12:52:27.888388000 +0200
+@@ -115,6 +115,9 @@
+ if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then
+ AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH}
+ export AWT_LIB_PATH
++ elif [ -d /usr/lib/gcj-4.1 ]; then
++ AWT_LIB_PATH=/usr/lib/gcj-4.1
++ export AWT_LIB_PATH
+ else
+ AWT_LIB_PATH=${JAVA_HOME}/jre/bin
+ export AWT_LIB_PATH
Added: trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
(rev 0)
+++ trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
2006-10-16 12:01:15 UTC (rev 2617)
@@ -0,0 +1,373 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-icu4j-build-files.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
[EMAIL PROTECTED]@
+--- source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/build.xml.orig
1969-12-31 19:00:00.000000000 -0500
++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/build.xml
2006-09-23 19:14:54.000000000 -0400
+@@ -0,0 +1,172 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="com.ibm.icu" default="build.jars" basedir=".">
++
++ <property name="basews" value="${ws}"/>
++ <property name="baseos" value="${os}"/>
++ <property name="basearch" value="${arch}"/>
++ <property name="basenl" value="${nl}"/>
++
++ <!-- Compiler settings. -->
++ <property name="javacFailOnError" value="false"/>
++ <property name="javacDebugInfo" value="on"/>
++ <property name="javacVerbose" value="false"/>
++ <property name="logExtension" value=".log"/>
++ <property name="compilerArg" value=""/>
++ <property name="javacSource" value="1.3"/>
++ <property name="javacTarget" value="1.2"/>
++ <path id="path_bootclasspath">
++ <fileset dir="${java.home}/lib">
++ <include name="*.jar"/>
++ </fileset>
++ </path>
++ <property name="bootclasspath" refid="path_bootclasspath"/>
++ <condition property="bundleBootClasspath"
value="${CDC-1.0/Foundation-1.0}">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleJavacSource" value="1.3">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleJavacTarget" value="1.1">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleBootClasspath" value="${J2SE-1.3}">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <condition property="bundleJavacSource" value="1.3">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <condition property="bundleJavacTarget" value="1.1">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <property name="bundleJavacSource" value="${javacSource}"/>
++ <property name="bundleJavacTarget" value="${javacTarget}"/>
++ <property name="bundleBootClasspath" value="${bootclasspath}"/>
++
++ <target name="init" depends="properties">
++ <condition property="pluginTemp"
value="${buildTempFolder}/plugins">
++ <isset property="buildTempFolder"/>
++ </condition>
++ <property name="pluginTemp" value="${basedir}"/>
++ <condition property="build.result.folder"
value="${pluginTemp}/com.ibm.icu">
++ <isset property="buildTempFolder"/>
++ </condition>
++ <property name="build.result.folder" value="${basedir}"/>
++ <property name="temp.folder" value="${basedir}/temp.folder"/>
++ <property name="plugin.destination" value="${basedir}"/>
++ </target>
++
++ <target name="properties" if="eclipse.running">
++ <property name="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++
++ </target>
++
++ <target name="build.update.jar" depends="init" description="Build the
plug-in: com.ibm.icu for an update site.">
++ <delete dir="${temp.folder}"/>
++ <mkdir dir="${temp.folder}"/>
++ <antcall target="build.jars"/>
++ <antcall target="gather.bin.parts">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <zip destfile="${plugin.destination}/com.ibm.icu_3.4.5.jar"
basedir="${temp.folder}/com.ibm.icu_3.4.5" filesonly="false" whenempty="skip"
update="false"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++ <target name="@dot" depends="init" unless="@dot" description="Create
jar: com.ibm.icu @dot.">
++ <delete dir="${temp.folder}/@dot.bin"/>
++ <mkdir dir="${temp.folder}/@dot.bin"/>
++ <path id="@dot.classpath">
++ </path>
++ <!-- compile the source code -->
++ <javac destdir="${temp.folder}/@dot.bin"
failonerror="${javacFailOnError}" verbose="${javacVerbose}"
debug="${javacDebugInfo}" includeAntRuntime="no"
bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}"
target="${bundleJavacTarget}" >
++ <compilerarg line="${compilerArg}"
compiler="${build.compiler}"/>
++ <classpath refid="@dot.classpath" />
++ <src path="src/" />
++ <compilerarg line="-log
'${temp.folder}/@dot.bin${logExtension}'"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++ </javac>
++ <!-- Copy necessary resources -->
++ <copy todir="${temp.folder}/@dot.bin" failonerror="true"
overwrite="false">
++ <fileset dir="src/" excludes="**/*.java,
**/package.htm*" />
++ </copy>
++ <mkdir dir="${build.result.folder}"/>
++ <copy todir="${build.result.folder}/@dot" failonerror="true"
overwrite="false">
++ <fileset dir="${temp.folder}/@dot.bin"
/>
++ </copy>
++ <delete dir="${temp.folder}/@dot.bin"/>
++ </target>
++
++ <target name="src.zip" depends="init" unless="src.zip">
++ <mkdir dir="${build.result.folder}"/>
++ <zip destfile="${build.result.folder}/src.zip"
filesonly="false" whenempty="skip" update="false">
++ <fileset dir="src/" includes="**/*.java"
/>
++ </zip>
++ </target>
++
++ <target name="build.jars" depends="init" description="Build all the
jars for the plug-in: com.ibm.icu.">
++ <available property="@dot" file="${build.result.folder}/@dot"/>
++ <antcall target="@dot"/>
++ </target>
++
++ <target name="build.sources" depends="init">
++ <available property="src.zip"
file="${build.result.folder}/src.zip"/>
++ <antcall target="src.zip"/>
++ </target>
++
++ <target name="gather.bin.parts" depends="init"
if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
++ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5"
failonerror="true" overwrite="false">
++ <fileset dir="${build.result.folder}/@dot"
includes="**" />
++ </copy>
++ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5"
failonerror="true" overwrite="false">
++ <fileset dir="${basedir}"
includes="about_files/,about.html,plugin.properties,META-INF/"
/>
++ </copy>
++ <!-- <eclipse.versionReplacer
path="${destination.temp.folder}/com.ibm.icu_3.4.5" version="3.4.5"/> -->
++ </target>
++
++ <target name="build.zips" depends="init">
++ </target>
++
++ <target name="gather.sources" depends="init"
if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
++ <copy file="${build.result.folder}/src.zip"
todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="false"
overwrite="false"/>
++ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5"
failonerror="false" overwrite="false">
++ <fileset dir="${basedir}"
includes="about.html,about_files/" />
++ </copy>
++ </target>
++
++ <target name="gather.logs" depends="init" if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
++ <copy file="${temp.folder}/@dot.bin${logExtension}"
todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="false"
overwrite="false"/>
++ </target>
++
++ <target name="clean" depends="init" description="Clean the plug-in:
com.ibm.icu of all the zips, jars and logs created.">
++ <delete dir="${build.result.folder}/@dot"/>
++ <delete file="${build.result.folder}/src.zip"/>
++ <delete file="${plugin.destination}/com.ibm.icu_3.4.5.jar"/>
++ <delete file="${plugin.destination}/com.ibm.icu_3.4.5.zip"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++ <target name="refresh" depends="init" if="eclipse.running"
description="Refresh this folder.">
++ <eclipse.convertPath
fileSystemPath="/home/ben/test/build/plugins/com.ibm.icu"
property="resourcePath"/>
++ <eclipse.refreshLocal resource="${resourcePath}"
depth="infinite"/>
++ </target>
++
++ <target name="zip.plugin" depends="init" description="Create a zip
containing all the elements for the plug-in: com.ibm.icu.">
++ <delete dir="${temp.folder}"/>
++ <mkdir dir="${temp.folder}"/>
++ <antcall target="build.jars"/>
++ <antcall target="build.sources"/>
++ <antcall target="gather.bin.parts">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <antcall target="gather.sources">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <delete>
++ <fileset dir="${temp.folder}"
includes="**/*.bin${logExtension}" />
++ </delete>
++ <zip destfile="${plugin.destination}/com.ibm.icu_3.4.5.zip"
basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++</project>
+---
source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu.base/build.xml.orig
1969-12-31 19:00:00.000000000 -0500
++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu.base/build.xml
2006-09-23 19:23:47.000000000 -0400
+@@ -0,0 +1,172 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="com.ibm.icu.base" default="build.jars" basedir=".">
++
++ <property name="basews" value="${ws}"/>
++ <property name="baseos" value="${os}"/>
++ <property name="basearch" value="${arch}"/>
++ <property name="basenl" value="${nl}"/>
++
++ <!-- Compiler settings. -->
++ <property name="javacFailOnError" value="false"/>
++ <property name="javacDebugInfo" value="on"/>
++ <property name="javacVerbose" value="false"/>
++ <property name="logExtension" value=".log"/>
++ <property name="compilerArg" value=""/>
++ <property name="javacSource" value="1.3"/>
++ <property name="javacTarget" value="1.2"/>
++ <path id="path_bootclasspath">
++ <fileset dir="${java.home}/lib">
++ <include name="*.jar"/>
++ </fileset>
++ </path>
++ <property name="bootclasspath" refid="path_bootclasspath"/>
++ <condition property="bundleBootClasspath"
value="${CDC-1.0/Foundation-1.0}">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleJavacSource" value="1.3">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleJavacTarget" value="1.1">
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
++ <condition property="bundleBootClasspath" value="${J2SE-1.3}">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <condition property="bundleJavacSource" value="1.3">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <condition property="bundleJavacTarget" value="1.1">
++ <isset property="J2SE-1.3"/>
++ </condition>
++ <property name="bundleJavacSource" value="${javacSource}"/>
++ <property name="bundleJavacTarget" value="${javacTarget}"/>
++ <property name="bundleBootClasspath" value="${bootclasspath}"/>
++
++ <target name="init" depends="properties">
++ <condition property="pluginTemp"
value="${buildTempFolder}/plugins">
++ <isset property="buildTempFolder"/>
++ </condition>
++ <property name="pluginTemp" value="${basedir}"/>
++ <condition property="build.result.folder"
value="${pluginTemp}/com.ibm.icu.base">
++ <isset property="buildTempFolder"/>
++ </condition>
++ <property name="build.result.folder" value="${basedir}"/>
++ <property name="temp.folder" value="${basedir}/temp.folder"/>
++ <property name="plugin.destination" value="${basedir}"/>
++ </target>
++
++ <target name="properties" if="eclipse.running">
++ <property name="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++
++ </target>
++
++ <target name="build.update.jar" depends="init" description="Build the
plug-in: com.ibm.icu.base for an update site.">
++ <delete dir="${temp.folder}"/>
++ <mkdir dir="${temp.folder}"/>
++ <antcall target="build.jars"/>
++ <antcall target="gather.bin.parts">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <zip
destfile="${plugin.destination}/com.ibm.icu.base_3.4.5.jar"
basedir="${temp.folder}/com.ibm.icu.base_3.4.5" filesonly="false"
whenempty="skip" update="false"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++ <target name="@dot" depends="init" unless="@dot" description="Create
jar: com.ibm.icu.base @dot.">
++ <delete dir="${temp.folder}/@dot.bin"/>
++ <mkdir dir="${temp.folder}/@dot.bin"/>
++ <path id="@dot.classpath">
++ </path>
++ <!-- compile the source code -->
++ <javac destdir="${temp.folder}/@dot.bin"
failonerror="${javacFailOnError}" verbose="${javacVerbose}"
debug="${javacDebugInfo}" includeAntRuntime="no"
bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}"
target="${bundleJavacTarget}" >
++ <compilerarg line="${compilerArg}"
compiler="${build.compiler}"/>
++ <classpath refid="@dot.classpath" />
++ <src path="src/" />
++ <compilerarg line="-log
'${temp.folder}/@dot.bin${logExtension}'"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++ </javac>
++ <!-- Copy necessary resources -->
++ <copy todir="${temp.folder}/@dot.bin" failonerror="true"
overwrite="false">
++ <fileset dir="src/" excludes="**/*.java,
**/package.htm*" />
++ </copy>
++ <mkdir dir="${build.result.folder}"/>
++ <copy todir="${build.result.folder}/@dot" failonerror="true"
overwrite="false">
++ <fileset dir="${temp.folder}/@dot.bin"
/>
++ </copy>
++ <delete dir="${temp.folder}/@dot.bin"/>
++ </target>
++
++ <target name="src.zip" depends="init" unless="src.zip">
++ <mkdir dir="${build.result.folder}"/>
++ <zip destfile="${build.result.folder}/src.zip"
filesonly="false" whenempty="skip" update="false">
++ <fileset dir="src/" includes="**/*.java"
/>
++ </zip>
++ </target>
++
++ <target name="build.jars" depends="init" description="Build all the
jars for the plug-in: com.ibm.icu.base.">
++ <available property="@dot" file="${build.result.folder}/@dot"/>
++ <antcall target="@dot"/>
++ </target>
++
++ <target name="build.sources" depends="init">
++ <available property="src.zip"
file="${build.result.folder}/src.zip"/>
++ <antcall target="src.zip"/>
++ </target>
++
++ <target name="gather.bin.parts" depends="init"
if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
++ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"
failonerror="true" overwrite="false">
++ <fileset dir="${build.result.folder}/@dot"
includes="**" />
++ </copy>
++ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"
failonerror="true" overwrite="false">
++ <fileset dir="${basedir}"
includes="about_files/,about.html,plugin.properties,META-INF/"
/>
++ </copy>
++ <!-- <eclipse.versionReplacer
path="${destination.temp.folder}/com.ibm.icu.base_3.4.5" version="3.4.5"/> -->
++ </target>
++
++ <target name="build.zips" depends="init">
++ </target>
++
++ <target name="gather.sources" depends="init"
if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
++ <copy file="${build.result.folder}/src.zip"
todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="false"
overwrite="false"/>
++ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"
failonerror="false" overwrite="false">
++ <fileset dir="${basedir}"
includes="about.html,about_files/" />
++ </copy>
++ </target>
++
++ <target name="gather.logs" depends="init" if="destination.temp.folder">
++ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
++ <copy file="${temp.folder}/@dot.bin${logExtension}"
todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="false"
overwrite="false"/>
++ </target>
++
++ <target name="clean" depends="init" description="Clean the plug-in:
com.ibm.icu.base of all the zips, jars and logs created.">
++ <delete dir="${build.result.folder}/@dot"/>
++ <delete file="${build.result.folder}/src.zip"/>
++ <delete
file="${plugin.destination}/com.ibm.icu.base_3.4.5.jar"/>
++ <delete
file="${plugin.destination}/com.ibm.icu.base_3.4.5.zip"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++ <target name="refresh" depends="init" if="eclipse.running"
description="Refresh this folder.">
++ <eclipse.convertPath
fileSystemPath="/home/ben/icu4j-eclipse-plugins/build/plugins/com.ibm.icu.base"
property="resourcePath"/>
++ <eclipse.refreshLocal resource="${resourcePath}"
depth="infinite"/>
++ </target>
++
++ <target name="zip.plugin" depends="init" description="Create a zip
containing all the elements for the plug-in: com.ibm.icu.base.">
++ <delete dir="${temp.folder}"/>
++ <mkdir dir="${temp.folder}"/>
++ <antcall target="build.jars"/>
++ <antcall target="build.sources"/>
++ <antcall target="gather.bin.parts">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <antcall target="gather.sources">
++ <param name="destination.temp.folder"
value="${temp.folder}/"/>
++ </antcall>
++ <delete>
++ <fileset dir="${temp.folder}"
includes="**/*.bin${logExtension}" />
++ </delete>
++ <zip
destfile="${plugin.destination}/com.ibm.icu.base_3.4.5.zip"
basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++ <delete dir="${temp.folder}"/>
++ </target>
++
++</project>
Modified: trunk/eclipse/debian/patches/eclipse-jsch.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch.dpatch 2006-10-12 20:25:01 UTC
(rev 2616)
+++ trunk/eclipse/debian/patches/eclipse-jsch.dpatch 2006-10-16 12:01:15 UTC
(rev 2617)
@@ -43,3 +43,24 @@
<pathelement path="../org.eclipse.swt/@dot"/>
<pathelement
path="${build.result.folder}/../org.eclipse.swt/@dot"/>
<pathelement
path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
+--- source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF.orig
2006-10-04 14:57:52.000000000 +0000
++++ source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
2006-10-04 14:58:03.000000000 +0000
+@@ -20,7 +20,7 @@
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
+- com.jcraft.jsch;bundle-version="[0.1.27,2.0.0)"
++ com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)"
+ Eclipse-LazyStart: true
+ Import-Package: com.ibm.icu.text,
+ com.ibm.icu.util
+--- source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF.orig
2006-10-04 12:31:47.000000000 +0000
++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF
2006-10-04 12:32:04.000000000 +0000
+@@ -15,6 +15,6 @@
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.team.cvs.ssh;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.team.ui;bundle-version="[3.2.0,4.0.0)",
+- com.jcraft.jsch;bundle-version="[0.1.18,2.0.0)"
++ com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)"
+ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-10-12 20:25:01 UTC (rev 2616)
+++ trunk/eclipse/debian/rules 2006-10-16 12:01:15 UTC (rev 2617)
@@ -8,6 +8,7 @@
BUILD_DEPS :=
export DH_OPTIONS =
+export SHELL = /bin/bash
DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde
libswt3.2-gtk
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -35,8 +36,17 @@
ECLIPSE_PLATFORM=$(DEB_HOST_ARCH)
endif
-SOURCE=$(shell ls upstream/*.tar.bz2)
+ifeq ($(enable_native),yes)
+ AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ ifneq ($(AVAIL_CPUS),1)
+ AOT_MAKEFLAGS = -j$(AVAIL_CPUS)
+ export AOT_MAKEFLAGS
+ endif
+endif
+SOURCE=$(shell ls upstream/eclipse*.tar.bz2)
+SOURCE_ICU4J=$(shell ls upstream/icu4j*.tar.bz2)
+
SOURCE_TREE=$(CURDIR)/source-tree
BUILD_TREE=$(CURDIR)/build-tree
@@ -119,6 +129,7 @@
eclipse-jsch \
eclipse-disable-junit4-apt \
eclipse-libswt-xpcomgcc4 \
+ eclipse-icu4j-build-files \
# eclipse-awt-libpath \
# eclipse-icon \
@@ -161,7 +172,8 @@
ifeq ($(with_browser),mozilla)
eclipse_patches += \
eclipse-libswt-mozilla \
- eclipse-libswt-mozilla-profiles
+ eclipse-libswt-mozilla-profiles \
+ eclipse-awt-libpath \
BUILD_DEPS += , mozilla-dev
# MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) |
mozilla-firefox (>= 1.0.7)
@@ -202,14 +214,29 @@
uncompress: uncompress-stamp
uncompress-stamp: debian/control
dh_testdir
-
+
# The building happens inside the source-tree directory. This makes
# cleanup much easier.
mkdir -p "$(SOURCE_TREE)"
(cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
-
+
+ rm
$(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip
+ rm
$(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip
+
+ @cd $(SOURCE_TREE)/baseLocation/plugins; \
+ mkdir icu4j-build-temp; \
+ cd icu4j-build-temp; \
+ tar xfj ../../../../$(SOURCE_ICU4J); \
+ sed --in-place "s/ .*bootclasspath=.*//g" build.xml; \
+ ant eclipseProjects; \
+ cd ..; \
+ mkdir -p icu4j-build; \
+ mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build; \
+ mv icu4j-build-temp/eclipseProjects/com.ibm.icu.base icu4j-build; \
+ rm -r icu4j-build-temp
+
touch uncompress-stamp
-
+
ifeq ($(with_dpatch),yes)
# Include dpatch stuff.
DPATCH_STAMPFN=dpatch-stamp
@@ -223,9 +250,9 @@
patch: patch-stamp
patch-stamp: uncompress-stamp
dh_testdir
-
+
# This patch system was orginally copied off of the one found in cdbs.
-
+
@cd $(SOURCE_TREE); \
test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name
'*.$(patch_ext)' | wc -l) -eq 0 && exit 0; \
for patch in $(CURDIR)/debian/patches/*.$(patch_ext); do \
@@ -247,7 +274,7 @@
exit 1; \
fi; \
done
-
+
# This has been modified to work "per-plug-in". Patches are put in the
# debian/patches/plugin directory. They are named with a common pattern
# "<plugin>_<description>.patch". They are applied automatically, in
@@ -255,7 +282,7 @@
#
# Note: If you are making a patch that only adds files, include a no-op
# modification so the patch only applies at the correct -p level.
-
+
@cd $(SOURCE_TREE); \
test $$(find $(CURDIR)/debian/patches/plugins/ -maxdepth 1 -name
'*.$(patch_ext)' | wc -l) -eq 0 && exit 0; \
for patch in $(CURDIR)/debian/patches/plugins/*.$(patch_ext); do \
@@ -283,15 +310,14 @@
exit 1; \
fi; \
done
-
-
+
touch patch-stamp
endif
prepare: prepare-stamp
prepare-stamp: patch-stamp
dh_testdir
-
+
# A number of the Ant build files have the verbosity increased. This
# simply makes a lot of text. We set it back down here.
find . -type f -name "build.xml" -exec \
@@ -313,6 +339,29 @@
done
endif
+ # Build icu4j
+ cd $(SOURCE_TREE)/baseLocation/plugins; \
+
zipfile=$$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip;
\
+ pushd icu4j-build/com.ibm.icu.base/src; \
+ find -name \*.java | xargs touch --date=1/1/1970; \
+ zip -X -9 -r $$zipfile . -i \*.java; \
+ popd; \
+ pushd icu4j-build/com.ibm.icu.base; \
+ ant build.update.jar; \
+ popd; \
+ mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar .
+
+ cd $(SOURCE_TREE)/baseLocation/plugins; \
+ zipfile=$$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip; \
+ pushd icu4j-build/com.ibm.icu/src; \
+ find -name \*.java | xargs touch --date=1/1/1970; \
+ zip -X -9 -r $$zipfile . -i \*.java; \
+ popd; \
+ pushd icu4j-build/com.ibm.icu; \
+ ant build.update.jar; \
+ popd; \
+ mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar .
+
# Update build ids in configuration files
cd $(SOURCE_TREE) && \
$(JVM_ANT_RUN) \
@@ -332,7 +381,7 @@
build-java: build-java-stamp
build-java-stamp: prepare-stamp
dh_testdir
-
+
# Build the complete Eclipse SDK distribution. This takes a long time.
# The libsconfig argument tells the build to build the native
# components as well.
@@ -347,13 +396,13 @@
-Dlibsconfig=true \
compilelibs
# Build done
-
+
touch build-java-stamp
-
+
install-eclipse: install-eclipse-stamp
install-eclipse-stamp: build-java-stamp
-
+
# Run the Eclipse installation procedure for the selected architecture.
# This creates a tar file. We do this in a seperate target for
# debugging purposes: it takes a long time.
@@ -366,10 +415,10 @@
-DinstallArch=$(ECLIPSE_PLATFORM) \
install
# Install done
-
+
touch install-eclipse-stamp
-
+
install: install-stamp
install-stamp: DH_OPTIONS=
install-stamp: build-java-stamp install-eclipse-stamp post-install-stamp
gcj-install-stamp
@@ -383,21 +432,21 @@
post-install-stamp:
dh_testdir
dh_testroot
-
+
# Install the tar file into our destination directory.
install -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)
tar xzvf $(SOURCE_TREE)/result/*.tar.gz -C
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/..
# Builds any Debian-specific extra files.
-
+
mkdir -p $(BUILD_TREE)
-
+
# Put debian version into about.mappings of org.eclipse.sdk to show it
# in Eclispe about dialog.
plugin_dir=$$(ls -d
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.sdk_$(UPSTREAM_VERSION)*) ; \
sed -e "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" <
$$plugin_dir/about.mappings > $$plugin_dir/about.mappings.tmp ; \
mv $$plugin_dir/about.mappings.tmp $$plugin_dir/about.mappings
-
+
# Extract our icon. It is uuencoded because binary files cannot be
# included in a source package.
mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps
@@ -416,7 +465,7 @@
ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \
done
endif
-
+
# Preinitialize the Eclipse directory. This extracts bundles
# which contain .so files. This prevents the .so files from being
# extracted to the user's workspace during runtime.
@@ -425,18 +474,18 @@
org.eclipse.core.launcher.Main -consolelog \
-application org.eclipse.core.runtime.initializer \
-fileInitializer $(EXTRA)/filenamepatterns.txt
-
+
# Version-less SWT Jar links.
mkdir -p $(DEBIAN_TMP)/usr/lib/java && \
cd $(DEBIAN_TMP)/usr/lib/java && \
ln -sf
../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_$(UPSTREAM_VERSION).$(REL).jar
swt3.2-gtk.jar && \
ln -sf swt3.2-gtk.jar swt-gtk.jar && \
ln -sf swt3.2-gtk.jar swt.jar
-
+
# Missing permissions.
chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/ant
chmod a+x
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/antRun*
-
+
# This files are not required for our Eclipse distribution.
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/*.bat
rm -f
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/runant.*
@@ -448,7 +497,7 @@
rm -f
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.apache.ant_*/about_files/LICENSE.sax.txt
rm -f
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.eclipse.tomcat_*/mx4j.license
rm -f
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.rcp.source.linux.gtk.x86_*/src/org.eclipse.swt.gtk.linux.x86_*/about_files/pixman-licenses.txt
-
+
# Install extra Debian-specific Eclipse files into our installation
# directory. We don't use dh_install to do this purely for
# organization.
@@ -563,9 +612,9 @@
binary: binary-indep binary-arch
-
+
generate-classmaps:
-
+
# After all packages have been installed, generate the GCJ native
# mapping database for each package.
ifeq ($(enable_native),yes)
@@ -582,7 +631,7 @@
done ); \
fi; \
done
-
+
# TODO: Is this the second time to do this?
@for package in libswt3.2-gtk; do \
echo "generating classmaps for $${package} ... "; \
@@ -602,7 +651,7 @@
clean:
dh_testdir
-
+
rm -rf $(SOURCE_TREE) $(BUILD_TREE) *-stamp patch-stampT dpatch-stampT
rm -rf $(DEBIAN_TMP) debian/tmp-native compilelog.txt
rm -rf debian/patched
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
