Skip to content

Module rename#2026

Merged
slozier merged 4 commits intoIronLanguages:mainfrom
BCSharp:module_rename
Mar 18, 2026
Merged

Module rename#2026
slozier merged 4 commits intoIronLanguages:mainfrom
BCSharp:module_rename

Conversation

@BCSharp
Copy link
Member

@BCSharp BCSharp commented Mar 18, 2026

Currently submodule DLR uses the following three "names":

  1. URL, from which it is being pulled: https://github.com/IronLanguages/dlr
  2. The directory path, to which it is being pulled into: src/dlr
  3. The module name itself, currently "Src/DLR"

The last one is mainly used by Git internal commands, but is being defined in .gitmodules. This is almost the same as the path, except for the letter case. This is no problem for Windows and macOS, but can be a problem on Linux. To avoid confusion, this PR normalizes the submodule name to simply "DLR". There is one module in IronPython3 after all, and there is no need to create a hierarchy.

To avoid problems with update, I recommend, on a clear DLR worktree, on the branch main:

  1. recursively copy content of directory .git/modules/Src/DLR to directory .git/modules/DLR (if using in a linked worktree, replace .git with $(cut -d' ' -f 2 .git), Bash syntax, only if linked worktree uses a separate config. Pwsh syntax: ((sls 'gitdir:' .git) -split '\s+')[1])
  2. deinit the submodule: git submodule deinit --all
  3. update the main branch from upstream (i.e. IronLanguages/ironpython3): git pull upstream main
  4. reinit the submodule: git submodule init
  5. update the submodule: git submodule update

This PR also includes some path changes needed for the submodule to work in IronPython.

@BCSharp BCSharp marked this pull request as ready for review March 18, 2026 03:13
Copy link
Contributor

@slozier slozier left a comment

Choose a reason for hiding this comment

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

Thanks!

@slozier slozier merged commit 3843d11 into IronLanguages:main Mar 18, 2026
26 checks passed
@BCSharp BCSharp deleted the module_rename branch March 18, 2026 17:26
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.

2 participants