diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b73bf53..61252ab1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -160,6 +160,7 @@ jobs: - name: Build and Test ${{ env.PACKAGE_NAME }} shell: msys2 {0} run: | + echo $MINGW_PREFIX ./gradlew build -Paws.crt.disableContainerTargets=mingw_x64 - name: Save Test Reports if: failure() diff --git a/aws-crt-kotlin/build.gradle.kts b/aws-crt-kotlin/build.gradle.kts index 0fe1f52a..180db67b 100644 --- a/aws-crt-kotlin/build.gradle.kts +++ b/aws-crt-kotlin/build.gradle.kts @@ -108,15 +108,19 @@ kotlin { } if (NATIVE_ENABLED && HostManager.hostIsMingw) { + println("CONFIGURING MINGW64 WinVer!") mingwX64 { val mingwHome = findMingwHome() + println("Found mingwHome at $mingwHome") val defPath = layout.buildDirectory.file("cinterop/winver.def") + println("Writing winver.def to ${defPath.get().asFile.absolutePath}") // Dynamically construct def file because of dynamic mingw paths val defFileTask by tasks.registering { outputs.file(defPath) - val mingwLibs = Paths.get(mingwHome, "lib").toString().replace("\\", "\\\\") // Windows path shenanigans + val mingwLibs = Paths.get(mingwHome, "lib").toString()//.replace("\\", "\\\\") // Windows path shenanigans + println("Using MinGW libs folder: $mingwLibs") doLast { Files.writeString( @@ -138,14 +142,19 @@ kotlin { ) } } + compilations["main"].cinterops { create("winver") { + println("Creating winver cinterop task") val mingwIncludes = Paths.get(mingwHome, "include").toString() + println("Using MinGW includes at: $mingwIncludes") + includeDirs(mingwIncludes) definitionFile.set(defPath) // Ensure that the def file is written first tasks[interopProcessingTaskName].dependsOn(defFileTask) + println("Done creating winver cinterop task") } } @@ -156,6 +165,7 @@ kotlin { "-v", ) compilerOptions.freeCompilerArgs.addAll(compilerArgs) + println("Added compiler args: ${compilerArgs.joinToString()}") } } } diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt index 19f3699a..e7a3a1c9 100644 --- a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt +++ b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt @@ -256,7 +256,7 @@ private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: Li "cmake" } - project.logger.info("$exeName ${exeArgs.joinToString(separator = " ")}") + project.logger.warn("$exeName ${exeArgs.joinToString(separator = " ")}") executable(exeName) args(exeArgs) }.result.get() // providers.exec is lazy, so fetch the result here to ensure the command executes