- Update copy-platform to work with dropins

- Update JVM-crashing patch

eclipse-copy-platform.sh

@@ -27,7 +27,7 @@ fi
 where=$1; shift
 eclipse=$1; shift
 
-mkdir -p $where/plugins $where/features $where/links
+mkdir -p $where/plugins $where/features
 cd $where
 
 # Are there any optional arguments left?
@@ -37,6 +37,22 @@ if [ $# -gt 0 ]; then
       while read f; do
          [ ! -e $f ] && ln -s $eclipse/$f $f
       done
+      (cd $eclipse/dropins; ls -d *"$optional"*) |
+      while read f; do
+	  if [ -e $eclipse/dropins/$f/eclipse ]; then
+	      (cd $eclipse/dropins/$f/eclipse; ls -d plugins/* features/*) |
+	      while read g; do
+		  [ ! -e $g ] && \
+		    ln -s $eclipse/dropins/$f/eclipse/$g $g
+	      done
+          else
+	      (cd $eclipse/dropins; ls -d plugins/* features/*) |
+	      while read g; do
+	          [ ! -e $g ] && \
+		    ln -s $eclipse/dropins/$g $g
+	      done
+          fi
+      done
    done
 fi
 

eclipse-memorypermsizeandjvmcrash.patch

@@ -6,12 +6,12 @@ RCS file: /cvsroot/eclipse/org.eclipse.platform-feature/gtk/eclipse.ini,v
 retrieving revision 1.3
 diff -u -r1.3 eclipse.ini
 --- gtk/eclipse.ini	3 Jun 2008 20:55:37 -0000	1.3
-+++ gtk/eclipse.ini	8 Jul 2008 19:51:57 -0000
++++ gtk/eclipse.ini	31 Jul 2008 00:28:29 -0000
-@@ -4,4 +4,5 @@
+@@ -4,4 +4,6 @@
  256m
  -vmargs
  -Xms40m
 --Xmx256m
 +-Xmx512m
 +-XX:MaxPermSize=128m
-\ No newline at end of file
++-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith

eclipse.spec

@@ -1,11 +1,11 @@
 # TODO:
+# - update splash screen
 # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4
 # - update ecj-rpmdebuginfo patch
 # - look at startup script and launcher patches
 # - get Ganymede update site pre-configured
 # - investigate bi-arch requirements
-# - investigate need for copy-platform
+# - see why about.html isn't being copied on ppc
-# - see why about.html isn't being copied on non-x86{,_64} platforms
 Epoch:  1
 
 %define eclipse_major   3
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist} 
+Release:        11%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -910,9 +910,13 @@ popd
 cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir
 %endif
 
+cat features/org.eclipse.platform/gtk/eclipse.ini.patched
+
 cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \
   $sdkDir/eclipse.ini
 
+exit 1
+
 # Add a compatibility symlink to startup.jar
 pushd $sdkDir
 LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
@@ -1050,7 +1054,7 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.
 cp -p %{SOURCE16} copy-platform
 (
   cd $RPM_BUILD_ROOT%{_libdir}/%{name}
-  ls -d * | egrep -v '^(plugins|features|about_files)$'
+  ls -d * | egrep -v '^(plugins|features|about_files|dropins)$'
   ls -d plugins/* features/*
 ) |
 sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform
@@ -1442,6 +1446,10 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-11
+- Update copy-platform to work with dropins
+- Update JVM-crashing patch
+
 * Mon Jul 28 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-10
 - Move JDT and PDE/SDK bits to dropins/{jdt,sdk}
 - Drop versionless PDE Build symlink (put logic into pdebuild script)