. Enlist eclipse-devel to get some wider spread of the Eclipse 3.3 port

  before it replaces Eclipse 3.2.

  The submitters (listed in alphabetical order) collaborated on this.

Submitted by:	Mike Bowie <mbowie@buzmo.com>
		Dan Rucci <dan@rucci.org>
		Ken Yamada <ken@tydfam.jp>

1 files changed, 41 insertions, 25 deletions

diff --git a/java/eclipse-devel/scripts/pre-patch b/java/eclipse-devel/scripts/pre-patch
index 3e9ced108843..05926e5bbbfb 100644
--- a/java/eclipse-devel/scripts/pre-patch
+++ b/java/eclipse-devel/scripts/pre-patch
@@ -5,9 +5,17 @@ copy_file()
 {
 	srcfile="$1"
 	dstfile="$2"
-
-	rm -f $dstfile
-	cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+	
+	case $distfile in
+		*.zip)
+			#We may not want to push all files through sed			echo "zip file"
+			mv $srcfile $dstfile
+			;;
+		*)
+			rm -f $dstfile
+			cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+			;;
+		esac
 }
 
 copy_dir()
@@ -30,7 +38,7 @@ copy_dir()
 
 prepare_files()
 {
-	mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd
+	mkdir ${WRKSRC}/features/org.eclipse.equinox.executable/bin/gtk/freebsd
 
 	# Copy the files and rename/change them appropriately
 	for src in $COPY_LIST
@@ -51,46 +59,54 @@ prepare_files()
 	echo Copying $src into $dst
 	copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst"
 
-	src="${SWTMOTIF}/make_linux.mak"
-	dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
-	echo Copying $src into $dst
-	copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst"
-
 	find ${WRKSRC} -name \*.so -delete
 	find ${WRKSRC} -name \*.so.\* -delete
+        #rm ${WRKSRC}/plugins/org.eclipse.platform/launchersrc.zip
 }
-
+#features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
 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.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
+package.org.eclipse.sdk.linux.gtk.x86.xml
+package.org.eclipse.sdk.linux.gtk.x86_64.xml
+features/org.eclipse.platform/about_files/linux.gtk.x86
+features/org.eclipse.platform/about_files/linux.gtk.x86_64
+features/org.eclipse.equinox.executable/bin/gtk/linux
+features/org.eclipse.equinox.executable/bin/gtk/linux/x86
+features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
+features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
+plugins/org.eclipse.core.filesystem.linux.x86
+plugins/org.eclipse.core.filesystem.linux.x86_64
+plugins/org.eclipse.core.filesystem.linux.x86/os/linux
+plugins/org.eclipse.core.filesystem.linux.x86_64/os/linux
+plugins/org.eclipse.core.filesystem/natives/unix/linux
 plugins/org.eclipse.jdt.source.linux.gtk.x86
 plugins/org.eclipse.jdt.source.linux.gtk.x86_64
-plugins/org.eclipse.jdt.source.linux.motif.x86
-plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties
-plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties
 plugins/org.eclipse.pde.source.linux.gtk.x86
 plugins/org.eclipse.pde.source.linux.gtk.x86_64
-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.rcp.source.linux.gtk.x86
+plugins/org.eclipse.rcp.source.linux.gtk.x86_64
 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
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties
+plugins/org.eclipse.cvs.source.linux.gtk.x86
+plugins/org.eclipse.cvs.source.linux.gtk.x86_64
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties
 "
 
 SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-SWTMOTIF="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
 
 prepare_files
 exit 0