Skip to content

Module rename #2026

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.

Sign up for GitHub

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

Merged
slozier merged 4 commits into from
Mar 18, 2026
Merged

Module rename #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe363ef
Rename submodule DLR
BCSharp Mar 18, 2026
7f08d6d
Update file paths
BCSharp Mar 18, 2026
60b253f
Update more file paths
BCSharp Mar 18, 2026
ca8eccb
Correct generate paths
BCSharp Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "Src/DLR"]
[submodule "DLR"]
path = src/dlr
url = https://github.com/IronLanguages/dlr
branch = main
8 changes: 4 additions & 4 deletions IronPython.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Solution>
<Folder Name="/DLR/">
<Project Path="src/dlr/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
<Project Path="src/dlr/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
<Project Path="src/dlr/Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
<Project Path="src/dlr/src/core/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
<Project Path="src/dlr/src/core/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
<Project Path="src/dlr/src/core/Microsoft.Scripting/Microsoft.Scripting.csproj" />
</Folder>
<Folder Name="/DLR/Tests/">
<Project Path="src/dlr/Tests/ClrAssembly/ClrAssembly.csproj" />
<Project Path="src/dlr/tests/ClrAssembly/ClrAssembly.csproj" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_root_dir():

source_directories = [
os.path.join(root_dir, "src"),
os.path.join(root_dir, "src", "dlr", "Src"),
os.path.join(root_dir, "src", "dlr", "src"),
]

exclude_directories = [
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/generate_exception_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def gen_expr_factory_com(cw):
gen_expr_factory(cw, generate.root_dir + "\\..\\..\\ndp\\fx\\src\\Dynamic\\System\\Dynamic\\System.Dynamic.txt")

def gen_expr_factory_scripting(cw):
gen_expr_factory(cw, generate.root_dir + "\\src\\dlr\\Src\\Microsoft.Dynamic\\Microsoft.Scripting.txt")
gen_expr_factory(cw, generate.root_dir + "\\src\\dlr\\src\\Microsoft.Dynamic\\Microsoft.Scripting.txt")

def main():
return generate.generate(
Expand Down
2 changes: 1 addition & 1 deletion src/core/IronPython/IronPython.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/core/IronPython/Lib/iptest/ipunittest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ def generate_suite(tests, failing_tests, skip_tests=[]):
# if not rowan_root:
# rowan_root = sys.prefix
# if is_cli:
# if System.IO.Directory.Exists(path_combine(rowan_root, '../../Src')):
# basePyDir = '../../Src'
# if System.IO.Directory.Exists(path_combine(rowan_root, '../../src')):
# basePyDir = '../../src'

# # get some directories and files
# ip_root = path_combine(rowan_root, basePyDir)
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/IronPython.SQLite/IronPython.SQLite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<ItemGroup>
<ProjectReference Include="..\..\core\IronPython\IronPython.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
</ItemGroup>

<Import Project="$(AfterTargetFiles)" />
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/IronPython.Wpf/IronPython.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<ItemGroup>
<ProjectReference Include="..\..\core\IronPython\IronPython.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
</ItemGroup>

<ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
Expand Down
2 changes: 1 addition & 1 deletion tests/IronPython.Tests/IronPython.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<!-- ensure ClrAssembly is built before IronPythonTest -->
<ProjectReference Include="..\..\src\dlr\Tests\ClrAssembly\ClrAssembly.csproj">
<ProjectReference Include="..\..\src\dlr\tests\ClrAssembly\ClrAssembly.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
Expand Down
Loading