update with startup workaround in macosx eclipse.iniI20080415_Eclipse_3_4_0_M6

7 files changed, 56 insertions, 42 deletions

diff --git a/releng/org.eclipse.epp.config/eclipse_cpp_340.xml b/releng/org.eclipse.epp.config/eclipse_cpp_340.xml
index 487453c8..08f1f676 100644
--- a/releng/org.eclipse.epp.config/eclipse_cpp_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_cpp_340.xml
@@ -121,6 +121,10 @@ org.eclipse.platform
 			<archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
diff --git a/releng/org.eclipse.epp.config/eclipse_java_340.xml b/releng/org.eclipse.epp.config/eclipse_java_340.xml
index cf2bfcbf..e36488fe 100644
--- a/releng/org.eclipse.epp.config/eclipse_java_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_java_340.xml
@@ -188,6 +188,10 @@ org.eclipse.platform
 			<archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
diff --git a/releng/org.eclipse.epp.config/eclipse_jee_340.xml b/releng/org.eclipse.epp.config/eclipse_jee_340.xml
index 385ba524..a6302ec9 100644
--- a/releng/org.eclipse.epp.config/eclipse_jee_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_jee_340.xml
@@ -355,6 +355,10 @@ org.eclipse.platform
       <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
diff --git a/releng/org.eclipse.epp.config/eclipse_modeling_340.xml b/releng/org.eclipse.epp.config/eclipse_modeling_340.xml
index 49b2fa9f..d750942c 100644
--- a/releng/org.eclipse.epp.config/eclipse_modeling_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_modeling_340.xml
@@ -22,25 +22,21 @@
     </packageTesters>
   </packageMetaData>
 
-	<!-- version, the RCP version to build. This is used to determine the file 
+  <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
   <rcp version="3.4M6a" />
 
-	<!-- name, the name of the product, used in naming the created files. -->
-	<product
-	  name="eclipse-modeling-ganymede-M6"
-	  eclipseProductId="org.eclipse.platform.ide"
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product
+    name="eclipse-modeling-ganymede-M6"
+    eclipseProductId="org.eclipse.platform.ide"
     initialPerspectiveId="org.eclipse.jdt.ui.JavaPerspective" />
 
-	<!-- url, pointing to an update site. -->
+  <!-- url, pointing to an update site. -->
   <updateSites>
     <!-- local mirrors -->
     <updateSite url="file:///home/data/httpd/download.eclipse.org/eclipse/updates/3.4milestones/" />
     <updateSite url="file:///home/data/httpd/download.eclipse.org/releases/ganymede/staging/" />
-    <updateSite url="file:///home/data/httpd/download.eclipse.org/modeling/emf/updates/site-interim.xml" />
-    <!-- 
-    <updateSite url="http://download.eclipse.org/modeling/emf/updates/site-interim.xml" />
-     -->
 
     <!-- eclipse.org update sites -->
     <!-- 
@@ -51,9 +47,9 @@
     -->
   </updateSites>
 
-	<!-- id, a feature id. -->
-	<!-- version, the feature version. -->
-	<requiredFeatures>
+  <!-- id, a feature id. -->
+  <!-- version, the feature version. -->
+  <requiredFeatures>
     <feature
       id="org.eclipse.platform"
       version="latest">
@@ -134,12 +130,6 @@
       id="org.eclipse.emf.workspace"
       version="latest">
     </feature>
-    <!-- to be removed - start -->
-    <feature
-      id="org.eclipse.emf.examples"
-      version="2.4.0.v200804012208">
-    </feature>
-    <!-- to be removed - stop -->
     <feature
       id="org.eclipse.emf.query"
       version="latest">
@@ -178,21 +168,21 @@
       version="latest">
     </feature>
     
-	</requiredFeatures>
+  </requiredFeatures>
 
-	<!-- folder, pointing to a folder containing the zipped root files for each of 
-		the target platforms. -->
+  <!-- folder, pointing to a folder containing the zipped root files for each of 
+    the target platforms. -->
   <rootFileFolder folder="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.4M6a-200804091425" />
 
-	<!-- relativeFolder, names the subfolder of the base folder where the update site will be created. 
-		This is configurable so that working areas, especially root files, are reusable. -->
-	<extensionSite relativeFolder="extension_site"></extensionSite>
+  <!-- relativeFolder, names the subfolder of the base folder where the update site will be created. 
+    This is configurable so that working areas, especially root files, are reusable. -->
+  <extensionSite relativeFolder="extension_site"></extensionSite>
 
-	<!-- Create archives for win32, linux, macosx platforms, antZip is default format -->
-	<targetPlatforms>
-		<platform os="win32" ws="win32" arch="x86">
-			<archiveFormat format="antZip"></archiveFormat>
-			<eclipseIniFileContent path="/eclipse/">-showsplash
+  <!-- Create archives for win32, linux, macosx platforms, antZip is default format -->
+  <targetPlatforms>
+    <platform os="win32" ws="win32" arch="x86">
+      <archiveFormat format="antZip"></archiveFormat>
+      <eclipseIniFileContent path="/eclipse/">-showsplash
 org.eclipse.platform
 --launcher.XXMaxPermSize
 256M
@@ -200,9 +190,9 @@ org.eclipse.platform
 -Dosgi.requiredJavaVersion=1.5
 -Xms40m
 -Xmx512m</eclipseIniFileContent>
-		</platform>
-		<platform os="linux" ws="gtk" arch="x86">
-			<archiveFormat format="tar" />
+    </platform>
+    <platform os="linux" ws="gtk" arch="x86">
+      <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/">-showsplash
 org.eclipse.platform
 -vmargs
@@ -210,7 +200,7 @@ org.eclipse.platform
 -Xms40m
 -Xmx512m
 -XX:MaxPermSize=256m</eclipseIniFileContent>
-		</platform>
+    </platform>
     <platform os="linux" ws="gtk" arch="x86_64">
       <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/">-showsplash
@@ -221,10 +211,14 @@ org.eclipse.platform
 -Xmx512m
 -XX:MaxPermSize=256m</eclipseIniFileContent>
     </platform>
-		<platform os="macosx" ws="carbon" arch="ppc">
-			<archiveFormat format="tar" />
+    <platform os="macosx" ws="carbon" arch="ppc">
+      <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
@@ -233,6 +227,6 @@ org.eclipse.platform
 -XX:MaxPermSize=256m
 -Dosgi.requiredJavaVersion=1.5
 -Dorg.eclipse.swt.internal.carbon.smallFonts</eclipseIniFileContent>
-		</platform>
-	</targetPlatforms>
+    </platform>
+  </targetPlatforms>
 </configuration>
diff --git a/releng/org.eclipse.epp.config/eclipse_rcp_340.xml b/releng/org.eclipse.epp.config/eclipse_rcp_340.xml
index 686a0c80..1a61b445 100644
--- a/releng/org.eclipse.epp.config/eclipse_rcp_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_rcp_340.xml
@@ -201,6 +201,10 @@ org.eclipse.platform
       <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
diff --git a/releng/org.eclipse.epp.config/eclipse_reporting_340.xml b/releng/org.eclipse.epp.config/eclipse_reporting_340.xml
index 7ad0fa1f..8e12ded5 100644
--- a/releng/org.eclipse.epp.config/eclipse_reporting_340.xml
+++ b/releng/org.eclipse.epp.config/eclipse_reporting_340.xml
@@ -396,6 +396,10 @@ org.eclipse.platform
       <archiveFormat format="tar" />
       <eclipseIniFileContent path="/eclipse/Eclipse.app/Contents/MacOS/">-showsplash
 org.eclipse.platform
+-startup
+../../../plugins/org.eclipse.equinox.launcher_1.0.100.v20080303.jar
+--launcher.library
+../../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.100.v20080303
 -vmargs
 -Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
diff --git a/releng/org.eclipse.epp.config/packages_map.txt b/releng/org.eclipse.epp.config/packages_map.txt
index e7d95bd2..c054364a 100644
--- a/releng/org.eclipse.epp.config/packages_map.txt
+++ b/releng/org.eclipse.epp.config/packages_map.txt
@@ -3,10 +3,10 @@
 
 cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_cpp_340.xml,HEAD,eclipse_cpp_340.xml
 java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_java_340.xml,HEAD,eclipse_java_340.xml
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_jee_340.xml,HEAD,eclipse_jee_340.xml
-#jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,webtools.releng/org.eclipse.wtp.releng.epp/config/eclipse_jee_340.xml,HEAD,eclipse_jee_340.xml
+#jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_jee_340.xml,HEAD,eclipse_jee_340.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,webtools.releng/org.eclipse.wtp.releng.epp/config/eclipse_jee_340.xml,HEAD,eclipse_jee_340.xml
 rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_rcp_340.xml,HEAD,eclipse_rcp_340.xml
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.amalgam/releng/org.eclipse.amalgam.releng/epp/eclipse_modeling_ganymede.xml,HEAD,eclipse_modeling_340.xml
-#modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_modeling_340.xml,HEAD,eclipse_modeling_340.xml
+#modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,org.eclipse.amalgam/releng/org.eclipse.amalgam.releng/epp/eclipse_modeling_ganymede.xml,HEAD,eclipse_modeling_340.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_modeling_340.xml,HEAD,eclipse_modeling_340.xml
 reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_reporting_340.xml,HEAD,eclipse_reporting_340.xml