diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-05-04 11:57:51 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-05-04 15:47:07 -0700 |
| commit | cd37819de42a5f208c9d7b9bcf08b9f6d928e1a2 (patch) | |
| tree | a6dd3e1172ef4ad7161acb0b5b827f427967854e | |
| parent | 1ff9062d235630a3a47bffa6459549c669432c4a (diff) | |
| download | coreclr-cd37819de42a5f208c9d7b9bcf08b9f6d928e1a2.tar.gz coreclr-cd37819de42a5f208c9d7b9bcf08b9f6d928e1a2.tar.bz2 coreclr-cd37819de42a5f208c9d7b9bcf08b9f6d928e1a2.zip | |
Rename all xxx.ni.dll's to xxx.dll for Helix Crossgen runs
| -rw-r--r-- | build-test.cmd | 6 | ||||
| -rw-r--r-- | tests/helixprep.proj | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/build-test.cmd b/build-test.cmd index 9142eeea01..21f54ef91f 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -512,7 +512,7 @@ if /I "%2" == "mscorlib.ni.dll" exit /b 0 REM don't precompile anything from CoreCLR if /I exist %CORE_ROOT_STAGE%\%2 exit /b 0 -"%CORE_ROOT_STAGE%\crossgen.exe" /Platform_Assemblies_Paths "%CORE_ROOT%" "%1" >nul 2>nul +"%CORE_ROOT_STAGE%\crossgen.exe" /Platform_Assemblies_Paths "%CORE_ROOT%" /in "%1" /out "%CORE_ROOT%/temp.ni.dll" >nul 2>nul set /a __exitCode = %errorlevel% if "%__exitCode%" == "-2146230517" ( echo %2 is not a managed assembly. @@ -523,6 +523,10 @@ if %__exitCode% neq 0 ( echo Unable to precompile %2 exit /b 0 ) + +:: Delete original .dll & replace it with the Crossgened .dll +del %1 +ren "%CORE_ROOT%\temp.ni.dll" %2 echo Successfully precompiled %2 exit /b 0 diff --git a/tests/helixprep.proj b/tests/helixprep.proj index e49e564d56..2d08e91b13 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -129,7 +129,7 @@ EXIT /B %ERRORLEVEL% <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) do%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) filename=%24{fileToPrecompile}%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) echo Precompiling %24filename%0a</WrapperShContents> - <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) %24overlayDir/crossgen /Platform_Assemblies_Paths %24overlayDir %24filename 1> %24filename.stdout 2>%24filename.stderr%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) %24overlayDir/crossgen /Platform_Assemblies_Paths %24overlayDir /in %24filename /out %24overlayDir/temp.ni.dll 1> %24filename.stdout 2>%24filename.stderr%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) exitCode=%24%3F%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) if [ %24exitCode != 0 ]%3B then%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) if grep -q -e '(COR_E_ASSEMBLYEXPECTED)' %24filename.stderr%3B then%0a</WrapperShContents> @@ -137,7 +137,10 @@ EXIT /B %ERRORLEVEL% <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) else%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) echo Unable to precompile %24filename.%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> - <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) else%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) mv %24overlayDir/temp.ni.dll %24filename%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename.stdout%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename.stderr%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) done%0a</WrapperShContents> |