Skip to content

Commit 3843d11

Browse files
BCSharpBCSharp
authored
Module rename (#2026)
* Rename submodule DLR * Update file paths * Update more file paths * Correct generate paths
1 parent 2fbc569 commit 3843d11

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[submodule "Src/DLR"]
1+
[submodule "DLR"]
22
path = src/dlr
33
url = https://github.com/IronLanguages/dlr
44
branch = main

‎IronPython.slnx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Solution>
22
<Folder Name="/DLR/">
3-
<Project Path="src/dlr/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
4-
<Project Path="src/dlr/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
5-
<Project Path="src/dlr/Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
3+
<Project Path="src/dlr/src/core/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
4+
<Project Path="src/dlr/src/core/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
5+
<Project Path="src/dlr/src/core/Microsoft.Scripting/Microsoft.Scripting.csproj" />
66
</Folder>
77
<Folder Name="/DLR/Tests/">
8-
<Project Path="src/dlr/Tests/ClrAssembly/ClrAssembly.csproj" />
8+
<Project Path="src/dlr/tests/ClrAssembly/ClrAssembly.csproj" />
99
</Folder>
1010
<Folder Name="/Solution Items/">
1111
<File Path=".editorconfig" />

‎eng/scripts/generate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def get_root_dir():
1616

1717
source_directories = [
1818
os.path.join(root_dir, "src"),
19-
os.path.join(root_dir, "src", "dlr", "Src"),
19+
os.path.join(root_dir, "src", "dlr", "src"),
2020
]
2121

2222
exclude_directories = [

‎eng/scripts/generate_exception_factory.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def gen_expr_factory_com(cw):
172172
gen_expr_factory(cw, generate.root_dir + "\\..\\..\\ndp\\fx\\src\\Dynamic\\System\\Dynamic\\System.Dynamic.txt")
173173

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

177177
def main():
178178
return generate.generate(

‎src/core/IronPython/IronPython.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
11+
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/core/IronPython/Lib/iptest/ipunittest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ def generate_suite(tests, failing_tests, skip_tests=[]):
234234
# if not rowan_root:
235235
# rowan_root = sys.prefix
236236
# if is_cli:
237-
# if System.IO.Directory.Exists(path_combine(rowan_root, '../../Src')):
238-
# basePyDir = '../../Src'
237+
# if System.IO.Directory.Exists(path_combine(rowan_root, '../../src')):
238+
# basePyDir = '../../src'
239239

240240
# # get some directories and files
241241
# ip_root = path_combine(rowan_root, basePyDir)

‎src/extensions/IronPython.SQLite/IronPython.SQLite.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
<ItemGroup>
4141
<ProjectReference Include="..\..\core\IronPython\IronPython.csproj" Private="false" />
42-
<ProjectReference Include="..\..\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
43-
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
42+
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
43+
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
4444
</ItemGroup>
4545

4646
<Import Project="$(AfterTargetFiles)" />

‎src/extensions/IronPython.Wpf/IronPython.Wpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\core\IronPython\IronPython.csproj" Private="false" />
17-
<ProjectReference Include="..\..\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
18-
<ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
17+
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Scripting\Microsoft.Scripting.csproj" Private="false" />
18+
<ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" Private="false" />
1919
</ItemGroup>
2020

2121
<ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">

‎tests/IronPython.Tests/IronPython.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<!-- ensure ClrAssembly is built before IronPythonTest -->
30-
<ProjectReference Include="..\..\src\dlr\Tests\ClrAssembly\ClrAssembly.csproj">
30+
<ProjectReference Include="..\..\src\dlr\tests\ClrAssembly\ClrAssembly.csproj">
3131
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3232
</ProjectReference>
3333
</ItemGroup>

0 commit comments

Comments
 (0)