Use lowercase lib for StdLib dir name on non-Windows systems (#1514)

* Use lowercase lib for StdLib dir name on non-Windows systems

* Fix build on Linux

* Use lowercase lib on Windows

Author: BCSharp

Build.proj

@@ -23,6 +23,7 @@
     <PackageVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion>
     <StageDir>$(RootDir)Package\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
     <PackageDir>$(RootDir)Package\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
+    <StdLibDirName>lib</StdLibDirName>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -105,7 +106,7 @@
 
   <Target Name="_CopyStdLib" DependsOnTargets="_MakeStageDir">
     <MSBuild Projects="$(RootDir)\Src\StdLib\StdLib.pyproj"
-             Properties="OutputPath=$(StageDir)"
+             Properties="OutputPath=$(StageDir);StdLibDirName=$(StdLibDirName)"
              Targets="Stage" />
   </Target>
 

Package/choco/IronPython.nuspec

@@ -21,7 +21,7 @@
   <files>
     <file src="$STAGEDIR$\net462\*.dll;$STAGEDIR$\net462\*.exe" exclude="**\rowantest*.dll;**\IronPythonTest.dll" />
     <file src="$STAGEDIR$\net462\DLLs\**" target="DLLs" exclude="**\*.xml" />
-    <file src="$STAGEDIR$\Lib\**" target="Lib" />
+    <file src="$STAGEDIR$\lib\**" target="lib" />
     <file src="$STAGEDIR$\LICENSE;$STAGEDIR$\README.md" />
     <file src="tools\*" target="tools" />
   </files>

Package/deb/Deb.Packaging.targets

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <StdLibFiles Include="$(StageDir)/Lib/**/*.*" />
+      <StdLibFiles Include="$(StageDir)/$(StdLibDirName)/**/*.*" />
     </ItemGroup>
 
     <ItemGroup>
@@ -31,7 +31,7 @@
           Replacement="$(PackageVersion)" />
 
     <ItemGroup>
-      <StdLibOutputFiles Include="$(StageDir)/Lib/**/*.py" />
+      <StdLibOutputFiles Include="$(StageDir)/$(StdLibDirName)/**/*.py" />
     </ItemGroup>
     <Exec Command="dos2unix %(StdLibOutputFiles.Identity)" />
     <Exec Command="dos2unix $(PackageTempFolder)/DEBIAN/control"/>

Package/msi/IronPython.Installer.wixproj

@@ -35,7 +35,7 @@
       <Value>$(BuildDir)</Value>
     </WixConstant>
     <WixConstant Include="StdLibDir">
-      <Value>$(BindInputPaths)\Lib</Value>
+      <Value>$(BindInputPaths)\lib</Value>
     </WixConstant>
     <WixConstant Include="PlatformDir">
       <Value>$(BindInputPaths)\net462</Value>

Package/nuget/IronPython.StdLib.nuspec

@@ -22,7 +22,7 @@
   </metadata>
   <files>
     <file src="StdLib.License.txt" />
-    <file src="Lib\**" target="contentFiles\any\any\Lib" />
-    <file src="Lib\**" target="content\Lib" />
+    <file src="lib\**" target="contentFiles\any\any\lib" />
+    <file src="lib\**" target="content\lib" />
   </files>
 </package>

Package/pkg/Pkg.Packaging.targets

@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <StdLibFiles Include="$(StageDir)/Lib/**/*.*" />
+      <StdLibFiles Include="$(StageDir)/$(StdLibDirName)/**/*.*" />
     </ItemGroup>
 
     <ItemGroup>
@@ -28,7 +28,7 @@
     <Exec Command="mkdir -p $(PackageTempFolder)" />
 
     <ItemGroup>
-      <StdLibOutputFiles Include="$(StageDir)/Lib/**/*.py" />
+      <StdLibOutputFiles Include="$(StageDir)/$(StdLibDirName)/**/*.py" />
     </ItemGroup>
 
     <!-- Change line endings of the .py files -->

Package/zip/Zip.Packaging.targets

@@ -9,8 +9,8 @@
     <Zip Files="@(ZipFiles)" ZipFileName="$(PackageDir)\IronPython.$(PackageVersion).zip" WorkingDirectory="$(StageDir)" />
 
     <ItemGroup>
-      <StdLibFiles Include="$(StageDir)\Lib\**\*.*" />
+      <StdLibFiles Include="$(StageDir)\$(StdLibDirName)\**\*.*" />
     </ItemGroup>
-    <Zip Files="@(StdLibFiles)" ZipFileName="$(PackageDir)\IronPython.StdLib.$(PackageVersion).zip" WorkingDirectory="$(StageDir)\Lib"/>
+    <Zip Files="@(StdLibFiles)" ZipFileName="$(PackageDir)\IronPython.StdLib.$(PackageVersion).zip" WorkingDirectory="$(StageDir)\$(StdLibDirName)"/>
   </Target>
 </Project>

Src/IronPython/Hosting/PythonCommandLine.cs

@@ -296,8 +296,8 @@ private void InitializeModules() {
                 }
 
                 prefix = pyvenv_prefix ?? prefix;
-                // Make sure there an IronPython Lib directory, and if not keep looking up
-                while (prefix != null && !File.Exists(Path.Combine(prefix, "Lib/os.py"))) {
+                // Make sure there an IronPython lib directory, and if not keep looking up
+                while (prefix != null && !File.Exists(Path.Combine(prefix, "lib", "os.py"))) {
                     prefix = Path.GetDirectoryName(prefix);
                 }
             }

Src/IronPython/IronPython.csproj

@@ -35,10 +35,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Lib\**\*.py">
+    <None Include="Lib\**\*.py" Link="lib\%(RecursiveDir)%(Filename)%(Extension)">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\StdLib\Lib\os.py" Link="Lib\os.py">
+    <None Include="..\StdLib\Lib\os.py" Link="lib\os.py">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Src/IronPython/Runtime/PythonContext.cs

@@ -220,7 +220,7 @@ public PythonContext(ScriptDomainManager/*!*/ manager, IDictionary<string, objec
                 // Can be null if called from unmanaged code (VS integration scenario)
                 // or in self-contained single file scenarios
                 if (entry != null) {
-                    string lib = Path.Combine(entry, "Lib");
+                    string lib = Path.Combine(entry, "lib");
                     path.append(lib);
 
                     // add DLLs directory for user-defined extention modules
@@ -1767,7 +1767,7 @@ internal void SetHostVariables(string prefix, string executable, string versionS
             _initialExecutable = executable ?? "";
             InitialPrefix = prefix;
 
-            AddToPath(Path.Combine(prefix, "Lib"), 0);
+            AddToPath(Path.Combine(prefix, "lib"), 0);
 
             SetHostVariables(SystemState.__dict__);
         }