| Summary: | Resulting zips should contain proper rootfiles | ||
|---|---|---|---|
| Product: | z_Archived | Reporter: | Anna Dushistova <anna.dushistova> |
| Component: | Dash Athena | Assignee: | Project Inbox <athena.build-inbox> |
| Status: | RESOLVED WONTFIX | QA Contact: | |
| Severity: | critical | ||
| Priority: | P3 | CC: | mober.at+eclipse, nboldt |
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Bug Depends on: | |||
| Bug Blocks: | 315057 | ||
|
Description
Anna Dushistova
The main problem here is the Eclipse SUA ("notice.html") which has been revised for Helios. We must not ship and ZIP's with Helios where the notice.html is dated before 2010.
I'm marking this as critical because this does have legal implications for the Helios release.
How are you gentlemen! Not sure I understand the problem. Per bug 307016, you can now copy the rootfiles from your generated SDK into other zips using this task in your buildExtra (if they're not appearing there already): <antcall target="addRootfilesToZip"> <param name="targetZip" value="${buildDirectory}/${buildLabel}/${allZip}" /> </antcall> Did someone set you up the bomb? You really should take off every zip, for great justice! Instead, use p2 repos only, for they will properly install everything (including rootfiles) following p2's proper rules. AYBABTU memes aside, what exactly is the issue here? Your zips contain incorrect rootfiles? How are they getting there? AFAIK the source of rootfiles is your features and their build.properties files. http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.pde.doc.user/tasks/pde_rootfiles.htm They get there by this in buildExtra.xml (for example):
<!-- build aTargetZip -->
<zip destfile="${buildDirectory}/${buildLabel}/aTarget.zip" update="true">
<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" >
<include name="**/org.eclipse.*.aTarget*/**" />
</zipfileset>
<zipfileset refid="rootfiles" />
</zip>
The request is giving guidance where the refid="rootfiles" comes from, and how to replace it with something proper.
With respect to rootfiles defined in the features, I'm afraid this doesn't help us here since Athena builds a single master feature ... or should we be holding our rootfiles as siblings of the master feature?
(In reply to comment #3) > They get there by this in buildExtra.xml (for example): > > <!-- build aTargetZip --> > <zip destfile="${buildDirectory}/${buildLabel}/aTarget.zip" update="true"> > <zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" > > <include name="**/org.eclipse.*.aTarget*/**" /> > </zipfileset> > <zipfileset refid="rootfiles" /> > </zip> > > > The request is giving guidance where the refid="rootfiles" comes from, and how > to replace it with something proper. Assuming these files are correctly located in your SDK zip, then you can copy them over into the aTarget.zip like this: <zip destfile="${buildDirectory}/${buildLabel}/aTarget.zip" update="true"> <zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" > <include name="**/org.eclipse.*.aTarget*/**" /> </zipfileset> </zip> <zip destfile="${buildDirectory}/${buildLabel}/aTarget.zip" update="true"> <zipfileset src="${buildDirectory}/${buildLabel}/${SDKZip}" includes="eclipse/epl-v10.html, eclipse/notice.html"/> </zip> Or, like this should work too: <zip destfile="${buildDirectory}/${buildLabel}/aTarget.zip" update="true"> <zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" > <include name="**/org.eclipse.*.aTarget*/**" /> </zipfileset> </zip> <ant target="addRootfilesToZip" antfile="${helper}"> <param name="targetZip" value="${buildDirectory}/${buildLabel}/aTarget.zip" /> </antcall> > With respect to rootfiles defined in the features, I'm afraid this doesn't help > us here since Athena builds a single master feature ... or should we be holding > our rootfiles as siblings of the master feature? Why not just copy the rootfiles into the master feature, so that they're available in the Master zip, and therefore can be added to the SDK, runtime, examples, and any other non-p2-repo-zips you feel you need to create. :) > <ant target="addRootfilesToZip" antfile="${helper}">
> <param name="targetZip" value="${buildDirectory}/${buildLabel}/aTarget.zip"
> />
> </antcall>
Oops. Make that <ant>...</ant>, not <ant>...</antcall>.
(In reply to comment #4) > Why not just copy the rootfiles into the master feature, so that they're > available in the Master zip, and therefore can be added to the SDK, runtime, > examples, and any other non-p2-repo-zips you feel you need to create. :) I like this approach since it makes us the owner of the rootfiles (rather than copying from the target Eclipse). Testing this now. Guess it's not valid anymore. |