Remove building native code for now.

votingworks · Aug 25, 2023 · 6a9c84b · 6a9c84b
1 parent 0106b34
commit 6a9c84b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git 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
@@ -109,7 +109,7 @@ dependencyResolutionManagement {
 }
 
 include ("egklib")
-include ("hacllib")
+// include ("hacllib")
 //include ("webapps:decryptingtrustee")
 //include ("webapps:decryption")
 //include ("webapps:keyceremony")