Use --native-subdirectory when publishing cli projects.

This gives support for files to publish in subdirectories from dependency nuget packages. Additionally Change Native Compilation to consume these paths.
dotnet · Dec 31, 2015 · 68a4f89 · 68a4f89
1 parent 7481f10
commit 68a4f89
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 19 deletions.
diff --git a/scripts/compile/compile-stage.ps1 b/scripts/compile/compile-stage.ps1
@@ -50,9 +50,9 @@ $RuntimeOutputDir = "$OutputDir\runtime\coreclr"
 
 # Publish each project
 $Projects | ForEach-Object {
-    dotnet publish --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
+    dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
     if (!$?) {
-        Write-Host Command failed: dotnet publish --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
+        Write-Host Command failed: dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
         exit 1
     }
 }
@@ -64,7 +64,6 @@ if (!$?) {
     Exit 1
 }
 
-
 # Clean up bogus additional files
 $FilesToClean | ForEach-Object {
     $path = Join-Path $RuntimeOutputDir $_

diff --git a/scripts/compile/compile-stage.sh b/scripts/compile/compile-stage.sh
@@ -61,7 +61,7 @@ RUNTIME_OUTPUT_DIR="$OUTPUT_DIR/runtime/coreclr"
 for project in ${PROJECTS[@]}
 do
 echo dotnet publish --framework "$TFM" --runtime "$RID" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project" 
-    dotnet publish --framework "$TFM" --runtime "$RID" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project"
+    dotnet publish --native-subdirectory --framework "$TFM" --runtime "$RID" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project"
 done
 
 # Bring in the runtime

diff --git a/...crosoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs b/...crosoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs
@@ -65,9 +65,7 @@ private void InitializeArgs(NativeCompileSettings config)
             // Flags
             argsList.Add(cflags);
 
-            // TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
-            // var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
-            var ilcSdkIncPath = config.IlcSdkPath;
+            var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
             argsList.Add("-I");
             argsList.Add($"\"{ilcSdkIncPath}\"");
 
@@ -82,9 +80,10 @@ private void InitializeArgs(NativeCompileSettings config)
             }
 
             // ILC SDK Libs
+            var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
             foreach (var lib in IlcSdkLibs)
             {
-                var libPath = Path.Combine(config.IlcSdkPath, lib);
+                var libPath = Path.Combine(IlcSdkLibPath, lib);
                 argsList.Add(libPath);
             }
 

diff --git a/...soft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs b/...soft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs
@@ -77,9 +77,10 @@ private void InitializeArgs(NativeCompileSettings config)
             }
 
             // ILC SDK Libs
+            var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
             foreach (var lib in IlcSdkLibs)
             {
-                var libPath = Path.Combine(config.IlcSdkPath, lib);
+                var libPath = Path.Combine(IlcSdkLibPath, lib);
                 argsList.Add(libPath);
             }
 

diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs b/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs
@@ -67,9 +67,7 @@ private void InitializeArgs(NativeCompileSettings config)
             // Flags
             argsList.Add(cflags);
 
-            // TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
-            // var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
-            var ilcSdkIncPath = config.IlcSdkPath;
+            var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
             argsList.Add("-I");
             argsList.Add($"\"{ilcSdkIncPath}\"");
 
@@ -87,9 +85,10 @@ private void InitializeArgs(NativeCompileSettings config)
             }
 
             // ILC SDK Libs
+            var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
             foreach (var lib in IlcSdkLibs)
             {
-                var libPath = Path.Combine(config.IlcSdkPath, lib);
+                var libPath = Path.Combine(IlcSdkLibPath, lib);
 
                 // Forward the library to linked to the linker
                 argsList.Add("-Xlinker");

diff --git a/...icrosoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs b/...icrosoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs
@@ -77,9 +77,10 @@ private void InitializeArgs(NativeCompileSettings config)
             argsList.Add("-Xlinker "+inLibFile);
 
             // ILC SDK Libs
+            var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
             foreach (var lib in IlcSdkLibs)
             {
-                var libPath = Path.Combine(config.IlcSdkPath, lib);
+                var libPath = Path.Combine(IlcSdkLibPath, lib);
                 argsList.Add("-Xlinker "+libPath);
             }
 

diff --git a/...oft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs b/...oft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs
@@ -68,10 +68,7 @@ private void InitializeArgs(NativeCompileSettings config)
             argsList.Add("/c");
 
             // Add Includes
-            // 
-            // TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
-            // var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
-            var ilcSdkIncPath = config.IlcSdkPath;
+            var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
             argsList.Add("/I");
             argsList.Add($"\"{ilcSdkIncPath}\"");
 

diff --git a/...Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs b/...Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs
@@ -102,9 +102,10 @@ private void InitializeArgs(NativeCompileSettings config)
 
             // ILC SDK Libs
             var SDKLibs = IlcSdkLibMap[config.NativeMode];
+            var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
             foreach (var lib in SDKLibs)
             {
-                var sdkLibPath = Path.Combine(config.IlcSdkPath, lib);
+                var sdkLibPath = Path.Combine(IlcSdkLibPath, lib);
                 argsList.Add($"\"{sdkLibPath}\"");
             }