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

Prefer distribution/lib/Standard files when runEngineDistribution #11736

Merged
merged 2 commits into from
Dec 3, 2024

Conversation

JaroslavTulach
Copy link
Member

@JaroslavTulach JaroslavTulach commented Dec 2, 2024

Pull Request Description

Prefer distribution/lib/Standard/* files over the files in built-distribution/enso-engine-*/enso-0.0.0-dev/lib/Standard/. This solves the common error when one debugs thru files and edits them just to find out they are rewritten by next build.

Important Notes

The support for locating alternativeFile is only enabled for developers. E.g. when Enso version is 0.0.0-dev. This is satisfied when one uses:

enso$ sbt
sbt:enso> runEngineDistribution --run test/Base_Tests --debug

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

  • Screenshots/screencasts have been attached, if there are any visual changes. For interactive or animated visual changes, a screencast is preferred.
  • All code follows the
    Java,
  • Debugging was manually tested

@JaroslavTulach JaroslavTulach added the CI: No changelog needed Do not require a changelog entry for this PR. label Dec 2, 2024
@JaroslavTulach JaroslavTulach self-assigned this Dec 2, 2024
@JaroslavTulach
Copy link
Member Author

JaroslavTulach commented Dec 2, 2024

The following picture show that while stepping thru the standard libraries...

NetBeans+Enso debugging

  • the distribution/lib/Standard versions are loaded
  • they have the Git history associated
  • editing them will update the "right" sources
  • running runBuildEngineDistribution updates the build-distribution as usual
  • the same support works in VSCode

VSCode+Enso debugging

Copy link
Member

@Akirathan Akirathan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I assume correctly that this also works for enso --inspect --run ...? This will make life of Chrome devtools users easier as well - we can just load the workspace from distribution/lib ...

@JaroslavTulach
Copy link
Member Author

JVM tests are hitting the assert introduced by this PR...

@Akirathan
Copy link
Member

Akirathan commented Dec 3, 2024

JVM tests are hitting the assert introduced by this PR...

That is unexpected. Clearly, CI jobs are setting ENSO_VERSION (https://github.com/enso-org/enso/actions/runs/12124001092/job/33800730744?pr=11736#step:7:132) to something else than 0.0.0-dev.

GitHub
Enso Analytics is a self-service data prep and analysis platform designed for data teams. - Prefer distribution/lib/Standard files when runEngineDistribution · ff7bf8a

@JaroslavTulach
Copy link
Member Author

Do I assume correctly that this also works for enso --inspect --run ...?

Yes, when the enso launcher is started with -ea (for example via sbt's runEngineDistribution), then even Chrome Dev tools show the sources from distribution/lib:

ChromeDev tools debugging

@JaroslavTulach JaroslavTulach added the CI: Ready to merge This PR is eligible for automatic merge label Dec 3, 2024
@mergify mergify bot merged commit 9daa02d into develop Dec 3, 2024
43 checks passed
@mergify mergify bot deleted the wip/jtulach/DistributionLibStandard branch December 3, 2024 12:37
Comment on lines +92 to +93
* Special support for reassigning locations of sources when running development version. When
* {@code -ea} is enabled, then we try to locate library files under the {@code
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot find the -ea check anywhere. Is this doc up-to-date?

@radeusgd
Copy link
Member

radeusgd commented Dec 3, 2024

Wow I didn't use runEngineDistribution much, but that makes me want to reconsider! This should cut the iteration time tremendously!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: No changelog needed Do not require a changelog entry for this PR. CI: Ready to merge This PR is eligible for automatic merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants