Bugzilla – Full Text Bug Listing
| Summary: | Merge Equinox framework into 3.8.2/4.2.2 | ||
|---|---|---|---|
| Product: | [Eclipse Project] Equinox | Reporter: | Paul Webster <pwebster> |
| Component: | Framework | Assignee: | equinox.framework-inbox <equinox.framework-inbox> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | akurtakov, krzysztof.daniel, Silenio_Quarti, tjwatson |
| Version: | 3.8.0 Juno | ||
| Target Milestone: | Juno SR2 | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Bug Depends on: | |||
| Bug Blocks: | 389350 | ||
|
Description
Paul Webster
(In reply to comment #0) > rt.equinox.framework (Juno_cbinopom): > > 7587c9890dfaa818950f396000d74a6fc8796ea6 > http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/ > ?h=Juno_cbinopom&id=7587c9890dfaa818950f396000d74a6fc8796ea6 This is related to (dup of) bug 379847. I can go ahead and release, but need to keep an eye on the pde-based build to see if it fails with this change. > > 22f4b346753654bff5fe850b1d49c20787d5970b > http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/ > ?h=Juno_cbinopom&id=22f4b346753654bff5fe850b1d49c20787d5970b Silenio, can you take a look at this one? It is changes to the launcher build scripts and I have no idea what the impact is. (In reply to comment #1) > > > > 22f4b346753654bff5fe850b1d49c20787d5970b > > http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/ > > ?h=Juno_cbinopom&id=22f4b346753654bff5fe850b1d49c20787d5970b > > Silenio, can you take a look at this one? It is changes to the launcher > build scripts and I have no idea what the impact is. I do not think the changes affect our current build process since they are just adding a new task (build_eclipse_cbi), but I do not see why this new tasks is necessary since it is a copy of "build_eclipse" with two differences: - it does not refresh "platform-launcher" when running from eclipse. First, this refresh is wrong. The project "platform-launcher" has been renamed to "org.eclipse.equinox.executable" for a long time. We should refresh the right project or stop refreshing. Is this the reason for the copied task? - it changes the library output dir for gtk if the -cbi option is specified The current library output dir is wrong. The binaries have move to the rt.equinox.binaries repo. Shouldn't we just fix this (for build_eclipse task) and not have the new task? (In reply to comment #2) > (In reply to comment #1) > > > > > > 22f4b346753654bff5fe850b1d49c20787d5970b > > > http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/ > > > ?h=Juno_cbinopom&id=22f4b346753654bff5fe850b1d49c20787d5970b > > > > Silenio, can you take a look at this one? It is changes to the launcher > > build scripts and I have no idea what the impact is. > > I do not think the changes affect our current build process since they are > just adding a new task (build_eclipse_cbi), but I do not see why this new > tasks is necessary since it is a copy of "build_eclipse" with two > differences: > > - it does not refresh "platform-launcher" when running from eclipse. > > First, this refresh is wrong. The project "platform-launcher" has been > renamed to "org.eclipse.equinox.executable" for a long time. We should > refresh the right project or stop refreshing. Is this the reason for the > copied task? As CBI is running inside tycho without projects being imported in workspace and etc. the refresh needs to be removed so it can be used from inside CBI(tycho). Are there people relying on this refresh? I don't think it's useful at all especially with lighweight resource refresh enabled by default in Juno. > > - it changes the library output dir for gtk if the -cbi option is specified > > The current library output dir is wrong. The binaries have move to the > rt.equinox.binaries repo. Shouldn't we just fix this (for build_eclipse > task) and not have the new task? That would be ideal. I'm pretty sure that Chris introduced them as secondary changes in order to not disrupt any of the existing releng procedures. Although it obviously couldn't have worked releng changes weren't taken easily in the past which made us extra cautious. (In reply to comment #3) > As CBI is running inside tycho without projects being imported in workspace > and etc. the refresh needs to be removed so it can be used from inside > CBI(tycho). Are there people relying on this refresh? I don't think it's > useful at all especially with lighweight resource refresh enabled by default > in Juno. That is my point. Nobody can be relying on the refresh because it is refreshing the wrong project. We can remove it. > That would be ideal. I'm pretty sure that Chris introduced them as secondary > changes in order to not disrupt any of the existing releng procedures. > Although it obviously couldn't have worked releng changes weren't taken > easily in the past which made us extra cautious. Ok, I am going to fix the library dir paths without adding the CBI option. I fixed the scripts in master and R3_8_maintenance. http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit?h=R3_8_maintenance&id=2cc6a491ad3707d92de196e1ecf81dcf9b18623b http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit/?id=352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0 I just realized that these build files are not used in our Hudson build. That is why they were never updated when we created the binaries repo. The script used by Hudson is "rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/build.xml". It has the correct paths. (In reply to comment #0) > rt.equinox.framework (Juno_cbinopom): > > 7587c9890dfaa818950f396000d74a6fc8796ea6 > http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/ > ?h=Juno_cbinopom&id=7587c9890dfaa818950f396000d74a6fc8796ea6 > I released this change to R3_8_maintenance and master Marking as fixed since all has been released. |