Community
Participate
Working Groups
These are changes related to bug 391273. See bug 392521 for other required changes handled via variables. In other cases, though, its easier, or required to duplicate a whole file in the "split stream" portion of maps project, instead of doing all the programming to use variables. Such files are maintained in a parallel structure, in /org.eclipse.releng/configuration/eclipseBuilderOverlays and at build time, they are taken, depending on stream, and put over the main eclipseBuilder. The list of files that are known for this to be required are buildConfiguration.xml - org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/osgistarter.config.launcher customTargets.xml - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk (2 matches) run.xml - org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox.prov (20 matches) testManifest.xml - org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles (6 matches) testManifest.xml - org.eclipse.releng.eclipsebuilder/equinox/publishingFiles (2 matches)
This is the initial commit, with files left in place, in eclipsebuilder, just to confirm all is working, again, and once that's done, need to move to maps project in parallel directory structure.
(In reply to comment #1) > This is the initial commit, with files left in place, in eclipsebuilder, > just to confirm all is working, again, and once that's done, need to move to > maps project in parallel directory structure. Whoops: http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/commit/?id=280f9987bbfc9ea2476e6ce271d135b4127750dd
There remains these build.properties files. I _think_ in these values are no longer used by the build. Could be wrong, but ... just see oddities and inconsistencies, so I hate to perpetuate something in split stream that's not required. I'll start off leaving "as is", if that works in master branch, I think that's a strong sign not required, so then will consider (look again) as removing or setting to a more neutral value, e.g. configs=*,*,* Advice welcome. build.properties - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master build.properties - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/org.eclipse.equinox.executable build.properties - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/pde.build.config.launcher (2 matches) build.properties - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.config (2 matches) build.properties - org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk (2 matches) build.properties - org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/osgistarter.config.launcher (2 matches)
The build failed, so went ahead and changed all ia64_32 to ia64 in the build.properties files. At best it'd be an indirect explanation for error message but ... changing these back should get us back to point of where we were building.
The commit for the build.properties changes was http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/commit/?id=057369413409905208414d11bc399630c9aa30b2
Created attachment 222619 [details] text file listing relevent files The attachment lists the files in eclipseBuilder that were moved to maps project, to the configuration/eclipseBuilderOverlays directory. Left commented files in eclipseBuilder so a) letter documented b) intentionally fail if I missed one, or system isn't working. In the attachment, it is handy to compare to see (and for me to double check) the parallel directory structure. The actual commit to eclipsebuilder was http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/commit/?id=e38968ed552135093b666996ff13e66207dd2b0d The commit to maps master was http://git.eclipse.org/c/platform/eclipse.platform.releng.maps.git/commit/?id=31f25f852539428aab57c6ecc38f4f3d93faec3f Once I run this in an N build (as 18:45 today 10/21) and confirm its working, I'll put the corresponding (original) versions in the maintenance branches.
The basics of the build (for 4.3 Nightly) seemed to work fine, so I went ahead and put the original files (with ia64_32) in the configuration/eclipseBuilderOverlays folder. I don't plan to test build M-builds early (since confident all is well) but ... next maintenance build deserves checking to make sure it still builds hpux ia64_32.
mass change to 'verified', as these bugs are either routine or obviously fixed build breaks.
