Update Mac build logic to include upstream cacerts and Amazon cacerts

corretto · Jul 11, 2019 · ac79d31 · ac79d31
1 parent 9b8031b
commit ac79d31
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/installers/mac/tar/build.gradle b/installers/mac/tar/build.gradle
@@ -39,8 +39,20 @@ task copySource(type: Copy) {
     into buildRoot
 }
 
-task configureBuild(type: Exec) {
+task importAmazonCacerts(type: Exec) {
     dependsOn copySource
+    workingDir buildRoot
+    // Default password for JSSE key store
+    def keystore_password = "changeit"
+    commandLine 'keytool', '-importkeystore', '-noprompt',
+            '-srckeystore', "amazon-cacerts",
+            '-srcstorepass', keystore_password,
+            '-destkeystore', 'src/src/java.base/share/lib/security/cacerts',
+            '-deststorepass', keystore_password
+}
+
+task configureBuild(type: Exec) {
+    dependsOn importAmazonCacerts
     workingDir "$buildRoot/src"
     def commands = ['bash', 'configure',
                     '--with-jvm-features=zgc',
@@ -53,7 +65,7 @@ task configureBuild(type: Exec) {
                     "--with-vendor-bug-url=https://github.com/corretto/corretto-${version.major}/issues/",
                     '--with-debug-level=release',
                     '--with-native-debug-symbols=none',
-                    "--with-cacerts-file=$buildRoot/cacerts"]
+                    "--with-cacerts-file=$buildRoot/src/src/java.base/share/lib/security/cacerts"]
     def extraCmd = System.getenv("EXTRA_CORRETTO_CONFIG_OPTIONS")
     if (extraCmd != null) {
         commands += extraCmd.split(" ")