Bug 376813 - remove incubator repos from (and other p2.inf differences) in 4.2 platform product
Summary: remove incubator repos from (and other p2.inf differences) in 4.2 platform pr...
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Releng (show other bugs)
Version: 4.2   Edit
Hardware: PC Linux
: P2 normal (vote)
Target Milestone: 4.2 M7   Edit
Assignee: David Williams CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 376217
  Show dependency tree
 
Reported: 2012-04-14 23:30 EDT by David Williams CLA
Modified: 2012-04-17 16:34 EDT (History)
3 users (show)

See Also:
david_williams: review? (john.arthorne)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description David Williams CLA 2012-04-14 23:30:00 EDT
This is mentioned in several other bugs, and appears to have been fixed in the eclipsebuilder in R3_developement but the eclipsebuilder in master still has 

addRepository(type:0,location:http${#58}//download.eclipse.org/e4/updates/0.12,name:e4 0.11 Updates);\
addRepository(type:1,location:http${#58}//download.eclipse.org/e4/updates/0.12,name:e4 0.11 Updates);\


in the p2.inf file in platform buildconfigs ... so I'll remove them from 'master' version as well.
Comment 1 David Williams CLA 2012-04-14 23:42:29 EDT
I set the bugs priority to P2 and am asking for review of other changes in the p2.info file (for platform) 

It contains some other differences from the version in R3_development ... most of which I would not think needed, but I do not understand what they are for.

One difference, the last group of "units.4" changes I do know about, and know they are supposed to be different from 3.8 and 4.2 (to prevent 4.2 from being automatically provided as an upgrade from 3.8 install) ... but ... what about these other differences? requires 3? and units 3? Are they required? Or have the streams gotten "out of synch" here too?  
= = = =

requires.3.namespace=org.eclipse.equinox.p2.iu
requires.3.name=toolingorg.eclipse.configuration.gtk.linux.x86_64
requires.3.filter=(&(osgi.os=linux) (osgi.arch=x86_64) (osgi.ws=gtk))
requires.3.range=[1.0.0,1.0.0]
requires.3.greedy=true

units.3.id=toolingorg.eclipse.configuration.gtk.linux.x86_64
units.3.version=1.0.0
units.3.provides.1.namespace=org.eclipse.equinox.p2.iu
units.3.provides.1.name=toolingorg.eclipse.configuration.gtk.linux.x86_64
units.3.provides.1.version=1.0.0
units.3.filter=(&(osgi.os=linux) (osgi.arch=x86_64) (osgi.ws=gtk))
units.3.touchpoint.id=org.eclipse.equinox.p2.osgi
units.3.touchpoint.version=1.0.0
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);


= = = = 
This is the change that I know should only be in master, but not be in R3_development. 

units.4.id = org.eclipse.platform.ide
units.4.update.range = [4.0,4.3)
units.4.update.severity = 0
units.4.update.description = Restrict range so we are not an update for 3.x.
Comment 2 David Williams CLA 2012-04-15 00:09:17 EDT
Similar issues/questions in the p2.inf file for Eclipse SDK

/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/builder/p2.inf
Comment 3 John Arthorne CLA 2012-04-16 16:51:41 EDT
This "unit.3" is setting this program property on 64-bit Linux:

org.eclipse.swt.internal.gtk.useCairo=true

It looks like this was done in bug 347086. Bogdan is this property still required in 4.2?
Comment 4 John Arthorne CLA 2012-04-16 16:52:46 EDT
It's a bit fuzzy what you are asking me to review so I haven't see the review flag... If you are asking for a second opinion on the repository reference to the 0.12 e4 repository, I say go ahead and remove it.
Comment 5 David Williams CLA 2012-04-16 17:23:23 EDT
(In reply to comment #4)
> It's a bit fuzzy what you are asking me to review so I haven't see the review
> flag... If you are asking for a second opinion on the repository reference to
> the 0.12 e4 repository, I say go ahead and remove it.

Sorry about that, I was just trying to get your attention :\ Guess CC would have sufficed. 

The question I have is if this part of the p2.inf (below) should be removed from 4.2 stream, or added to 3.8 stream or left as is (in 4.2, but not in 3.8). 

requires.3.namespace=org.eclipse.equinox.p2.iu
requires.3.name=toolingorg.eclipse.configuration.gtk.linux.x86_64
requires.3.filter=(&(osgi.os=linux) (osgi.arch=x86_64) (osgi.ws=gtk))
requires.3.range=[1.0.0,1.0.0]
requires.3.greedy=true

units.3.id=toolingorg.eclipse.configuration.gtk.linux.x86_64
units.3.version=1.0.0
units.3.provides.1.namespace=org.eclipse.equinox.p2.iu
units.3.provides.1.name=toolingorg.eclipse.configuration.gtk.linux.x86_64
units.3.provides.1.version=1.0.0
units.3.filter=(&(osgi.os=linux) (osgi.arch=x86_64) (osgi.ws=gtk))
units.3.touchpoint.id=org.eclipse.equinox.p2.osgi
units.3.touchpoint.version=1.0.0
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
Comment 6 Paul Webster CLA 2012-04-17 07:44:23 EDT
(In reply to comment #5)

> The question I have is if this part of the p2.inf (below) should be removed
> from 4.2 stream, or added to 3.8 stream or left as is (in 4.2, but not in 3.8). 
> 
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
> units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);

This one should be in both streams.  It's adding a property to 64 bit linux gtk.

PW
Comment 7 John Arthorne CLA 2012-04-17 14:01:09 EDT
(In reply to comment #6)
> 
> This one should be in both streams.  It's adding a property to 64 bit linux
> gtk.

Bogdan originally requested this for 4.2 only (see bug 347086). Bogdan can you confirm whether this property should also be added in 3.8 (currently it is not)?
Comment 8 Bogdan Gheorghe CLA 2012-04-17 14:39:31 EDT
Looked at the code, we can actually remove the property in 4.2 - we turn Cairo on whenever the GTK version > 2.18. 

So nothing to add to 3.8, and we should get rid of the property in 4.2.
Comment 9 David Williams CLA 2012-04-17 15:35:54 EDT
Ok, great. I like getting rid of stuff more than adding it :) 

I'm assuming "get rid of the property" means all 16 lines from each of the three p2.inf files. Let me me know if I've misunderstood. See 

http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/commit/?id=e7cd481baa3d04cf8bf76f854af5923c52b5af7c
Comment 10 John Arthorne CLA 2012-04-17 16:34:46 EDT
(In reply to comment #9)
> Ok, great. I like getting rid of stuff more than adding it :) 
> 
> I'm assuming "get rid of the property" means all 16 lines from each of the
> three p2.inf files. Let me me know if I've misunderstood. See 
> 
> http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/commit/?id=e7cd481baa3d04cf8bf76f854af5923c52b5af7c

+1