From fe363ef07b4c9ee36d95179a4791407b086c4d69 Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Tue, 17 Mar 2026 17:11:22 -0700 Subject: [PATCH 1/4] Rename submodule DLR --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c3148ab1a..ee995882a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "Src/DLR"] +[submodule "DLR"] path = src/dlr url = https://github.com/IronLanguages/dlr branch = main From 7f08d6d67178a5f76779c97592ce0d32a129f26c Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Tue, 17 Mar 2026 17:48:58 -0700 Subject: [PATCH 2/4] Update file paths --- IronPython.slnx | 8 ++++---- src/core/IronPython/IronPython.csproj | 2 +- src/extensions/IronPython.SQLite/IronPython.SQLite.csproj | 4 ++-- src/extensions/IronPython.Wpf/IronPython.Wpf.csproj | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/IronPython.slnx b/IronPython.slnx index 79dec8152..b2e45da30 100644 --- a/IronPython.slnx +++ b/IronPython.slnx @@ -1,11 +1,11 @@ - - - + + + - + diff --git a/src/core/IronPython/IronPython.csproj b/src/core/IronPython/IronPython.csproj index 94dba8424..f33f51a8f 100644 --- a/src/core/IronPython/IronPython.csproj +++ b/src/core/IronPython/IronPython.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/extensions/IronPython.SQLite/IronPython.SQLite.csproj b/src/extensions/IronPython.SQLite/IronPython.SQLite.csproj index a7481f911..5cf330f3b 100644 --- a/src/extensions/IronPython.SQLite/IronPython.SQLite.csproj +++ b/src/extensions/IronPython.SQLite/IronPython.SQLite.csproj @@ -39,8 +39,8 @@ - - + + diff --git a/src/extensions/IronPython.Wpf/IronPython.Wpf.csproj b/src/extensions/IronPython.Wpf/IronPython.Wpf.csproj index 952ad61ec..b2eafb8d7 100644 --- a/src/extensions/IronPython.Wpf/IronPython.Wpf.csproj +++ b/src/extensions/IronPython.Wpf/IronPython.Wpf.csproj @@ -14,8 +14,8 @@ - - + + From 60b253f62c720cde28cd74c130e7bad320c96793 Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Tue, 17 Mar 2026 18:41:46 -0700 Subject: [PATCH 3/4] Update more file paths --- tests/IronPython.Tests/IronPython.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/IronPython.Tests/IronPython.Tests.csproj b/tests/IronPython.Tests/IronPython.Tests.csproj index 081d7c38b..8bd43e6d0 100644 --- a/tests/IronPython.Tests/IronPython.Tests.csproj +++ b/tests/IronPython.Tests/IronPython.Tests.csproj @@ -27,7 +27,7 @@ - + false From ca8eccb409c7a1f9063a4c2064ba6bf7c5f03068 Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Tue, 17 Mar 2026 19:03:12 -0700 Subject: [PATCH 4/4] Correct generate paths --- eng/scripts/generate.py | 2 +- eng/scripts/generate_exception_factory.py | 2 +- src/core/IronPython/Lib/iptest/ipunittest.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/scripts/generate.py b/eng/scripts/generate.py index 7c819a378..eb0489d24 100755 --- a/eng/scripts/generate.py +++ b/eng/scripts/generate.py @@ -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 = [ diff --git a/eng/scripts/generate_exception_factory.py b/eng/scripts/generate_exception_factory.py index 8775f748c..c63c73bdb 100644 --- a/eng/scripts/generate_exception_factory.py +++ b/eng/scripts/generate_exception_factory.py @@ -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( diff --git a/src/core/IronPython/Lib/iptest/ipunittest.py b/src/core/IronPython/Lib/iptest/ipunittest.py index b92e8195c..c3d009c81 100644 --- a/src/core/IronPython/Lib/iptest/ipunittest.py +++ b/src/core/IronPython/Lib/iptest/ipunittest.py @@ -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)