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

Bug 361410

Summary: Compile org.eclipse.equinox.console bundles from rt.equinox.bundles
Product: [Eclipse Project] Platform Reporter: Thomas Watson <tjwatson>
Component: RelengAssignee: Kim Moir <kim.moir>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: kim.moir, l.kirchev
Version: 3.8   
Target Milestone: 3.8 M3   
Hardware: PC   
OS: Mac OS X - Carbon (unsup.)   
Whiteboard:
Bug Depends on:    
Bug Blocks: 361282    

Description Thomas Watson CLA 2011-10-19 10:35:44 EDT
Currently we build three console related bundles from the incubator:

org.eclipse.equinox.console.supportability
org.eclipse.equinox.console.jaas.fragment
org.eclipse.equinox.slf4j.stub

Lazar has moved the console bundles to the rt.equinox.bundles.  We would like to build them from there now and include them in the Equinox SDK.  Note that we also renamed the console bundle to remove "supportability".

org.eclipse.equinox.console.supportability renamed to ->
           org.eclipse.equinox.console

Kim, I always forget all that is required to do this.  Is this something we can consider doing for M3?
Comment 1 Kim Moir CLA 2011-10-20 13:33:37 EDT
Tom, what feature do you want these bundles to be included in?  Right now, the equinox sdk just includes other features, not individual bundles.
Comment 2 Thomas Watson CLA 2011-10-20 23:15:16 EDT
It should probably go into the feature at rt.equinox.framework/features/org.eclipse.equinox.core.sdk.
Comment 3 Thomas Watson CLA 2011-10-21 15:51:54 EDT
This commit copies the console bundles into the core.sdk feature and also adds the gogo bundles:

http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit/?id=41832da320aaed490efdc290c44a7003e1b71c96

This commit removes the console bundles form the incubator feature:

http://git.eclipse.org/c/equinox/rt.equinox.incubator.git/commit/?id=985faa15f03ad567dde4bf0525228c5724fa4cd6

The following commits updated the map files to account for the move:

https://git.eclipse.org/c/platform/eclipse.platform.releng.maps.git/commit/?id=a9066999399502aaf0566147a2a51b673fcae7c3
https://git.eclipse.org/c/platform/eclipse.platform.releng.maps.git/commit/?id=8b2849946c0a265ecaedb29bee8a9c3645dc6e7d

Kim is running a test build now.
Comment 4 Thomas Watson CLA 2011-10-22 07:20:20 EDT
I am not sure how the source bundles from orbit get pulled into the features.  It appears that we should not have generate.plugin lines for them though.  The nightly build failed because of this I think.  I removed them in commit:

http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit/?id=01d803316a3b0303b207ff50068e67752f157510
Comment 5 Thomas Watson CLA 2011-10-23 08:00:12 EDT
This has been fixed in the latest nightly build.
Comment 6 Kim Moir CLA 2011-10-23 17:33:47 EDT
If you want to specify the source bundles from Orbit, you need to include them in the orbit.map and then the build.properties needs to specify to consume them as binary bundles, and not generate them. For example, from the JDT feature

generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\
plugin@org.junit.source;version=4.8.2.qualifier;unpack="false",\
plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
exclude@org.eclipse.jdt.doc.user

I just tried to fix this, but it seems that my Git access is blocked again :-(
Comment 7 Thomas Watson CLA 2011-10-23 18:18:45 EDT
(In reply to comment #6)
> If you want to specify the source bundles from Orbit, you need to include them
> in the orbit.map and then the build.properties needs to specify to consume them
> as binary bundles, and not generate them. For example, from the JDT feature
> 
> generate.feature@org.eclipse.jdt.source=org.eclipse.jdt,
> plugin@org.eclipse.jdt.doc.isv;unpack="false",\
> plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\
> plugin@org.junit.source;version=4.8.2.qualifier;unpack="false",\
> plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
> exclude@org.eclipse.jdt.doc.user
> 
> I just tried to fix this, but it seems that my Git access is blocked again :-(

I'm confused because the latest equinox SDK zip seems to contain the source bundles in it.  The orbit.map includes the source bundles and I have them included in the feature.xml of the equinox core.sdk.  Not sure I really need the addition to the build.properties.