Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing the name from "Eclipse UI" to "eclipseui" to avoid space in path names #2411

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

elsazac
Copy link
Member

@elsazac elsazac commented Oct 16, 2024

Refs: #1460

Changing the path name from "Eclipse UI" to "eclipseui" and "Eclipse UI Editor Support" to "eclipseuieditorsupport" ,
to avoid space in path names and to make it UNIX friendly.

Files changed belongs to : org.eclipse.ui.workbench

@elsazac
Copy link
Member Author

elsazac commented Oct 16, 2024

This is the first bundle created as suggested in #1460 (comment), and even though it's a draft PR, it's open for review. However, please don't land it until all the bundles are covered.

@akurtakov
Copy link
Member

@elsazac For each such change you have to make sure that the full agregator build still works - e.g. this will break javadoc build and https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b61229494d094a01678b663371379fce580df2d7/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml#L594 have to be changed. Please prep a corresponding PR.
Also I believe it's best to handle bundle by bundle fully and land the changes in so build issues like the one pointed can be handled easier instead of landing multiple bundles at once and thus making it harder to fix things after that.

Copy link
Contributor

github-actions bot commented Oct 16, 2024

Test Results

 1 821 files  ±0   1 821 suites  ±0   1h 52m 20s ⏱️ - 2m 6s
 7 725 tests ±0   7 496 ✅  - 1  228 💤 ±0  1 ❌ +1 
24 336 runs  ±0  23 588 ✅  - 1  747 💤 ±0  1 ❌ +1 

For more details on these failures, see this check.

Results for commit 796786a. ± Comparison against base commit 560db2a.

♻️ This comment has been updated with latest results.

@elsazac
Copy link
Member Author

elsazac commented Oct 16, 2024

@elsazac For each such change you have to make sure that the full agregator build still works - e.g. this will break javadoc build and https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b61229494d094a01678b663371379fce580df2d7/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml#L594 have to be changed. Please prep a corresponding PR.

@akurtakov - thanks, I thought about that, and hence I kept this PR in draft. I will bring up the releng-aggregator PR before undrafting this PR.

@elsazac
Copy link
Member Author

elsazac commented Oct 16, 2024

Also I believe it's best to handle bundle by bundle fully and land the changes in so build issues like the one pointed can be handled easier instead of landing multiple bundles at once and thus making it harder to fix things after that.

my original plan was to make multiple PRs for as many bundles for Eclipse UI subfolders, and un-draft all at once when everything is ready. But reading your comment and thinking about it further - I think a better approach would be to :

  • prepare the releng-aggregator PR for this change (ie, add a new sourcepath ( ie, (eclipseui) ) for the new bundle )
  • Also at the same time retain the original Eclipse UI version in the sourcepath
  • retain the original classpathentry and source in bundles/org.eclipse.ui.workbench/.classpath and bundles/org.eclipse.ui.workbench/build.properties while adding a new one (ie, eclipseui) for the new bundle
  • land this PR, and fix any potential issues thereon
  • repeat this for all the bundles
  • finally remove the original entries (ie Eclipse UI) from pom.xml, build.properties and .classpath, that points to the old folder which is now unused.

What do you think?

@akurtakov
Copy link
Member

This sounds overly complicated to me. Smth like:

  • grep in aggregator to find where "Eclipse UI" is used
  • do all the changes locally
  • verify it builds locally
  • land all PRs at once

@HannesWell
Copy link
Member

In order to very this change in an aggregator build in advance you could also create a temporary/draft PR against https://github.com/eclipse-platform/eclipse.platform.releng.aggregator, where you modify the .gitmodules file to include this PR's branch.
I.e. you have to change
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b61229494d094a01678b663371379fce580df2d7/.gitmodules#L26-L28
to

[submodule "eclipse.platform.ui"]
  path = eclipse.platform.ui
  url = https://github.com/elsazac/eclipse.platform.ui.git
  branch = bundle2

@elsazac
Copy link
Member Author

elsazac commented Oct 17, 2024

This sounds overly complicated to me. Smth like:

  • grep in aggregator to find where "Eclipse UI" is used
  • do all the changes locally
  • verify it builds locally
  • land all PRs at once

Sure, I will proceed accordingly.

@elsazac
Copy link
Member Author

elsazac commented Oct 17, 2024

In order to very this change in an aggregator build in advance you could also create a temporary/draft PR against https://github.com/eclipse-platform/eclipse.platform.releng.aggregator, where you modify the .gitmodules file to include this PR's branch.

@HannesWell Thank you for the suggestion. I’ll incorporate this.

@laeubi
Copy link
Contributor

laeubi commented Oct 17, 2024

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/?tab=readme-ov-file#how-to-build-the-eclipse-sdk shows how one can build aggregator locally, it takes a while but might be more efficient than waiting for the Jenkins, you can for example simply remove the checked out submodule and replace it with a link to your forked repository.

elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 17, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 17, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
@sravanlakkimsetti
Copy link
Member

Possibly you may use https://ci.eclipse.org/platform/job/eclipse-aggregator-master/ modify this job according to your needs

elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 28, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 28, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 28, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
@elsazac elsazac marked this pull request as ready for review October 28, 2024 12:03
@elsazac
Copy link
Member Author

elsazac commented Oct 28, 2024

@akurtakov This is ready for review

This has been tested locally and the following changes are required.

Changes in a nutshell :

  • 11 files moved to new folder eclipseui
  • Made entry in .classpath and build.properties for the new path.
  • Retain the old entries (for the sake of other files, will be removed after this exercise)
  • Adjusted releng aggregator to accommodate this change.

@akurtakov akurtakov changed the title Change path name -bundle 1 Changing the name from "Eclipse UI" to "eclipseui" to avoid space in path names Oct 28, 2024
@akurtakov
Copy link
Member

So in #1460 (comment) you said that you will do one PR per bundle, what happened ?

@elsazac elsazac force-pushed the bundle2 branch 2 times, most recently from aa788ac to 165de00 Compare October 30, 2024 07:46
@elsazac
Copy link
Member Author

elsazac commented Oct 30, 2024

Made changes in org.eclipse.ui.workbench bundle. Will make a corresponding change in releng aggregator as well.

elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 30, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 30, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Oct 31, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
@elsazac elsazac force-pushed the bundle2 branch 2 times, most recently from 9a98efa to 55032c2 Compare November 1, 2024 07:11
@elsazac
Copy link
Member Author

elsazac commented Nov 1, 2024

@akurtakov This is ready now.

Could you review and let me know of any changes?

@akurtakov
Copy link
Member

Looks good to me. Please merge (together with aggregator PR) and start I-build immediately after that when you can monitor the build for breakage.

elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Nov 5, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
@elsazac elsazac force-pushed the bundle2 branch 2 times, most recently from 7353307 to 3d40b77 Compare November 6, 2024 10:03
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Nov 6, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
elsazac added a commit to elsazac/eclipse.platform.releng.aggregator that referenced this pull request Nov 7, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
@elsazac
Copy link
Member Author

elsazac commented Nov 7, 2024

Merging this now and will initiate an I-Build to check for any potential failures.

@elsazac elsazac merged commit 745385a into eclipse-platform:master Nov 7, 2024
15 of 17 checks passed
elsazac added a commit to eclipse-platform/eclipse.platform.releng.aggregator that referenced this pull request Nov 7, 2024
Corresponding changes in the the workbench bundle in pom.xml in releng
aggregator.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants