Skip to content

Commit 945b7aa

Browse files
committed
Adapt to runtime's native build infra
1 parent aadb153 commit 945b7aa

38 files changed

+504
-2210
lines changed

CMakeLists.txt

Lines changed: 48 additions & 525 deletions
Large diffs are not rendered by default.

compileoptions.cmake

Lines changed: 0 additions & 161 deletions
This file was deleted.

crossgen.cmake

Lines changed: 0 additions & 27 deletions
This file was deleted.

diagnostics.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ stages:
142142
parameters:
143143
name: Alpine3_13
144144
osGroup: Linux
145-
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210728123842-ddfc481
145+
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85
146146
artifactsTargetPath: bin/Linux-musl.x64.Release
147147
requiresCapPtraceContainer: true
148148
strategy:
@@ -175,6 +175,7 @@ stages:
175175
parameters:
176176
name: MacOS_cross
177177
osGroup: MacOS_cross
178+
crossbuild: true
178179
buildAndSkipTest: true
179180
strategy:
180181
matrix:
@@ -192,7 +193,7 @@ stages:
192193
parameters:
193194
name: Linux_cross
194195
osGroup: Linux
195-
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-1735d26-20190521133857
196+
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
196197
crossrootfsDir: '/crossrootfs/arm'
197198
buildAndSkipTest: true
198199
strategy:
@@ -206,7 +207,7 @@ stages:
206207
parameters:
207208
name: Linux_cross64
208209
osGroup: Linux
209-
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
210+
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
210211
crossrootfsDir: '/crossrootfs/arm64'
211212
buildAndSkipTest: true
212213
strategy:
@@ -220,7 +221,7 @@ stages:
220221
parameters:
221222
name: Alpine_cross64
222223
osGroup: Linux
223-
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
224+
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
224225
crossrootfsDir: '/crossrootfs/arm64'
225226
artifactsTargetPath: bin/Linux-musl.arm64.Release
226227
buildAndSkipTest: true

eng/Build-Native.cmd

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo %__MsgPrefix%Starting Build at %TIME%
99
set __ThisScriptFull="%~f0"
1010
set __ThisScriptDir="%~dp0"
1111

12-
call "%__ThisScriptDir%"\setup-vs-tools.cmd
12+
call "%__ThisScriptDir%"\native\init-vs-env.cmd
1313
if NOT '%ERRORLEVEL%' == '0' goto ExitWithError
1414

1515
if defined VS160COMNTOOLS (
@@ -192,7 +192,7 @@ if /i %__BuildCrossArch% EQU 1 (
192192
set __ExtraCmakeArgs="-DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir!" "-DCLR_BUILD_TYPE=%__BuildType%" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCMAKE_SYSTEM_VERSION=10.0" "-DNUGET_PACKAGES=%NUGET_PACKAGES:\=/%"
193193

194194
pushd "%__CrossCompIntermediatesDir%"
195-
call "%__ProjectDir%\eng\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs!
195+
call "%__ProjectDir%\eng\native\gen-buildsys.cmd" "%__ProjectDir%" "%__CrossCompIntermediatesDir%" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs!
196196
@if defined _echo @echo on
197197
popd
198198

@@ -235,13 +235,9 @@ if %__Build% EQU 1 (
235235
if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 )
236236
if /i "%__BuildArch%" == "arm" (
237237
set __VCBuildArch=x86_arm
238-
:: Make CMake pick the highest installed version in the 10.0.* range
239-
set ___SDKVersion="-DCMAKE_SYSTEM_VERSION=10.0"
240238
)
241239
if /i "%__BuildArch%" == "arm64" (
242240
set __VCBuildArch=x86_arm64
243-
:: Make CMake pick the highest installed version in the 10.0.* range
244-
set ___SDKVersion="-DCMAKE_SYSTEM_VERSION=10.0"
245241
)
246242

247243
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
@@ -266,10 +262,10 @@ if %__Build% EQU 1 (
266262

267263
set "__ManagedBinaryDir=%__RootBinDir%\bin"
268264
set "__ManagedBinaryDir=!__ManagedBinaryDir:\=/!"
269-
set __ExtraCmakeArgs=!___SDKVersion! "-DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir!" "-DCLR_BUILD_TYPE=%__BuildType%" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DNUGET_PACKAGES=%NUGET_PACKAGES:\=/%"
265+
set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" "-DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir!" "-DCLR_BUILD_TYPE=%__BuildType%" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DNUGET_PACKAGES=%NUGET_PACKAGES:\=/%"
270266

271267
pushd "%__IntermediatesDir%"
272-
call "%__ProjectDir%\eng\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
268+
call "%__ProjectDir%\eng\native\gen-buildsys.cmd" "%__ProjectDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
273269
@if defined _echo @echo on
274270
popd
275271

0 commit comments

Comments
 (0)