Attachment 171335 Details for Bug 316056 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

patch.txt (text/plain), 9.67 KB, created by John Arthorne

on 2010-06-07 16:34:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2010-06-07 16:34:39 EDT

Size: 9.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/platform.sdk/p2.inf
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/p2.inf,v
>retrieving revision 1.4
>diff -u -r1.4 p2.inf
>--- eclipse/buildConfigs/platform.sdk/p2.inf	29 Jun 2009 14:59:34 -0000	1.4
>+++ eclipse/buildConfigs/platform.sdk/p2.inf	7 Jun 2010 20:34:10 -0000
>@@ -1,6 +1,8 @@
> instructions.configure=\
>-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
> addRepository(type:0,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
> addRepository(type:1,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
>   mkdir(path:${installFolder}/dropins);
>Index: eclipse/buildConfigs/platform.sdk/platform.product
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/platform.product,v
>retrieving revision 1.12
>diff -u -r1.12 platform.product
>--- eclipse/buildConfigs/platform.sdk/platform.product	12 May 2010 01:45:58 -0000	1.12
>+++ eclipse/buildConfigs/platform.sdk/platform.product	7 Jun 2010 20:34:10 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?pde version="3.5"?>
> 
>-<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0.@qualifier@" useFeatures="true" includeLaunchers="true">
>+<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
>Index: eclipse/buildConfigs/platform/p2.inf
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/p2.inf,v
>retrieving revision 1.7
>diff -u -r1.7 p2.inf
>--- eclipse/buildConfigs/platform/p2.inf	29 Jun 2009 14:59:33 -0000	1.7
>+++ eclipse/buildConfigs/platform/p2.inf	7 Jun 2010 20:34:10 -0000
>@@ -1,6 +1,8 @@
> instructions.configure=\
>-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
> addRepository(type:0,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
> addRepository(type:1,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
>   mkdir(path:${installFolder}/dropins);
>Index: eclipse/buildConfigs/platform/platform.product
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/platform.product,v
>retrieving revision 1.12
>diff -u -r1.12 platform.product
>--- eclipse/buildConfigs/platform/platform.product	12 May 2010 01:46:01 -0000	1.12
>+++ eclipse/buildConfigs/platform/platform.product	7 Jun 2010 20:34:10 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?pde version="3.5"?>
> 
>-<product name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0.@qualifier@" useFeatures="true">
>+<product name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
>@@ -169,9 +169,6 @@
>       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
>       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
>       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
>-      <property name="org.eclipse.update.reconcile" value="false" />                                        
>-      <property name="osgi.bundles.defaultStartLevel" value="4" />   
>-      <property name="eclipse.buildId" value="@qualifier@"/>   
>    </configurations>
> 
> </product>
>Index: eclipse/buildConfigs/rcp.sdk/rcp.product
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/rcp.product,v
>retrieving revision 1.12
>diff -u -r1.12 rcp.product
>--- eclipse/buildConfigs/rcp.sdk/rcp.product	2 Jun 2010 15:37:42 -0000	1.12
>+++ eclipse/buildConfigs/rcp.sdk/rcp.product	7 Jun 2010 20:34:10 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?pde version="3.5"?>
> 
>-<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="3.6.0.@qualifier@" useFeatures="true" includeLaunchers="true">
>+<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
>Index: eclipse/buildConfigs/rcp/rcp.product
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/rcp.product,v
>retrieving revision 1.10
>diff -u -r1.10 rcp.product
>--- eclipse/buildConfigs/rcp/rcp.product	12 May 2010 01:45:59 -0000	1.10
>+++ eclipse/buildConfigs/rcp/rcp.product	7 Jun 2010 20:34:10 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?pde version="3.5"?>
> 
>-<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="3.6.0.@qualifier@" useFeatures="true" includeLaunchers="true">
>+<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
>Index: eclipse/buildConfigs/sdk/builder/p2.inf
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/builder/p2.inf,v
>retrieving revision 1.5
>diff -u -r1.5 p2.inf
>--- eclipse/buildConfigs/sdk/builder/p2.inf	29 Jun 2009 14:59:33 -0000	1.5
>+++ eclipse/buildConfigs/sdk/builder/p2.inf	7 Jun 2010 20:34:10 -0000
>@@ -1,6 +1,8 @@
> instructions.configure=\
>-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.0,name:The Eclipse Project Updates);\
>+addRepository(type:0,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
>+addRepository(type:1,location:http${#58}//download.eclipse.org/e4/updates/2010,name:e4 2010 Updates);\
> addRepository(type:0,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
> addRepository(type:1,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
>   mkdir(path:${installFolder}/dropins);
>Index: eclipse/buildConfigs/sdk/builder/sdk.product
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/builder/sdk.product,v
>retrieving revision 1.10
>diff -u -r1.10 sdk.product
>--- eclipse/buildConfigs/sdk/builder/sdk.product	12 May 2010 01:45:59 -0000	1.10
>+++ eclipse/buildConfigs/sdk/builder/sdk.product	7 Jun 2010 20:34:10 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?pde version="3.5"?>
> 
>-<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0.@qualifier@" useFeatures="true">
>+<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
>@@ -171,9 +171,6 @@
>       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
>       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
>       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
>-      <property name="org.eclipse.update.reconcile" value="false" />                                        
>-      <property name="osgi.bundles.defaultStartLevel" value="4" />   
>-      <property name="eclipse.buildId" value="@qualifier@"/>    
>    </configurations>
> 
> </product>

Actions: View | Diff

Attachments on bug 316056: 171335 | 171450 | 171572 | 171752