From 6a9c84b1b82fb244361edae76cbe4f426a0760bd Mon Sep 17 00:00:00 2001 From: JohnLCaron Date: Fri, 25 Aug 2023 14:53:01 -0600 Subject: [PATCH] Remove building native code for now. --- egklib/build.gradle.kts | 45 +++++++++++++++++++++-------------------- settings.gradle.kts | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/egklib/build.gradle.kts b/egklib/build.gradle.kts index 8383273b..4aa16b79 100644 --- a/egklib/build.gradle.kts +++ b/egklib/build.gradle.kts @@ -60,29 +60,29 @@ kotlin { } } - val hostOs = System.getProperty("os.name") - val isMingwX64 = hostOs.startsWith("Windows") - val arch = System.getProperty("os.arch") - val nativeTarget = - when { - hostOs == "Mac OS X" && arch == "aarch64" -> macosArm64("native") - hostOs == "Mac OS X"-> macosX64("native") - hostOs == "Linux" -> linuxX64("native") - isMingwX64 -> mingwX64("native") - else -> throw GradleException("Host OS is not supported.") - } - /* - nativeTarget.apply { - binaries { - sharedLib() { - baseName = "ekm" // on Linux and macOS - // baseName = "libekm // on Windows - } +val hostOs = System.getProperty("os.name") +val isMingwX64 = hostOs.startsWith("Windows") +val arch = System.getProperty("os.arch") +val nativeTarget = + when { + hostOs == "Mac OS X" && arch == "aarch64" -> macosArm64("native") + hostOs == "Mac OS X"-> macosX64("native") + hostOs == "Linux" -> linuxX64("native") + isMingwX64 -> mingwX64("native") + else -> throw GradleException("Host OS '$hostOs' arch '$arch' is not supported.") + } + +nativeTarget.apply { + binaries { + sharedLib() { + baseName = "ekm" // on Linux and macOS + // baseName = "libekm // on Windows } } +} - */ + */ sourceSets { all { languageSettings.optIn("kotlin.RequiresOptIn") } @@ -152,12 +152,14 @@ kotlin { implementation(libs.junit.jupiter.params) } } - val nativeMain by getting { + /* val nativeMain by getting { dependencies { implementation(project(":hacllib")) } } val nativeTest by getting { dependencies {} } + + */ } } @@ -229,8 +231,7 @@ publishing { } } } - - */ +*/ tasks.register("showConfigurations") { configurations.forEach { diff --git a/settings.gradle.kts b/settings.gradle.kts index ca41442e..684ce23c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -109,7 +109,7 @@ dependencyResolutionManagement { } include ("egklib") -include ("hacllib") +// include ("hacllib") //include ("webapps:decryptingtrustee") //include ("webapps:decryption") //include ("webapps:keyceremony")