mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use --native-subdirectory when publishing cli projects.

Browse source 
This gives support for files to publish in subdirectories
from dependency nuget packages.

Additionally Change Native Compilation to consume these paths.
This commit is contained in:
Bryan 2015-12-30 15:23:55 -08:00
parent 7481f10e45
commit 89de0c2172
9 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/compile/compile-stage.ps1
View file

@ -50,9 +50,9 @@ $RuntimeOutputDir = "$OutputDir\runtime\coreclr"
# Publish each project # Publish each project
$Projects | ForEach-Object { $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 (!$?) { 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 exit 1
} }
} }
@ -64,7 +64,6 @@ if (!$?) {
Exit 1 Exit 1
} }
# Clean up bogus additional files # Clean up bogus additional files
$FilesToClean | ForEach-Object { $FilesToClean | ForEach-Object {
$path = Join-Path $RuntimeOutputDir $_ $path = Join-Path $RuntimeOutputDir $_

2
scripts/compile/compile-stage.sh
View file

@ -61,7 +61,7 @@ RUNTIME_OUTPUT_DIR="$OUTPUT_DIR/runtime/coreclr"
for project in ${PROJECTS[@]} for project in ${PROJECTS[@]}
do do
echo dotnet publish --framework "$TFM" --runtime "$RID" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project" 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 done
# Bring in the runtime # Bring in the runtime

2
src/Microsoft.DotNet.Tools.Compiler.Native/ILCompilerInvoker.cs
View file

@ -46,7 +46,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
argsList.Add($"\"{inputFilePath}\""); argsList.Add($"\"{inputFilePath}\"");
// System.Private.CoreLib Reference // System.Private.CoreLib Reference
var coreLibPath = Path.Combine(config.IlcSdkPath, "System.Private.CoreLib.dll"); var coreLibPath = Path.Combine(config.IlcSdkPath, "sdk", "System.Private.CoreLib.dll");
argsList.Add($"-r \"{coreLibPath}\""); argsList.Add($"-r \"{coreLibPath}\"");
// AppDep References // AppDep References

7
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs
View file

@ -65,9 +65,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// Flags // Flags
argsList.Add(cflags); 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 = Path.Combine(config.IlcSdkPath, "inc");
var ilcSdkIncPath = config.IlcSdkPath;
argsList.Add("-I"); argsList.Add("-I");
argsList.Add($"\"{ilcSdkIncPath}\""); argsList.Add($"\"{ilcSdkIncPath}\"");
@ -82,9 +80,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
// ILC SDK Libs // ILC SDK Libs
var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
foreach (var lib in IlcSdkLibs) foreach (var lib in IlcSdkLibs)
{ {
var libPath = Path.Combine(config.IlcSdkPath, lib); var libPath = Path.Combine(IlcSdkLibPath, lib);
argsList.Add(libPath); argsList.Add(libPath);
} }

3
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs
View file

@ -77,9 +77,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
// ILC SDK Libs // ILC SDK Libs
var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
foreach (var lib in IlcSdkLibs) foreach (var lib in IlcSdkLibs)
{ {
var libPath = Path.Combine(config.IlcSdkPath, lib); var libPath = Path.Combine(IlcSdkLibPath, lib);
argsList.Add(libPath); argsList.Add(libPath);
} }

7
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs
View file

@ -67,9 +67,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// Flags // Flags
argsList.Add(cflags); 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 = Path.Combine(config.IlcSdkPath, "inc");
var ilcSdkIncPath = config.IlcSdkPath;
argsList.Add("-I"); argsList.Add("-I");
argsList.Add($"\"{ilcSdkIncPath}\""); argsList.Add($"\"{ilcSdkIncPath}\"");
@ -87,9 +85,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
// ILC SDK Libs // ILC SDK Libs
var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
foreach (var lib in IlcSdkLibs) 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 // Forward the library to linked to the linker
argsList.Add("-Xlinker"); argsList.Add("-Xlinker");

3
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs
View file

@ -77,9 +77,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
argsList.Add("-Xlinker "+inLibFile); argsList.Add("-Xlinker "+inLibFile);
// ILC SDK Libs // ILC SDK Libs
var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
foreach (var lib in IlcSdkLibs) foreach (var lib in IlcSdkLibs)
{ {
var libPath = Path.Combine(config.IlcSdkPath, lib); var libPath = Path.Combine(IlcSdkLibPath, lib);
argsList.Add("-Xlinker "+libPath); argsList.Add("-Xlinker "+libPath);
} }

5
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs
View file

@ -68,10 +68,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
argsList.Add("/c"); argsList.Add("/c");
// Add Includes // Add Includes
// var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
// TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
// var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
var ilcSdkIncPath = config.IlcSdkPath;
argsList.Add("/I"); argsList.Add("/I");
argsList.Add($"\"{ilcSdkIncPath}\""); argsList.Add($"\"{ilcSdkIncPath}\"");

3
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs
View file

@ -102,9 +102,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// ILC SDK Libs // ILC SDK Libs
var SDKLibs = IlcSdkLibMap[config.NativeMode]; var SDKLibs = IlcSdkLibMap[config.NativeMode];
var IlcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
foreach (var lib in SDKLibs) foreach (var lib in SDKLibs)
{ {
var sdkLibPath = Path.Combine(config.IlcSdkPath, lib); var sdkLibPath = Path.Combine(IlcSdkLibPath, lib);
argsList.Add($"\"{sdkLibPath}\""); argsList.Add($"\"{sdkLibPath}\"");
} }