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

Bug 367888

Summary:	Organize maps in R4_HEAD
Product:	[Eclipse Project] Platform	Reporter:	John Arthorne <john.arthorne>
Component:	Releng	Assignee:	John Arthorne <john.arthorne>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	kim.moir, pwebster, remy.suen
Version:	4.1
Target Milestone:	4.2 M5
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description John Arthorne

2012-01-04 15:09:15 EST

In preparation for running full Eclipse builds on the 4.x stream, the R4_HEAD branch of the releng project needs to be updated with the correct list of projects. The tags can be fixed  by running the releng script, but the project list at least needs to be right. I'll take a first attempt at this.

Comment 1 John Arthorne

2012-01-04 16:00:49 EST

Ok, I have taken a first stab at this. Steps:

1) Merged everything from org.eclipse.releng master branch into R4_HEAD branch. When there were conflicts the master copy won. Most of the conflicts were in click-thrus and api-exclude list.

2) Added the relevant map file entries from e4...
 - Commented out 3.x version of split stream bundles in ui.map
 - added e4.map with all e4 contents (it's possible I missed something here)
 - Adjusted doc.map with tags from R4_HEAD stream. This was a formality because the tagging scripts should adjust this. We will need to work out our story for documentation separately. Probably all the doc needs to be split-stream because of screen shot changes. We want master to contain 4.x contents though.
 - Adjusted feature.map and rcp.map to contain the entries used in the 4.x build. In some cases these are still pointing at CVS, which surprised me. Obviously they need to switch to Git but I wanted to just start with something matching current 4.x build. 
 - Added e4's new orbit dependencies to orbit.map

Here is the commit ref for step 2:

http://git.eclipse.org/c/platform/eclipse.platform.releng.maps.git/commit/?h=R4_HEAD&id=759da64ff494ed252597fc616bb73f58a5e49c0d

3) Edited the tagging/repositories.txt to use master for ui repository, and R4_HEAD for common (doc) repository. Commit ref:

http://git.eclipse.org/c/platform/eclipse.platform.releng.maps.git/commit/?h=R4_HEAD&id=d181b65f8da9a78da014f348723c3d7fee6f1df0

Comment 2 John Arthorne

2012-01-04 16:01:26 EST

I'm sure I missed something here, but I think the next step is to run a test build and see what breaks...

Comment 3 Kim Moir

2012-01-04 16:16:59 EST

Thanks John, I'll run a test build.  I happened to branch the builder today too (R4_2_primary)

Comment 4 John Arthorne

2012-01-16 09:48:14 EST

Marking done. We can open separate bugs for further tweaks.