diff options
| author | nork <nork@FreeBSD.org> | 2005-05-29 11:41:42 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2005-05-29 11:41:42 +0800 |
| commit | 872ad4b381b0bd09bfe4b55b5bfd2db99865ebbb (patch) | |
| tree | 9c9204db223fb9d9b67fc970fe22979f221b5ddb /java/eclipse-devel | |
| parent | c9f6d2e77e654248581d1097a5ad52b7834ef936 (diff) | |
| download | freebsd-ports-gnome-872ad4b381b0bd09bfe4b55b5bfd2db99865ebbb.tar.gz freebsd-ports-gnome-872ad4b381b0bd09bfe4b55b5bfd2db99865ebbb.tar.zst freebsd-ports-gnome-872ad4b381b0bd09bfe4b55b5bfd2db99865ebbb.zip | |
o Update to 3.1M7. [1]
o Add LATEST_LINK. [2]
PR: ports/81076 [1]
Submitted by: Alex Varju <freebsd-ports@varju.ca> [1]
Pointed out by: krisbot via kris [2]
Tested by: java@ [1]
Diffstat (limited to 'java/eclipse-devel')
20 files changed, 181 insertions, 261 deletions
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index ca648356b1ad..ab50448851f9 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eclipse -PORTVERSION= 3.1M6 +PORTVERSION= 3.1M7 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= S-${PORTVERSION}-200504011645 +MASTER_SITE_SUBDIR= S-${PORTVERSION}-200505131415 DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse @@ -21,6 +21,7 @@ BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ BUILD_DEPENDS+= ${EXTRACT_DEPENDS} CONFLICTS= eclipse-3.0* +LATEST_LINK= ${PORTNAME}-devel ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes @@ -44,7 +45,7 @@ USE_ICONV= yes USE_MOTIF= yes .else ECLIPSE_WS= gtk -.if defined(WITH_MOZILLA) +.if defined(WITH_MOZILLA) BROWSER= ${WITH_MOZILLA} BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER} .else diff --git a/java/eclipse-devel/distinfo b/java/eclipse-devel/distinfo index fef7bc6d7cb9..35ba6384ed72 100644 --- a/java/eclipse-devel/distinfo +++ b/java/eclipse-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1M6.zip) = 51d81345d2fa0e8aa0b455f6cf4c447f -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1M6.zip) = 59038692 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1M7.zip) = 30279e8c74de2db219418f645291be39 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1M7.zip) = 59421339 diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh index 0f69a64d40ee..8d1cd977b421 100644 --- a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh @@ -1,6 +1,6 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri Apr 1 13:56:58 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat Apr 9 16:27:29 2005 -@@ -110,6 +110,36 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri May 13 11:37:09 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat May 14 21:02:00 2005 +@@ -100,6 +100,33 @@ ;; esac ;; @@ -8,9 +8,6 @@ + CC=gcc + LD=gcc + XTEST_LIB_PATH=$X11BASE/lib -+ KDE_LIB_PATH=$PREFIX/lib -+ KDE_INCLUDE_PATH=$PREFIX/include -+ QT_HOME=$X11BASE + GECKO_I=${X11BASE}/include/${BROWSER} + GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" + GECKO_L=${X11BASE}/lib/${BROWSER} @@ -19,13 +16,13 @@ + "amd64") + AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 + SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 -+ OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/freebsd/amd64 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.amd64 + makefile="make_freebsd.mak" + echo "Building FreeBSD GTK AMD64 version of SWT" + ;; + i?86) + AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 -+ OUTPUT_DIR=../../../org.eclipse.swt.gtk/os/freebsd/x86 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.x86 + makefile="make_freebsd.mak" + echo "Building FreeBSD GTK x86 version of SWT" + ;; @@ -37,18 +34,9 @@ "SunOS") CC=gcc LD=gcc -@@ -138,4 +168,13 @@ +@@ -128,4 +155,4 @@ - export CC LD JAVA_HOME QT_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME KDE_LIB_PATH KDE_INCLUDE_PATH OUTPUT_DIR + export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR -make -f $makefile ${1} ${2} ${3} ${4} +gmake -f $makefile ${1} ${2} ${3} ${4} -+ -+build_kde=`pkg_info -xc kdebase | grep "no packages match"` -+if [ "$build_kde" != "" ]; then -+ echo "Building FreeBSD version of KDE DLL." -+ gmake -f $makefile make_kde -+fi -+ -+cp -p library/xpcom* . -+gmake -f $makefile make_mozilla diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak index 2aeab21323ce..0446c3be15ce 100644 --- a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak @@ -1,40 +1,22 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak Fri Apr 1 13:55:11 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat Apr 9 13:48:50 2005 -@@ -49,8 +49,8 @@ - GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - --KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt --KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include -+KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt-mt -+KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd - - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS -@@ -65,6 +65,7 @@ - -Wno-non-virtual-dtor \ - -fPIC \ - -I./ \ -+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \ - ${GECKO_INCLUDES} \ - ${SWT_PTR_CFLAGS} - -@@ -82,14 +83,14 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005 +@@ -78,15 +78,16 @@ CFLAGS = -O -Wall \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ - -DLINUX -DGTK \ -- -I$(JAVA_HOME)/include \ -- -fpic \ + -DFREEBSD -DGTK \ -+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(X11BASE)/include \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/freebsd \ +- -fpic \ ++ -I$(X11BASE)/include \ + -fpic -fPIC \ ${SWT_PTR_CFLAGS} --LIBS = -shared -fpic -+LIBS = -shared -fpic -fPIC +-LIBS = -shared -fpic -s ++LIBS = -shared -fpic -fPIC -s --all: make_swt make_atk make_gnome make_awt make_kde +-all: make_swt make_atk make_gnome make_awt +all: make_swt make_atk $(MAKE_GNOME) make_awt # diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh index bfc5582b1349..67f3e36be840 100644 --- a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh @@ -1,13 +1,13 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Fri Apr 1 13:55:27 2005 -+++ ../files/plugins-swt-motif-build.sh Sun Apr 3 16:38:13 2005 -@@ -57,6 +57,18 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh.orig Fri May 13 11:37:09 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Sat May 14 21:03:05 2005 +@@ -54,6 +54,18 @@ echo "Building Linux motif x86 version of SWT" esac ;; + "FreeBSD") + case $MODEL in + i?86) -+ OUTPUT_DIR=../../../org.eclipse.swt.motif/os/freebsd/x86 ++ OUTPUT_DIR=../../../org.eclipse.swt.motif.freebsd.x86 + makefile="make_freebsd.mak" + echo "Building FreeBSD motif x86 version of SWT" + ;; @@ -19,3 +19,10 @@ "SunOS") case $MODEL in *) +@@ -113,4 +125,4 @@ + + export JAVA_HOME MOTIF_HOME CDE_HOME OUTPUT_DIR + +-make -f $makefile $1 $2 $3 $4 +\ No newline at end of file ++gmake -f $makefile $1 $2 $3 $4 diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak index 24d68e89db03..144548fb85e8 100644 --- a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak @@ -1,6 +1,6 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak.orig Fri Apr 1 13:57:23 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak Sat Apr 9 14:20:28 2005 -@@ -26,32 +26,32 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak~ Sat May 14 19:38:40 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak Sat May 14 19:43:29 2005 +@@ -25,26 +25,26 @@ WS_PREFIX = motif SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o @@ -12,27 +12,19 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS --CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic -I./ \ +-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic \ - -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include -+CFLAGS = -O -g -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC -I./ \ -+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include ++CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC \ ++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GNOME_PREFIX = swt-gnome GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o -GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -+GNOME_CFLAGS = -O -g -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -fpic -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` ++GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -fpic -fPIC `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - KDE_PREFIX = swt-kde - KDE_LIB = lib$(KDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - KDE_OBJS = swt.o kde.o kde_stats.o --KDE_LIBS = -L/usr/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt -lkparts --KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include -+KDE_LIBS = -L$(PREFIX)/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt -lkparts -+KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd - AWT_PREFIX = swt-awt AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so AWT_OBJS = swt_awt.o @@ -41,33 +33,12 @@ GTK_PREFIX = swt-gtk GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -@@ -59,7 +59,7 @@ - GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` - GTK_LIBS = -x -shared `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 +@@ -58,7 +58,7 @@ + CAIROCFLAGS = `pkg-config --cflags cairo` + CAIROLIBS = -shared -fpic -fPIC -s `pkg-config --libs-only-L cairo` -lcairo --all: make_swt make_awt make_gnome make_gtk make_kde +-all: make_swt make_awt make_gnome make_gtk +all: make_swt make_awt $(MAKE_GNOME) make_gtk make_swt: $(SWT_LIB) -@@ -80,16 +80,16 @@ - make_gnome: $(GNOME_LIB) - - $(GNOME_LIB): $(GNOME_OBJECTS) -- gcc -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS) -+ $(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS) - - gnome.o: gnome.c -- gcc $(GNOME_CFLAGS) -c -o gnome.o gnome.c -+ $(CC) $(GNOME_CFLAGS) -c -o gnome.o gnome.c - - gnome_structs.o: gnome_structs.c -- gcc $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c -+ $(CC) $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c - - gnome_stats.o: gnome_stats.c -- gcc $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c -+ $(CC) $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c - - make_kde: $(KDE_LIB) - diff --git a/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java b/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java deleted file mode 100644 index 7cf29b859995..000000000000 --- a/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java.orig Sun Apr 3 15:44:23 2005 -+++ plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java Sun Apr 3 15:44:47 2005 - -@@ -74,7 +74,7 @@ - public void run() { - try { - process.waitFor(); -- DefaultBrowserSupport.getInstance().removeBrowser(getId()); -+ DefaultBrowserSupport.getInstance().removeBrowser(ExternalBrowserInstance.this.getId()); - } catch (Exception e) { - // ignore - } - diff --git a/java/eclipse-devel/files/patch-build.xml b/java/eclipse-devel/files/patch-build.xml index a2419ca04c7b..76452363392a 100644 --- a/java/eclipse-devel/files/patch-build.xml +++ b/java/eclipse-devel/files/patch-build.xml @@ -1,27 +1,15 @@ ---- build.xml.orig Fri Apr 1 13:58:26 2005 -+++ build.xml Sat Apr 9 17:03:28 2005 -@@ -48,17 +48,20 @@ - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64"/> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ia64"/> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-x86_64"/> -+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64"/> - </or> - </condition> - <condition property="wsType" value="gtk"> - <or> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc"/> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-x86"/> -+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86"/> - </or> - </condition> - <condition property="wsType" value="motif"> - <or> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86"/> -+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-motif-x86"/> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64"/> - </or> - </condition> -@@ -82,12 +85,12 @@ +--- build.xml.orig Fri May 13 11:38:39 2005 ++++ build.xml Sat May 14 23:42:22 2005 +@@ -53,7 +53,7 @@ + <exec dir="${swtlibs}/" executable="sh" failonerror="true"> + <arg line="build.sh"/> + </exec> +- <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/> ++ <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/> + <mkdir dir="${swtdir}"/> + <move todir="${swtdir}/"> + <fileset dir="${swtlibs}"> +@@ -63,12 +63,12 @@ <!--unzip launcher --> <property name="launcherlibs" value="${buildDirectory}/launchertmp"/> <mkdir dir="${launcherlibs}"/> @@ -29,7 +17,7 @@ - <fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/"> - <include name ="org.eclipse.platform_*/launchersrc.zip"/> + <copy todir="${launcherlibs}"> -+ <fileset dir="${buildDirectory}/features/org.eclipse.launchers"> ++ <fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers"> + <include name ="**"/> </fileset> - </unzip> diff --git a/java/eclipse-devel/files/patch-features-jdt-build.xml b/java/eclipse-devel/files/patch-features-jdt-build.xml index 34f2074cc7b1..05d56b033f71 100644 --- a/java/eclipse-devel/files/patch-features-jdt-build.xml +++ b/java/eclipse-devel/files/patch-features-jdt-build.xml @@ -1,27 +1,27 @@ ---- features/org.eclipse.jdt/build.xml.orig Sat Feb 19 12:09:29 2005 -+++ features/org.eclipse.jdt/build.xml Sat Mar 26 18:30:33 2005 -@@ -179,6 +179,24 @@ +--- features/org.eclipse.jdt/build.xml.orig Fri May 13 11:34:52 2005 ++++ features/org.eclipse.jdt/build.xml Sat May 14 18:42:27 2005 +@@ -164,6 +164,24 @@ <fileset dir="${basedir}/rootfiles" includes="**" /> </copy> </target> + <target name="rootFilesfreebsd_gtk_amd64"> + <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true"> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles" includes="**" /> + </copy> + </target> + <target name="rootFilesfreebsd_gtk_x86"> + <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true"> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles" includes="**" /> + </copy> + </target> + <target name="rootFilesfreebsd_motif_x86"> + <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true"> ++ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles" includes="**" /> + </copy> + </target> <target name="rootFilessolaris_motif_sparc"> <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true"> + <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true"> diff --git a/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh b/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh index 64ddeff2cf81..894278b8dfe1 100644 --- a/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh +++ b/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh @@ -1,5 +1,5 @@ ---- features/org.eclipse.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005 -+++ features/org.eclipse.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005 +--- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005 ++++ features/org.eclipse.platform.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005 @@ -67,6 +67,23 @@ ;; esac diff --git a/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak b/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak index ad80cd3542ee..8fef6388c620 100644 --- a/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak +++ b/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak @@ -1,5 +1,5 @@ ---- features/org.eclipse.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005 -+++ features/org.eclipse.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005 +--- features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005 ++++ features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005 @@ -26,7 +26,7 @@ CC=gcc OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o diff --git a/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c b/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c index 735606309168..f351472d932b 100644 --- a/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c +++ b/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c @@ -1,5 +1,5 @@ ---- features/org.eclipse.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005 -+++ features/org.eclipse.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005 +--- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005 ++++ features/org.eclipse.platform.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005 @@ -182,11 +182,13 @@ #else /* Unix like platforms */ diff --git a/java/eclipse-devel/files/patch-features-launchers-motif-build.sh b/java/eclipse-devel/files/patch-features-launchers-motif-build.sh index ffa0d5301234..3dfeb9174230 100644 --- a/java/eclipse-devel/files/patch-features-launchers-motif-build.sh +++ b/java/eclipse-devel/files/patch-features-launchers-motif-build.sh @@ -1,5 +1,5 @@ ---- features/org.eclipse.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005 -+++ features/org.eclipse.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005 +--- features/org.eclipse.platform.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005 ++++ features/org.eclipse.platform.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005 @@ -55,6 +55,15 @@ MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21 OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" diff --git a/java/eclipse-devel/files/patch-features-platform-build.xml b/java/eclipse-devel/files/patch-features-platform-build.xml index 62ac0573f2bd..5e4b253236c2 100644 --- a/java/eclipse-devel/files/patch-features-platform-build.xml +++ b/java/eclipse-devel/files/patch-features-platform-build.xml @@ -1,75 +1,82 @@ ---- features/org.eclipse.platform/build.xml.orig Fri Apr 1 13:54:42 2005 -+++ features/org.eclipse.platform/build.xml Sat Apr 2 13:43:10 2005 -@@ -44,6 +44,16 @@ +--- features/org.eclipse.platform/build.xml.orig Fri May 13 11:34:52 2005 ++++ features/org.eclipse.platform/build.xml Sat May 14 20:43:11 2005 +@@ -42,6 +42,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="motif"/> </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}"> - <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}"> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="freebsd"/> + <property name="ws" value="motif"/> + </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif" target="${target}"> -+ <property name="arch" value="x86"/> + <ant antfile="build.xml" dir="../../plugins/org.apache.ant" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -62,6 +67,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> -@@ -63,6 +73,11 @@ ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}"> + <property name="arch" value="sparc"/> + <property name="os" value="solaris"/> +@@ -107,6 +117,11 @@ + <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk64" target="${target}"> -+ <property name="arch" value="amd64"/> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> + <property name="os" value="freebsd"/> + <property name="ws" value="gtk"/> + </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk64" target="${target}"> - <property name="arch" value="ia64"/> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> + <property name="arch" value="sparc"/> + <property name="os" value="solaris"/> +@@ -187,6 +202,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> -@@ -182,6 +197,11 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> ++ <property name="ws" value="gtk"/> + </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.linux" target="${target}"> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.text" target="${target}"> <property name="arch" value="x86"/> - <property name="os" value="linux"/> + <property name="os" value="win32"/> @@ -222,6 +242,11 @@ - <property name="os" value="qnx"/> - <property name="ws" value="photon"/> + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> ++ <property name="ws" value="gtk"/> + </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.linux" target="${target}"> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.team.core" target="${target}"> <property name="arch" value="x86"/> - <property name="os" value="linux"/> -@@ -449,7 +474,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true"> + <property name="os" value="win32"/> +@@ -450,7 +475,7 @@ + <copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.2,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.resources.linux,3.0.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.carbon,3.1.0,org.eclipse.core.resources.macosx,3.0.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.swt.photon,3.1.0,org.eclipse.core.resources.qnx,3.0.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.win32,3.1.0,org.eclipse.core.resources.win32,3.0.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.2,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.resources.linux,3.0.0,org.eclipse.core.resources.freebsd,3.0.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.gtk64,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.carbon,3.1.0,org.eclipse.core.resources.macosx,3.0.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.swt.photon,3.1.0,org.eclipse.core.resources.qnx,3.0.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.win32,3.1.0,org.eclipse.core.resources.win32,3.0.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.freebsd.x86,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.freebsd.amd64,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.freebsd.x86,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> -@@ -472,6 +497,16 @@ +@@ -473,6 +498,16 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> </target> + <target name="rootFilesfreebsd_gtk_x86"> + <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/gtk/freebsd/x86" includes="**" /> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> + <fileset dir="${basedir}/gtk" includes="**" /> + <fileset dir="${basedir}/rootfiles" includes="**" /> + <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> @@ -78,15 +85,15 @@ + </target> <target name="rootFileslinux_gtk_ppc"> <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true"> -@@ -512,6 +547,16 @@ + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -503,6 +538,16 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> </target> + <target name="rootFilesfreebsd_gtk_amd64"> + <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/gtk/freebsd/amd64" includes="**" /> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> + <fileset dir="${basedir}/gtk" includes="**" /> + <fileset dir="${basedir}/rootfiles" includes="**" /> + <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> @@ -95,32 +102,23 @@ + </target> <target name="rootFileslinux_motif_x86"> <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true"> -@@ -523,6 +568,28 @@ + <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -515,6 +560,19 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> + </target> + <target name="rootFilesfreebsd_motif_x86"> + <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/motif/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif/os/freebsd/x86" includes="libXm.so.2.1" /> ++ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/freebsd.motif" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> + <fileset dir="${basedir}/motif" includes="**" /> + <fileset dir="${basedir}/rootfiles" includes="**" /> + <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> + </copy> + <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> -+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD"> -+ <arg line="-s"/> -+ <arg line="libXm.so.2.1"/> -+ <arg line="libXm.so.2"/> -+ </exec> -+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD"> -+ <arg line="-s"/> -+ <arg line="libXm.so.2.1"/> -+ <arg line="libXm.so"/> -+ </exec> + <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> </target> <target name="rootFilessolaris_motif_sparc"> diff --git a/java/eclipse-devel/files/patch-features-platform-source-build.xml b/java/eclipse-devel/files/patch-features-platform-source-build.xml index 143ff8f73e79..59f5c5934ec9 100644 --- a/java/eclipse-devel/files/patch-features-platform-source-build.xml +++ b/java/eclipse-devel/files/patch-features-platform-source-build.xml @@ -1,8 +1,8 @@ ---- features/org.eclipse.platform.source/build.xml.orig Fri Apr 1 13:54:41 2005 -+++ features/org.eclipse.platform.source/build.xml Sat Apr 2 14:33:00 2005 -@@ -42,6 +42,11 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> +--- features/org.eclipse.platform.source/build.xml.orig Fri May 13 11:34:53 2005 ++++ features/org.eclipse.platform.source/build.xml Sat May 14 18:51:56 2005 +@@ -27,6 +27,11 @@ + <property name="os" value="qnx"/> + <property name="ws" value="photon"/> </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}"> + <property name="arch" value="amd64"/> @@ -12,9 +12,9 @@ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}"> <property name="arch" value="x86"/> <property name="os" value="linux"/> -@@ -72,6 +77,16 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> +@@ -42,6 +47,16 @@ + <property name="os" value="hpux"/> + <property name="ws" value="motif"/> </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}"> + <property name="arch" value="x86"/> @@ -29,16 +29,16 @@ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}"> <property name="arch" value="ppc"/> <property name="os" value="macosx"/> -@@ -144,7 +159,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true"> +@@ -140,7 +155,7 @@ + <copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.0.1,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.0.1,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.1.0,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> -@@ -159,6 +174,8 @@ +@@ -153,6 +168,8 @@ </target> <target name="rootFileslinux_gtk_x86_64"> </target> @@ -47,7 +47,7 @@ <target name="rootFileslinux_motif_x86"> </target> <target name="rootFilessolaris_motif_sparc"> -@@ -175,6 +192,11 @@ +@@ -169,6 +186,11 @@ </target> <target name="rootFilesqnx_photon_x86"> </target> diff --git a/java/eclipse-devel/files/patch-jdtcoresrc-compilejdtcore.xml b/java/eclipse-devel/files/patch-jdtcoresrc-compilejdtcore.xml new file mode 100644 index 000000000000..48378f0d4a61 --- /dev/null +++ b/java/eclipse-devel/files/patch-jdtcoresrc-compilejdtcore.xml @@ -0,0 +1,28 @@ +--- jdtcoresrc/compilejdtcore.xml~ Fri May 13 11:34:19 2005 ++++ jdtcoresrc/compilejdtcore.xml Sun May 15 10:08:14 2005 +@@ -37,9 +37,9 @@ + <property name="javacTarget" value="1.2" /> + <property name="javacDebugInfo" value="true" /> + <property name="javacFailOnError" value="true" /> +- <record name="../compilelog.txt" action="start" /> ++ <record name="compilelog.txt" action="start" /> + <javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/> +- <record name="../compilelog.txt" action="stop" /> ++ <record name="compilelog.txt" action="stop" /> + + <echo message="UPDATE ecj.jar" /> + <copy todir="${destdir}"> +--- jdtcoresrc/compilejdtcorewithjavac.xml~ Fri May 13 11:34:19 2005 ++++ jdtcoresrc/compilejdtcorewithjavac.xml Sun May 15 10:08:28 2005 +@@ -22,9 +22,9 @@ + <property name="javacDebugInfo" value="true" /> + <property name="javacFailOnError" value="true" /> + +- <record name="../compilelog.txt" action="start" /> ++ <record name="compilelog.txt" action="start" /> + <javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/> +- <record name="../compilelog.txt" action="stop" /> ++ <record name="compilelog.txt" action="stop" /> + + <echo message="UPDATE ecj.jar" /> + <copy todir="${destdir}"> diff --git a/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml b/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml deleted file mode 100644 index 0ccbb4cba94b..000000000000 --- a/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.swt.gtk/build.xml.orig Wed Apr 21 00:24:26 2004 -+++ plugins/org.eclipse.swt.gtk/build.xml Wed Apr 21 00:24:39 2004 -@@ -10,7 +10,7 @@ - <property name="build.result.folder" value="${basedir}"/> - <property name="plugindir" value="../org.eclipse.swt"/> - <property name="destination" value="${basedir}"/> -- <property name="os" value="linux"/> -+ <property name="os" value="${os}"/> - <property name="ws" value="gtk"/> - <property name="arch" value="x86"/> - <property name="bootclasspath" value=""/> diff --git a/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml b/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml deleted file mode 100644 index c5a5da0cfd57..000000000000 --- a/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.eclipse.swt.gtk64/build.xml.orig Fri Apr 1 13:54:42 2005 -+++ plugins/org.eclipse.swt.gtk64/build.xml Mon Apr 4 00:11:23 2005 -@@ -11,9 +11,9 @@ - <property name="build.result.folder" value="${basedir}"/> - <property name="plugindir" value="../org.eclipse.swt"/> - <property name="destination" value="${basedir}"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- <property name="arch" value="x86_64"/> -+ <property name="os" value="${os}"/> -+ <property name="ws" value="${ws}"/> -+ <property name="arch" value="${arch}"/> - <property name="bootclasspath" value=""/> - <property name="toolsplugindir" value="../org.eclipse.swt.tools"/> - </target> diff --git a/java/eclipse-devel/files/patch-plugins-update-src-update.c b/java/eclipse-devel/files/patch-plugins-update-src-update.c index 532fbdb5758e..6d3991ec7358 100644 --- a/java/eclipse-devel/files/patch-plugins-update-src-update.c +++ b/java/eclipse-devel/files/patch-plugins-update-src-update.c @@ -1,18 +1,15 @@ ---- plugins/org.eclipse.update.core.linux/src/update.c.orig Thu Sep 16 08:48:27 2004 -+++ plugins/org.eclipse.update.core.linux/src/update.c Fri Feb 18 20:27:34 2005 -@@ -10,8 +10,15 @@ - *******************************************************************************/
-
+--- plugins/org.eclipse.update.core.linux/src/update.c.orig Fri May 13 11:37:58 2005 ++++ plugins/org.eclipse.update.core.linux/src/update.c Sat May 14 19:01:31 2005 +@@ -12,7 +12,12 @@ + /* bug 82520 : need to include stdlib.h */
+ # include <stdlib.h>
# include <sys/types.h>
+#ifdef __FreeBSD__ -+# include <stdlib.h> +# include <sys/param.h> +# include <sys/mount.h> -+# include "update.h" +#else # include <sys/statfs.h>
- # include <update.h>
+#endif + # include <update.h>
/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
diff --git a/java/eclipse-devel/scripts/pre-patch b/java/eclipse-devel/scripts/pre-patch index f358624ca142..3e9ced108843 100644 --- a/java/eclipse-devel/scripts/pre-patch +++ b/java/eclipse-devel/scripts/pre-patch @@ -30,7 +30,7 @@ copy_dir() prepare_files() { - mkdir ${WRKSRC}/features/org.eclipse.launchers/bin/gtk/freebsd + mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd # Copy the files and rename/change them appropriately for src in $COPY_LIST @@ -64,11 +64,11 @@ COPY_LIST=" assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.motif.x86.xml -features/org.eclipse.launchers/bin/gtk/linux/x86 -features/org.eclipse.launchers/bin/gtk/linux/x86_64 -features/org.eclipse.launchers/bin/motif/linux -features/org.eclipse.launchers/library/gtk/make_linux.mak -features/org.eclipse.launchers/library/motif/make_linux.mak +features/org.eclipse.platform.launchers/bin/gtk/linux/x86 +features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64 +features/org.eclipse.platform.launchers/bin/motif/linux +features/org.eclipse.platform.launchers/library/gtk/make_linux.mak +features/org.eclipse.platform.launchers/library/motif/make_linux.mak plugins/org.eclipse.core.resources.linux plugins/org.eclipse.core.resources.linux/os/linux plugins/org.eclipse.jdt.source.linux.gtk.x86 @@ -82,10 +82,9 @@ plugins/org.eclipse.pde.source.linux.motif.x86 plugins/org.eclipse.platform.source.linux.gtk.x86 plugins/org.eclipse.platform.source.linux.gtk.x86_64 plugins/org.eclipse.platform.source.linux.motif.x86 -plugins/org.eclipse.swt.gtk/os/linux -plugins/org.eclipse.swt.gtk64/os/linux -plugins/org.eclipse.swt.motif/os/linux -plugins/org.eclipse.swt.motif/os/linux +plugins/org.eclipse.swt.gtk.linux.x86 +plugins/org.eclipse.swt.gtk.linux.x86_64 +plugins/org.eclipse.swt.motif.linux.x86 plugins/org.eclipse.update.core.linux plugins/org.eclipse.update.core.linux/os/linux " |