Use ExternalProject with Generator and InteropTests (#303)

tristanlabelle · Sep 18, 2024 · f8ece3d · f8ece3d
1 parent 7c4d5d2
commit f8ece3d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 38 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   support-spm:
-    name: Support Module (SPM)
+    name: SPM - Support Module
     runs-on: windows-2022
     timeout-minutes: 10
 
@@ -28,7 +28,7 @@ jobs:
       run: swift test --verbose --skip-build
 
   generator-and-interoptests-spm:
-    name: Generator and InteropTests (SPM)
+    name: SPM - Generator and InteropTests
     runs-on: windows-2022
     timeout-minutes: 15
 
@@ -61,8 +61,8 @@ jobs:
       shell: pwsh
       run: swift test --verbose --skip-build
 
-  support-cmake:
-    name: Support Module (CMake)
+  cmake:
+    name: CMake - All (No Tests)
     runs-on: windows-2022
     timeout-minutes: 15
 
@@ -77,32 +77,3 @@ jobs:
     - name: CMake Build
       shell: pwsh
       run: cmake --build --preset debug
-
-  generator-cmake:
-    name: Generator (CMake)
-    runs-on: windows-2022
-    timeout-minutes: 15
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ./.github/actions/setup-swift
-
-    - name: Configure Generator
-      working-directory: Generator
-      shell: pwsh
-      run: cmake --preset debug
-
-    - name: Build Generator
-      working-directory: Generator
-      shell: pwsh
-      run: cmake --build --preset debug
-
-    - name: Generate InteropTests Projection
-      working-directory: InteropTests
-      shell: pwsh
-      run: cmake --preset debug -D SWIFT_WINRT_EXE=${Env:GITHUB_WORKSPACE}\Generator\build\debug\Sources\SwiftWinRT\SwiftWinRT.exe
-
-    - name: Build InteropTests Projection
-      working-directory: InteropTests
-      shell: pwsh
-      run: cmake --build --preset debug
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -24,7 +24,7 @@
 			}
 		},
 		{
-			"label": "Build Support Module (CMake)",
+			"label": "Build (CMake)",
 			"type": "cmake",
 			"command": "build",
 			"preset": "${command:cmake.activeBuildPresetName}",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,4 +2,19 @@ cmake_minimum_required(VERSION 3.21.0)
 
 project(SwiftWinRT LANGUAGES C Swift)
 
-add_subdirectory(Support)
+add_subdirectory(Support)
+
+include(ExternalProject)
+
+ExternalProject_Add(Generator
+    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Generator
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Generator
+    INSTALL_COMMAND "")
+set(SWIFT_WINRT_EXE ${CMAKE_CURRENT_BINARY_DIR}/Generator/Sources/SwiftWinRT/SwiftWinRT.exe)
+
+ExternalProject_Add(InteropTests
+    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/InteropTests
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/InteropTests
+    CMAKE_ARGS -DSWIFT_WINRT_EXE=${SWIFT_WINRT_EXE}
+    INSTALL_COMMAND ""
+    DEPENDS Generator)
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/winstring.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/winstring.h
@@ -4,10 +4,7 @@
 #include <uchar.h>
 #include "SWRT/windows/BaseTsd.h"
 
-struct SWRT_HString_ {};
 typedef struct SWRT_HString_* SWRT_HString;
-
-struct SWRT_HStringBuffer_ {};
 typedef struct SWRT_HStringBuffer_* SWRT_HStringBuffer;
 
 SWRT_HResult SWRT_WindowsCreateString(const char16_t* sourceString, uint32_t length, SWRT_HString* string);