diff options
| author | Michal Strehovský <michals@microsoft.com> | 2015-11-22 23:02:22 +0300 |
|---|---|---|
| committer | Michal Strehovský <michals@microsoft.com> | 2015-11-23 20:56:08 +0300 |
| commit | aeadc7d83f360fee6b2deec7da4270990c174b0c (patch) | |
| tree | d12c751ae9292d92b2a66c8d7c7644a19f36337f /src/scripts | |
| parent | 730da9d499bb88e9df6b003e74533ca26859b85f (diff) | |
Add support for multi-assembly tests
There are a few tests that have helper assemblies that we need to pass
as a reference to ILC. This change will look for those and pass them to
dotnet-compile-native.
The /reference argument is already supported in the wrapper in the CLI
repo, but since we're not using that yet, I added the support to our
dotnet-compile-native.bat.
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/dotnet-compile-native.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/scripts/dotnet-compile-native.bat b/src/scripts/dotnet-compile-native.bat index 9cdb30f5e..f90b4d0e8 100644 --- a/src/scripts/dotnet-compile-native.bat +++ b/src/scripts/dotnet-compile-native.bat @@ -24,6 +24,7 @@ set __LogFilePath=%__Temp% set __CodegenPath= set __ObjgenPath= set __LinkLibs= +set __AdditionalRefs= :Arg_Loop if "%1" == "" goto :ArgsDone @@ -40,6 +41,7 @@ if /i "%1" == "/logpath" (set __LogFilePath=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/codegenpath" (set __CodegenPath=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/objgenpath" (set __ObjgenPath=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/linklibs" (set __LinkLibs=%2&shift&shift&goto Arg_Loop) +if /i "%1" == "/reference" (set __AdditionalRefs=%__AdditionalRefs% -r %2&shift&shift&goto Arg_Loop) echo Invalid command line argument: %1 goto :InvalidArgs @@ -112,7 +114,7 @@ REM Setup the path to include the location of the codegenerator and binary file REM so that they can be located by the OS loader. set path=%__CodegenPath%;%__ObjgenPath%;%path% echo Generating app obj file -"%__ILCompiler%\corerun.exe" "%__ILCompiler%\ilc.exe" %__Infile% -r "%__ILCompiler%\System.Private.CoreLib.dll" -r %__AppDepSdk%\*.dll -out %ObjFileName% > %__LogFilePath%\ILCompiler.App.log +"%__ILCompiler%\corerun.exe" "%__ILCompiler%\ilc.exe" %__Infile% -r "%__ILCompiler%\System.Private.CoreLib.dll" -r %__AppDepSdk%\*.dll -out %ObjFileName% %__AdditionalRefs% > %__LogFilePath%\ILCompiler.App.log endlocal set EXITCode=%ERRORLEVEL% @@ -139,7 +141,7 @@ call :DeleteFile "%__Outfile%" REM Generate the CPP file for the MSIL assembly echo Generating source file -"%__ILCompiler%\ilc.exe" %__Infile% -r "%__ILCompiler%\System.Private.CoreLib.dll" -r %__AppDepSdk%\*.dll -out "%CPPFileName%" -cpp > %__LogFilePath%\ILCompiler.MSILToCpp.log +"%__ILCompiler%\ilc.exe" %__Infile% -r "%__ILCompiler%\System.Private.CoreLib.dll" -r %__AppDepSdk%\*.dll -out "%CPPFileName%" -cpp %__AdditionalRefs% > %__LogFilePath%\ILCompiler.MSILToCpp.log if ERRORLEVEL 1 ( echo Unable to generate CPP file. goto :FailedExit |