Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 390855 - Include ISV docs in CBI build
Summary: Include ISV docs in CBI build
Status: CLOSED FIXED
Alias: None
Product: JDT
Classification: Eclipse Project
Component: UI (show other bugs)
Version: 3.8   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: 3.8.2   Edit
Assignee: Markus Keller CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 386884
  Show dependency tree
 
Reported: 2012-10-01 14:24 EDT by Thanh Ha CLA
Modified: 2012-12-11 03:19 EST (History)
3 users (show)

See Also:

Attachments
jdt.patch (1.32 KB, patch)
2012-10-01 14:24 EDT, Thanh Ha CLA 		no flags Details | Diff
rmduplicate.patch (1.02 KB, patch)
2012-10-02 10:02 EDT, Thanh Ha CLA 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thanh Ha CLA 2012-10-01 14:24:03 EDT 
Created attachment 221733 [details]
jdt.patch

Attached patch lets Tycho include org.eclipse.jdt.doc.isv in the generated-source feature.

Before the patch can be applied commit 66ffda3695799e7c8de983896e0559388426005d must be reverted.

http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/?h=R3_8_maintenance&id=66ffda3695799e7c8de983896e0559388426005d
Comment 1 Markus Keller CLA 2012-10-02 09:54:52 EDT 
Released comment 0: http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/?id=bb4550d9462fb71b9f36b1a85ac7399af23e8910

Bumped version to 3.8.2, because 3.8.1 has shipped: http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/?id=cbc0aff024d3a496af74209a3a8ed53566fe4a9b


I assume the master branch will be updated in batch some time later (otherwise, please advise if I'm expected to do anything there).
Comment 2 Paul Webster CLA 2012-10-02 09:56:49 EDT 
(In reply to comment #1)
> Released comment 0:
> http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/
> ?id=bb4550d9462fb71b9f36b1a85ac7399af23e8910
> 
> Bumped version to 3.8.2, because 3.8.1 has shipped:
> http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/
> ?id=cbc0aff024d3a496af74209a3a8ed53566fe4a9b

Thank you Markus.

> I assume the master branch will be updated in batch some time later
> (otherwise, please advise if I'm expected to do anything there).

Yes, that's the plan once we stabilize the 3.8.2/4.2.2 builds.

PW
Comment 3 Thanh Ha CLA 2012-10-02 10:02:34 EDT 
Created attachment 221778 [details]
rmduplicate.patch

Looks like commit 66ffda3695799e7c8de983896e0559388426005d was not reverted first so now there's 2 "tycho-source-feature-plugin" sections. Attached patch will remove the first instance it.
Comment 4 Thanh Ha CLA 2012-10-02 10:03:12 EDT 
Please apply the rmduplicate.patch
Comment 5 Paul Webster CLA 2012-10-02 10:30:56 EDT 
(In reply to comment #4)
> Please apply the rmduplicate.patch

It looks like the revert was included.
Comment 6 Thanh Ha CLA 2012-10-02 10:34:14 EDT 
(In reply to comment #5)
> (In reply to comment #4)
> > Please apply the rmduplicate.patch
> 
> It looks like the revert was included.

My apologies, I had merged instead of rebased so my repo got messed up and I didn't realize. Please ignore my previous comments.
Comment 7 Markus Keller CLA 2012-10-02 10:51:43 EDT 
OK, I already removed the org.eclipse.tycho.extras manually, since I couldn't apply your patch. I've reverted my fix attempt now, and HEAD should be in good shape again with http://git.eclipse.org/c/jdt/eclipse.jdt.git/commit/?h=R3_8_maintenance&id=dacfb414350fa6dbef42265288085791bd968525
Comment 8 Dani Megert CLA 2012-12-11 03:19:55 EST 
.