Skip to content

Commit 30d776c

Browse files
committed
Fix build for refactor paths
1 parent 55e9999 commit 30d776c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+145
-146
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ packages/
2020
__pycache__/
2121

2222
# Generated files
23-
Src/IronPythonTest/TestResults/
24-
Src/IronPythonTest/runsettings.*.xml
23+
tests/IronPython.Tests/TestResults/
24+
tests/IronPython.Tests/runsettings.*.xml
2525

2626
# created by CPython tests
27-
Src/StdLib/Lib/lib2to3/Grammar*.pickle
28-
Src/StdLib/Lib/lib2to3/PatternGrammar*.pickle
27+
src/core/IronPython.StdLib/lib/lib2to3/Grammar*.pickle
28+
src/core/IronPython.StdLib/lib/lib2to3/PatternGrammar*.pickle

Build.proj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99

1010
<RootDir>$(MSBuildThisFileDirectory)</RootDir>
1111
<Solution>$(RootDir)IronPython.sln</Solution>
12-
<UtilDir>$(RootDir)Util</UtilDir>
13-
<ReferenceDir>$(RootDir)Util\References</ReferenceDir>
12+
<UtilsDir>$(RootDir)eng\utils</UtilsDir>
1413
<BinDir>$(RootDir)bin</BinDir>
15-
<BuildSysDir>$(RootDir)Build</BuildSysDir>
14+
<BuildSysDir>$(RootDir)eng</BuildSysDir>
1615
</PropertyGroup>
1716

1817
<Import Project="$(BuildSysDir)\Tasks.Targets" />
@@ -40,7 +39,7 @@
4039
</PropertyGroup>
4140

4241
<PropertyGroup>
43-
<NuGet>$(UtilDir)\NuGet\nuget.exe</NuGet>
42+
<NuGet>$(UtilsDir)\NuGet\nuget.exe</NuGet>
4443
</PropertyGroup>
4544

4645
<ItemGroup>
@@ -117,7 +116,7 @@
117116
</Target>
118117

119118
<Target Name="_CopyStdLib" DependsOnTargets="_MakeStageDir">
120-
<MSBuild Projects="$(RootDir)\Src\StdLib\StdLib.pyproj"
119+
<MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\StdLib.pyproj"
121120
Properties="OutputPath=$(StageDir);StdLibDirName=$(StdLibDirName)"
122121
Targets="Stage" />
123122
</Target>
@@ -138,5 +137,5 @@
138137
<!-- This looks like an empty target, but the targets files use it as an AfterTargets -->
139138
<Target Name="Package" DependsOnTargets="Stage" />
140139

141-
<Import Project="$(RootDir)\Package\**\*.Packaging.targets" />
140+
<Import Project="$(RootDir)\eng\package\**\*.Packaging.targets" />
142141
</Project>

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
The steps to contribute a change are:
44

5-
1. Fork the IronPython3 repository. For more information see [Getting the Sources](Documentation/getting-the-sources.md).
6-
2. Build the repository. For more information see [Building](Documentation/building.md).
7-
1. Make your changes on your machine, ensure ```make.ps1 test-all``` runs successfully, and commit your changes. For more information see [Modifying the Sources](Documentation/modifying-the-sources.md).
5+
1. Fork the IronPython3 repository. For more information see [Getting the Sources](docs/getting-the-sources.md).
6+
2. Build the repository. For more information see [Building](docs/building.md).
7+
1. Make your changes on your machine, ensure ```make.ps1 test-all``` runs successfully, and commit your changes. For more information see [Modifying the Sources](docs/modifying-the-sources.md).
88
1. Push the commits to your fork. This way your name will be the author of the commit in the main IronPython3 tree (once the commits are pulled into the main tree).
99
1. Create a pull request on Github, this will initiate a code review and CLA signing request
1010
1. The IronPython team will review, and possibly request changes, to your PR

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<PropertyGroup>
66
<!-- These are normally set by Build.proj, except when building from VS. -->
77
<RootDir Condition=" '$(RootDir)' == '' ">$(MSBuildThisFileDirectory)</RootDir>
8-
<BuildSysDir Condition=" '$(BuildSysDir)' == '' ">$(RootDir)Build</BuildSysDir>
9-
<ReferenceDir Condition=" '$(ReferenceDir)' == '' ">$(RootDir)Util\References</ReferenceDir>
8+
<BuildSysDir Condition=" '$(BuildSysDir)' == '' ">$(RootDir)eng</BuildSysDir>
9+
<UtilsDir Condition=" '$(UtilsDir)' == '' ">$(RootDir)eng\utils</UtilsDir>
1010

1111
<Mono Condition=" '$(Mono)' == '' AND '$(MSBuildRuntimeType)' == 'Mono' ">true</Mono>
1212

IronPython.sln

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.9.34714.143
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython", "Src\IronPython\IronPython.csproj", "{95289EA9-5778-489D-AB48-F81F2CE2DA32}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython", "src\core\IronPython\IronPython.csproj", "{95289EA9-5778-489D-AB48-F81F2CE2DA32}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "Src\IronPython.Modules\IronPython.Modules.csproj", "{155CE436-1669-4A48-8095-410F2430237F}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "src\core\IronPython.Modules\IronPython.Modules.csproj", "{155CE436-1669-4A48-8095-410F2430237F}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "Src\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "src\extensions\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole", "Src\IronPythonConsole\IronPythonConsole.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole", "src\executables\IronPython.Console\IronPythonConsole.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonTest", "Src\IronPythonTest\IronPythonTest.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonTest", "tests\IronPython.Tests\IronPythonTest.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow", "Src\IronPythonWindow\IronPythonWindow.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow", "src\executables\IronPython.Window\IronPythonWindow.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A14D070-628F-44EF-92DD-47C8BE5C33CD}"
1919
ProjectSection(SolutionItems) = preProject
@@ -29,81 +29,81 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2929
README.md = README.md
3030
EndProjectSection
3131
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.SQLite", "Src\IronPython.SQLite\IronPython.SQLite.csproj", "{4A617A40-2BA7-4713-AAFE-F90C4325C581}"
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.SQLite", "src\extensions\IronPython.SQLite\IronPython.SQLite.csproj", "{4A617A40-2BA7-4713-AAFE-F90C4325C581}"
3333
EndProject
3434
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB-40C6-41A6-83DA-3203A4DCEC19}"
3535
ProjectSection(SolutionItems) = preProject
36-
Build\After.targets = Build\After.targets
37-
Build\net462.props = Build\net462.props
38-
Build\net6.0-windows.props = Build\net6.0-windows.props
39-
Build\net6.0.props = Build\net6.0.props
40-
Build\net8.0-windows.props = Build\net8.0-windows.props
41-
Build\net8.0.props = Build\net8.0.props
42-
Build\net9.0-windows.props = Build\net9.0-windows.props
43-
Build\net9.0.props = Build\net9.0.props
44-
Build\netstandard2.0.props = Build\netstandard2.0.props
45-
Build\steps.yml = Build\steps.yml
46-
Build\Tasks.Targets = Build\Tasks.Targets
36+
eng\After.targets = eng\After.targets
37+
eng\net462.props = eng\net462.props
38+
eng\net6.0-windows.props = eng\net6.0-windows.props
39+
eng\net6.0.props = eng\net6.0.props
40+
eng\net8.0-windows.props = eng\net8.0-windows.props
41+
eng\net8.0.props = eng\net8.0.props
42+
eng\net9.0-windows.props = eng\net9.0-windows.props
43+
eng\net9.0.props = eng\net9.0.props
44+
eng\netstandard2.0.props = eng\netstandard2.0.props
45+
eng\steps.yml = eng\steps.yml
46+
eng\Tasks.Targets = eng\Tasks.Targets
4747
EndProjectSection
4848
EndProject
49-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonCompiler", "Src\IronPythonCompiler\IronPythonCompiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonCompiler", "src\executables\IronPython.Compiler\IronPythonCompiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
5050
EndProject
5151
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{AC38EFB1-820D-4E90-BF40-BEF3AC825542}"
5252
EndProject
53-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic", "Src\DLR\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic", "src\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
5454
EndProject
55-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting", "Src\DLR\Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting", "src\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
5656
EndProject
57-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Metadata", "Src\DLR\Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Metadata", "src\dlr\Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
5858
EndProject
5959
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{60836ADE-CAB7-4587-B6FB-8C4FEB872752}"
6060
EndProject
61-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClrAssembly", "Src\DLR\Tests\ClrAssembly\ClrAssembly.csproj", "{BEE737B9-18D5-48D9-8672-9A896213C98B}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClrAssembly", "src\dlr\Tests\ClrAssembly\ClrAssembly.csproj", "{BEE737B9-18D5-48D9-8672-9A896213C98B}"
6262
EndProject
6363
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}"
6464
EndProject
6565
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917-27F7-4E54-B72F-C8CEE4AEDCAA}"
6666
ProjectSection(SolutionItems) = preProject
67-
Package\nuget\IronPython.nuspec = Package\nuget\IronPython.nuspec
68-
Package\nuget\IronPython.StdLib.nuspec = Package\nuget\IronPython.StdLib.nuspec
67+
eng\package\nuget\IronPython.nuspec = eng\package\nuget\IronPython.nuspec
68+
eng\package\nuget\IronPython.StdLib.nuspec = eng\package\nuget\IronPython.StdLib.nuspec
6969
EndProjectSection
7070
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole32", "Src\IronPythonConsole32\IronPythonConsole32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole32", "src\executables\IronPython.Console32\IronPythonConsole32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "IronPythonAnalyzer\IronPythonAnalyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
73+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "src\roslyn\IronPython.Analyzer\IronPythonAnalyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
7474
EndProject
7575
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
7676
ProjectSection(SolutionItems) = preProject
77-
Package\choco\Choco.Packaging.targets = Package\choco\Choco.Packaging.targets
78-
Package\choco\IronPython.nuspec = Package\choco\IronPython.nuspec
77+
eng\package\choco\Choco.Packaging.targets = eng\package\choco\Choco.Packaging.targets
78+
eng\package\choco\IronPython.nuspec = eng\package\choco\IronPython.nuspec
7979
EndProjectSection
8080
EndProject
8181
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{01CE1AE6-CD7F-491B-8150-58CD738B20AC}"
8282
ProjectSection(SolutionItems) = preProject
83-
Package\pkg\Pkg.Packaging.targets = Package\pkg\Pkg.Packaging.targets
83+
eng\package\pkg\Pkg.Packaging.targets = eng\package\pkg\Pkg.Packaging.targets
8484
EndProjectSection
8585
EndProject
8686
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deb", "deb", "{676093FF-CB44-4BD5-B83C-A28FE88D5017}"
8787
ProjectSection(SolutionItems) = preProject
88-
Package\deb\Deb.Packaging.targets = Package\deb\Deb.Packaging.targets
88+
eng\package\deb\Deb.Packaging.targets = eng\package\deb\Deb.Packaging.targets
8989
EndProjectSection
9090
EndProject
9191
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{8FC07B92-D2AC-4921-9E97-A92A84D2B461}"
9292
ProjectSection(SolutionItems) = preProject
93-
Package\zip\Zip.Packaging.targets = Package\zip\Zip.Packaging.targets
93+
eng\package\zip\Zip.Packaging.targets = eng\package\zip\Zip.Packaging.targets
9494
EndProjectSection
9595
EndProject
9696
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF02-4C04-960B-AE7E454668AA}"
9797
ProjectSection(SolutionItems) = preProject
98-
Package\msi\Dlr.wxs = Package\msi\Dlr.wxs
99-
Package\msi\IronPython.Installer.wixproj = Package\msi\IronPython.Installer.wixproj
100-
Package\msi\IronPython.wxs = Package\msi\IronPython.wxs
101-
Package\msi\Msi.Packaging.targets = Package\msi\Msi.Packaging.targets
102-
Package\msi\Product.wxs = Package\msi\Product.wxs
103-
Package\msi\Version.wxi = Package\msi\Version.wxi
98+
eng\package\msi\Dlr.wxs = eng\package\msi\Dlr.wxs
99+
eng\package\msi\IronPython.Installer.wixproj = eng\package\msi\IronPython.Installer.wixproj
100+
eng\package\msi\IronPython.wxs = eng\package\msi\IronPython.wxs
101+
eng\package\msi\Msi.Packaging.targets = eng\package\msi\Msi.Packaging.targets
102+
eng\package\msi\Product.wxs = eng\package\msi\Product.wxs
103+
eng\package\msi\Version.wxi = eng\package\msi\Version.wxi
104104
EndProjectSection
105105
EndProject
106-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "Src\IronPythonWindow32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
106+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "src\executables\IronPython.Window32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
107107
EndProject
108108
Global
109109
GlobalSection(SolutionConfigurationPlatforms) = preSolution

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ See the following lists for features from each version of CPython that have been
7171
For details on contributing see the [Contributing](CONTRIBUTING.md) article.
7272

7373
## Upgrading from IronPython 2
74-
For details on upgrading from IronPython 2 to 3 see the [Upgrading from IronPython 2 to 3](Documentation/upgrading-from-ipy2.md) article.
74+
For details on upgrading from IronPython 2 to 3 see the [Upgrading from IronPython 2 to 3](docs/upgrading-from-ipy2.md) article.
7575

7676
## Differences with CPython
77-
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](Documentation/differences-from-c-python.md) for details.
77+
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](docs/differences-from-c-python.md) for details.
7878

7979
## Package compatibility
80-
See the [Package compatibility](Documentation/package-compatibility.md) document for information on compatibility with popular packages.
80+
See the [Package compatibility](docs/package-compatibility.md) document for information on compatibility with popular packages.
8181

8282
## Installation
83-
Binaries of IronPython 3 can be downloaded from the [release page](https://github.com/IronLanguages/ironpython3/releases/latest), available in various formats: `.msi`, `.zip`, `.deb`, `.pkg`. The IronPython package is also available on [NuGet](https://www.nuget.org/packages/IronPython/3.4.0). See the [installation document](Documentation/installing.md) for detailed instructions on how to install a standalone IronPython interpreter on various operating systems and .NET frameworks.
83+
Binaries of IronPython 3 can be downloaded from the [release page](https://github.com/IronLanguages/ironpython3/releases/latest), available in various formats: `.msi`, `.zip`, `.deb`, `.pkg`. The IronPython package is also available on [NuGet](https://www.nuget.org/packages/IronPython/3.4.0). See the [installation document](docs/installing.md) for detailed instructions on how to install a standalone IronPython interpreter on various operating systems and .NET frameworks.
8484

8585
## Build
86-
See the [building document](Documentation/building.md). Since the main development is on Windows, bugs on other platforms may inadvertently be introduced - please report them!
86+
See the [building document](docs/building.md). Since the main development is on Windows, bugs on other platforms may inadvertently be introduced - please report them!
8787

8888
## Supported Platforms
8989
IronPython 3 targets .NET Framework 4.6.2, .NET Standard 2.0, .NET 6.0 and .NET 8.0. The support for .NET and .NET Core follow the lifecycle defined on [.NET and .NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).

docs/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ If the build is successful the binaries are stored in `ironpython3/bin/{Configur
4545

4646
## Running
4747

48-
The standard library is not copied over to the `bin` folder during the build process, it lives in `Src/StdLib/Lib`.
48+
The standard library is not copied over to the `bin` folder during the build process, it lives in `src/core/IronPython.StdLib/lib`.
4949
- When running the `Release` configuration executable, you should set the environment variable `IRONPYTHONPATH` to this folder.
5050
- When running the `Debug` configuration executable, this folder is automatically added to `sys.path`.

docs/installing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Use Powershell's `help` command on the script for information about available op
8787
The script is also available online, so it can be downloaded and invoked without unzipping the archive first.
8888

8989
```
90-
PS> Invoke-WebRequest https://raw.githubusercontent.com/IronLanguages/ironpython3/main/Src/Scripts/Install-IronPython.ps1 -OutFile ./Install-IronPython.ps1
90+
PS> Invoke-WebRequest https://raw.githubusercontent.com/IronLanguages/ironpython3/main/eng/scripts/Install-IronPython.ps1 -OutFile ./Install-IronPython.ps1
9191
PS> ./Install-IronPython ~/ipyenv ~/Downloads/IronPython.3.X.Y.zip
9292
PS> ~/ipyenv/Enter-IronPythonEnvironment
9393
«ipyenv» PS> ipy
@@ -158,7 +158,7 @@ Go to the project's [_Actions_ page](https://github.com/IronLanguages/ironpython
158158

159159
# Installing from Sources
160160

161-
To build and install IronPython from sources, first follow instructions in [_Getting the Sources_](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/getting-the-sources.md) and [_Building IronPython3_](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/building.md).
161+
To build and install IronPython from sources, first follow instructions in [_Getting the Sources_](https://github.com/IronLanguages/ironpython3/blob/main/docs/getting-the-sources.md) and [_Building IronPython3_](https://github.com/IronLanguages/ironpython3/blob/main/docs/building.md).
162162

163163
When the command `./make.ps1 debug` completes successfully, runnable and usable `ipy` executables are available in subdirectories of `./bin/Debug`. To run executables from the release configuration (produced by a successful run of `./make.ps1`), first set environment variable `IRONPYTHONPATH`.
164164

@@ -170,10 +170,10 @@ If those executables test out successfully, the binaries can be installed outsid
170170

171171
The artifacts are placed in directory `./Package/Release/Packages/IronPython-3.X.Y`. Pick a package suitable for your installation target and follow instructions above for the officially released packages.
172172

173-
Note: as a convenience, if you run `Install-IronPython.ps1` directly from directory `./Src/Scripts` to install IronPython from the zip file, there is no need to pass the location to the zip file; the script finds it automatically using the relative path.
173+
Note: as a convenience, if you run `Install-IronPython.ps1` directly from directory `./eng/scripts` to install IronPython from the zip file, there is no need to pass the location to the zip file; the script finds it automatically using the relative path.
174174

175175
Installation example:
176176

177177
```
178-
./Src/Scripts/Install-IronPython.ps1 /path/to/install/directory -framework net462
178+
./eng/scripts/Install-IronPython.ps1 /path/to/install/directory -framework net462
179179
```

0 commit comments

Comments
 (0)