Skip to content

Commit 4a5acf6

Browse files
alvinhochunalvinhochun
authored
Add Linux native build (#1239)
1 parent d86323d commit 4a5acf6

12 files changed

Lines changed: 294 additions & 86 deletions

File tree

‎.github/actions/setup-llvm-mingw/action.yml‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@ inputs:
1212
outputs:
1313
llvm-path:
1414
description: "The path in which llvm-mingw is installed to"
15-
value: ${{ steps.setup-llvm.outputs.llvm-path }}
15+
value: ${{ ((runner.os == 'Windows') && steps.setup-llvm.outputs.llvm-path) || steps.setup-llvm-linux.outputs.llvm-path }}
1616
runs:
1717
using: "composite"
1818
steps:
19-
- name: Cache llvm-mingw
19+
- name: Cache llvm-mingw (Windows)
2020
id: cache-llvm
21+
if: runner.os == 'Windows'
2122
uses: actions/cache@v3
2223
with:
2324
path: .llvm-mingw
2425
key: llvm-mingw-${{ runner.os }}-${{ inputs.llvm-mingw-version }}-${{ inputs.host-arch }}
2526

26-
- name: Install llvm-mingw ${{ inputs.llvm-mingw-version }} (${{ inputs.host-arch }})
27-
if: steps.cache-llvm.outputs.cache-hit != 'true'
27+
- name: Install llvm-mingw ${{ inputs.llvm-mingw-version }} (Windows ${{ inputs.host-arch }})
28+
if: runner.os == 'Windows' && steps.cache-llvm.outputs.cache-hit != 'true'
2829
shell: pwsh
2930
run: |
3031
$llvm_mingw_version = "${{ inputs.llvm-mingw-version }}"
@@ -33,8 +34,9 @@ runs:
3334
7z x llvm-mingw.zip -o"$pwd\.llvm-mingw"
3435
rm llvm-mingw.zip
3536
36-
- name: Set up llvm-mingw
37+
- name: Set up llvm-mingw (Windows)
3738
id: setup-llvm
39+
if: runner.os == 'Windows'
3840
shell: pwsh
3941
run: |
4042
$llvm_mingw_version = "${{ inputs.llvm-mingw-version }}"
@@ -44,3 +46,34 @@ runs:
4446
Add-Content $env:GITHUB_PATH "$pwd\.llvm-mingw\llvm-mingw-${llvm_mingw_version}-ucrt-${llvm_arch}\bin"
4547
# for the ASAN runtime DLL:
4648
Add-Content $env:GITHUB_PATH "$pwd\.llvm-mingw\llvm-mingw-${llvm_mingw_version}-ucrt-${llvm_arch}\${llvm_arch}-w64-mingw32\bin"
49+
50+
- name: Cache llvm-mingw (Linux)
51+
id: cache-llvm-linux
52+
if: runner.os == 'Linux'
53+
uses: actions/cache@v3
54+
with:
55+
path: /opt/llvm-mingw
56+
key: llvm-mingw-${{ runner.os }}-${{ inputs.llvm-mingw-version }}-${{ inputs.host-arch }}
57+
58+
- name: Install llvm-mingw ${{ inputs.llvm-mingw-version }} (Linux ${{ inputs.host-arch }})
59+
if: runner.os == 'Linux' && steps.cache-llvm-linux.outputs.cache-hit != 'true'
60+
shell: bash
61+
run: |
62+
llvm_mingw_version="${{ inputs.llvm-mingw-version }}"
63+
llvm_arch="${{ inputs.host-arch }}"
64+
mkdir -p /opt/llvm-mingw
65+
cd /opt/llvm-mingw
66+
curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-${llvm_mingw_version}-ucrt-ubuntu-18.04-${llvm_arch}.tar.xz | tar xJ --strip-components=1
67+
68+
- name: Set up llvm-mingw (Linux)
69+
id: setup-llvm-linux
70+
if: runner.os == 'Linux'
71+
shell: bash
72+
run: |
73+
cd /opt/llvm-mingw
74+
if [ ! -x bin/clang++ ]; then
75+
echo "$PWD/bin/clang++ not found or not executable!"
76+
exit 1
77+
fi
78+
echo "llvm-path=$PWD/llvm-mingw" >> $GITHUB_OUTPUT
79+
echo "$PWD/bin" >> $GITHUB_PATH

‎.github/workflows/ci.yml‎

Lines changed: 103 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ jobs:
252252
test-llvm-mingw-cppwinrt:
253253
name: 'llvm-mingw: Build and test'
254254
strategy:
255+
fail-fast: false
255256
matrix:
256257
arch: [i686, x86_64]
257258
config: [Debug, Release]
@@ -262,6 +263,8 @@ jobs:
262263
- id: setup-llvm
263264
name: Set up llvm-mingw
264265
uses: ./.github/actions/setup-llvm-mingw
266+
with:
267+
host-arch: ${{ matrix.arch }}
265268

266269
- name: Build cppwinrt
267270
run: |
@@ -335,19 +338,117 @@ jobs:
335338
name: 'cross: Test run on Windows'
336339
needs: build-linux-cross-cppwinrt
337340
strategy:
341+
fail-fast: false
338342
matrix:
339343
arch: [i686, x86_64]
340344
runs-on: windows-latest
341345
steps:
346+
- uses: actions/checkout@v3
347+
342348
- name: Fetch cppwinrt executable
343349
uses: actions/download-artifact@v3
344350
with:
345351
name: cross-build-${{ matrix.arch }}-bin
346-
path: ./
352+
path: ./.test
347353

348354
- name: Run cppwinrt to build projection
349355
run: |
350-
.\cppwinrt.exe -in local -out .\ -verbose
356+
.\.test\cppwinrt.exe -in local -out .\.test\out -verbose
357+
358+
- id: setup-llvm
359+
name: Set up llvm-mingw
360+
uses: ./.github/actions/setup-llvm-mingw
361+
with:
362+
host-arch: ${{ matrix.arch }}
363+
364+
- name: Build cppwinrt tests
365+
run: |
366+
mkdir build
367+
cd build
368+
cmake ../test -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug `
369+
-DCPPWINRT_PROJECTION_INCLUDE_DIR="../.test/out" `
370+
-DDOWNLOAD_WINDOWSNUMERICS=TRUE
371+
cmake --build . -j2
372+
373+
- name: Run tests
374+
run: |
375+
cd build
376+
ctest --verbose
377+
378+
build-linux-native-cppwinrt:
379+
name: 'linux: GCC native build + llvm-mingw cross-build tests'
380+
runs-on: ubuntu-22.04
381+
steps:
382+
- uses: actions/checkout@v3
383+
384+
- name: Build cppwinrt
385+
run: |
386+
cmake -S . -B build/native/ \
387+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
388+
-DCMAKE_INSTALL_PREFIX=$PWD/install/
389+
cmake --build build/native/ --target install -j2
390+
391+
- name: Test run (cppwinrt -?)
392+
run: |
393+
install/bin/cppwinrt -?
394+
395+
- name: Test run (build projection using Windows.winmd)
396+
run: |
397+
curl -o Windows.winmd -L https://github.com/microsoft/windows-rs/raw/master/crates/libs/metadata/default/Windows.winmd
398+
install/bin/cppwinrt -in Windows.winmd -out /tmp/cppwinrt -verbose
399+
400+
- id: setup-llvm
401+
name: Set up llvm-mingw
402+
uses: ./.github/actions/setup-llvm-mingw
403+
404+
- name: Cross-build tests using projection
405+
run: |
406+
cmake -S test -B build/cross-tests --toolchain "$PWD/cross-mingw-toolchain.cmake" \
407+
-DCMAKE_SYSTEM_PROCESSOR=x86_64 \
408+
-DCMAKE_BUILD_TYPE=Debug \
409+
-DCMAKE_CXX_FLAGS="-static" \
410+
-DCPPWINRT_PROJECTION_INCLUDE_DIR=/tmp/cppwinrt \
411+
-DDOWNLOAD_WINDOWSNUMERICS=TRUE
412+
cmake --build build/cross-tests -j2
413+
414+
- name: Upload built tests
415+
uses: actions/upload-artifact@v3
416+
with:
417+
name: linux-native-cppwinrt-cross-build-tests-x86_64-bin
418+
path: build/cross-tests/*.exe
419+
420+
test-linux-native-cppwinrt-cross-tests:
421+
name: 'linux: Run llvm-mingw cross-build tests'
422+
needs: build-linux-native-cppwinrt
423+
strategy:
424+
matrix:
425+
arch: [x86_64]
426+
runs-on: windows-latest
427+
steps:
428+
- uses: actions/checkout@v3
429+
430+
- name: Fetch test executables
431+
uses: actions/download-artifact@v3
432+
with:
433+
name: linux-native-cppwinrt-cross-build-tests-${{ matrix.arch }}-bin
434+
path: ./
435+
436+
- name: Run tests
437+
run: |
438+
$test_exes = ls *.exe -Name
439+
$has_failed_tests = 0
440+
foreach ($test_exe in $test_exes) {
441+
echo "::group::Run '$test_exe'"
442+
& .\$test_exe
443+
echo "::endgroup::"
444+
if ($LastExitCode -ne 0) {
445+
echo "::error::Test '$test_exe' failed!"
446+
$has_failed_tests = 1
447+
}
448+
}
449+
if ($has_failed_tests -ne 0) {
450+
exit 1
451+
}
351452
352453
build-msvc-natvis:
353454
name: 'Build natvis'

‎CMakeLists.txt‎

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# This CMake build file is intended for use with the llvm-mingw toolchain:
22
# https://github.com/mstorsjo/llvm-mingw
33
#
4+
# It also works for building natively on Linux, or cross-building from Linux
5+
# for running on Windows with a mingw-w64 toolchain.
6+
#
47
# It most probably doesn't work with MSVC.
58

69
cmake_minimum_required(VERSION 3.16)
@@ -16,8 +19,10 @@ if(CPPWINRT_BUILD_VERSION STREQUAL "2.3.4.5" OR CPPWINRT_BUILD_VERSION STREQUAL
1619
endif()
1720
message(STATUS "Using version string: ${CPPWINRT_BUILD_VERSION}")
1821

19-
# WinMD uses CreateFile2 which requires Windows 8.
20-
add_compile_definitions(_WIN32_WINNT=0x0602)
22+
if(WIN32)
23+
# WinMD uses CreateFile2 which requires Windows 8.
24+
add_compile_definitions(_WIN32_WINNT=0x0602)
25+
endif()
2126

2227

2328
# === prebuild: Generator tool for strings.cpp, strings.h, version.rc ===
@@ -77,32 +82,37 @@ set(CPPWINRT_HEADERS
7782
cppwinrt/type_writers.h
7883
)
7984

80-
add_custom_command(
81-
OUTPUT
82-
"${PROJECT_BINARY_DIR}/app.manifest"
83-
COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/cppwinrt/app.manifest" "${PROJECT_BINARY_DIR}/app.manifest"
84-
DEPENDS "${PROJECT_SOURCE_DIR}/cppwinrt/app.manifest"
85-
VERBATIM
86-
)
87-
# Do the configure_file dance so that app.manifest.rc don't get modified every
88-
# single time the project is reconfigured and trigger a rebuild.
89-
file(WRITE "${PROJECT_BINARY_DIR}/app.manifest.rc.in" "1 24 \"app.manifest\"\n")
90-
configure_file(
91-
"${PROJECT_BINARY_DIR}/app.manifest.rc.in"
92-
"${PROJECT_BINARY_DIR}/app.manifest.rc"
93-
COPYONLY
94-
)
85+
if(WIN32)
86+
add_custom_command(
87+
OUTPUT
88+
"${PROJECT_BINARY_DIR}/app.manifest"
89+
COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/cppwinrt/app.manifest" "${PROJECT_BINARY_DIR}/app.manifest"
90+
DEPENDS "${PROJECT_SOURCE_DIR}/cppwinrt/app.manifest"
91+
VERBATIM
92+
)
93+
# Do the configure_file dance so that app.manifest.rc don't get modified every
94+
# single time the project is reconfigured and trigger a rebuild.
95+
file(WRITE "${PROJECT_BINARY_DIR}/app.manifest.rc.in" "1 24 \"app.manifest\"\n")
96+
configure_file(
97+
"${PROJECT_BINARY_DIR}/app.manifest.rc.in"
98+
"${PROJECT_BINARY_DIR}/app.manifest.rc"
99+
COPYONLY
100+
)
95101

96-
set(CPPWINRT_RESOURCES
97-
"${PROJECT_BINARY_DIR}/app.manifest"
98-
"${PROJECT_BINARY_DIR}/app.manifest.rc"
99-
"${PROJECT_BINARY_DIR}/version.rc"
100-
)
102+
set(CPPWINRT_RESOURCES
103+
"${PROJECT_BINARY_DIR}/app.manifest"
104+
"${PROJECT_BINARY_DIR}/app.manifest.rc"
105+
"${PROJECT_BINARY_DIR}/version.rc"
106+
)
107+
endif()
101108

102109
add_executable(cppwinrt ${CPPWINRT_SRCS} ${CPPWINRT_RESOURCES} ${CPPWINRT_HEADERS})
103110
target_compile_definitions(cppwinrt PRIVATE CPPWINRT_VERSION_STRING="${CPPWINRT_BUILD_VERSION}")
104111
target_include_directories(cppwinrt PRIVATE ${PROJECT_BINARY_DIR})
105-
target_link_libraries(cppwinrt shlwapi)
112+
113+
if(WIN32)
114+
target_link_libraries(cppwinrt shlwapi)
115+
endif()
106116

107117
install(TARGETS cppwinrt)
108118

@@ -158,26 +168,28 @@ int main() {}
158168
add_dependencies(cppwinrt gen-libxmllite)
159169
endif()
160170
endif()
161-
target_link_libraries(cppwinrt "${XMLLITE_LIBRARY}")
171+
if(WIN32)
172+
target_link_libraries(cppwinrt "${XMLLITE_LIBRARY}")
173+
endif()
162174

163175

164176
# === winmd: External header-only library for reading winmd files ===
165177

166178
include(ExternalProject)
167179
ExternalProject_Add(winmd
168-
URL https://github.com/microsoft/winmd/releases/download/1.0.210629.2/Microsoft.Windows.WinMD.1.0.210629.2.nupkg
169-
URL_HASH SHA256=4c5f29d948f5b3d724d229664c8f8e4823250d3c9f23ad8067b732fc7076d8c7
180+
GIT_REPOSITORY https://github.com/microsoft/winmd.git
181+
GIT_TAG 0f1eae3bfa63fa2ba3c2912cbfe72a01db94cc5a
170182
CONFIGURE_COMMAND ""
171183
BUILD_COMMAND ""
172184
INSTALL_COMMAND ""
173185
)
174186
add_dependencies(cppwinrt winmd)
175187
ExternalProject_Get_Property(winmd SOURCE_DIR)
176188
set(winmd_SOURCE_DIR "${SOURCE_DIR}")
177-
target_include_directories(cppwinrt PRIVATE "${winmd_SOURCE_DIR}")
189+
target_include_directories(cppwinrt PRIVATE "${winmd_SOURCE_DIR}/src")
178190

179191

180-
if(NOT CMAKE_CROSSCOMPILING)
192+
if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
181193
include(CTest)
182194
if(BUILD_TESTING)
183195
add_subdirectory(test)

0 commit comments

Comments
 (0)