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

Bug 342550

Summary: [patch] Follow-up: consolidate copies of ProductFile and BrandingIron
Product: [Eclipse Project] PDE Reporter: Tobias Oberlies <t-oberlies>
Component: BuildAssignee: DJ Houghton <dj.houghton>
Status: RESOLVED FIXED QA Contact:
Severity: enhancement    
Priority: P3 CC: curtis.windatt.public, jeffmcaffer
Version: 3.8   
Target Milestone: 3.8 M5   
Hardware: All   
OS: All   
Whiteboard:
Attachments:
Description Flags
Use consolidated BrandingIron and ProductFile none

Description Tobias Oberlies CLA 2011-04-12 07:46:42 EDT
Some of the consolidation between p2 and pde.build could not be applied due to the upcoming simulateous release. The bundle org.eclipse.equinox.p2.publisher.eclipse contains the consolidated versions of ProductFile and BrandingIron, but pde.build does not use them yet. (Consolidated means that they contain all functionality required by p2 and pde.build).

We should complete the consolidation early in 3.8:
- Delete the copies of ProductFile and BrandingIron in org.eclipse.pde.build
- Adapt the pde.build code to use the equivalent classes from p2

These steps are the inverse of commit https://github.com/jglander/eclipse-publisher-refactoring/commit/8ded64286183c4f50ebb993d0fd5ffcae57d3944
Comment 1 Thomas Watson CLA 2011-06-08 11:31:03 EDT
Move all 3.8 bugs to Juno.
Comment 2 Tobias Oberlies CLA 2011-11-18 09:21:35 EST
Created attachment 207217 [details]
Use consolidated BrandingIron and ProductFile
Comment 3 Tobias Oberlies CLA 2011-11-18 09:24:54 EST
Moving over to PDE build. The attached patch contains the remaining changes which were done in the refactoring activities around bug 331974. I am not a committer, so could a committer please bring this patch in? Cheers!
Comment 4 DJ Houghton CLA 2011-12-09 14:51:55 EST
Fixed locally in commit a9a0bfca428d4cb40a2d5700dafb8ed260650164.
I will push to eclipse.org next week once the milestone build has been declared.
Comment 5 Tobias Oberlies CLA 2012-03-02 13:11:02 EST
I turns out the PDE build doesn't like the magic rename of eclipse.app to Eclipse.app for Mac (see bug 368246), so I moved that code out of the BrandingIron and into the (only) user on the p2 side [1]

[1] http://git.eclipse.org/c/equinox/rt.equinox.p2.git/commit/?id=d798afdcc111e6169095fb291e4925490d3880b2