Added attributes to the Java viewer MANIFEST file in order to conform to upcoming JRE requirements. Added support for specifying a signing certificate in place of the self-signed certificate.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5145 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/cmake/SignJar.cmake b/java/cmake/SignJar.cmake
index abc35ba..067116d 100644
--- a/java/cmake/SignJar.cmake
+++ b/java/cmake/SignJar.cmake
@@ -6,25 +6,66 @@
message(FATAL_ERROR "JAR_FILE must be defined")
endif()
-message(STATUS "Signing ${JAR_FILE}")
-
set(KEYTOOL "${Java_PATH}/keytool")
set(JARSIGNER "${Java_PATH}/jarsigner")
-file(REMOVE tigervnc.keystore)
-execute_process(COMMAND
- ${KEYTOOL} -genkey -alias TigerVNC -keystore tigervnc.keystore -keyalg RSA
- -storepass tigervnc -keypass tigervnc -validity 7300
- -dname "CN=TigerVNC, OU=Software Development, O=The TigerVNC Project, L=Austin, S=Texas, C=US"
- RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
-if(NOT RESULT EQUAL 0)
- message(FATAL_ERROR "${KEYTOOL} failed:\n${ERROR}")
+if(JAVA_KEYSTORE)
+ if((NOT JAVA_STOREPASS) OR (NOT JAVA_KEYPASS) OR (NOT JAVA_KEY_ALIAS))
+ message(FATAL_ERROR "When JAVA_KEYSTORE is specified, JAVA_KEY_ALIAS, JAVA_STOREPASS, and JAVA_KEYPASS must also be specified:\n${ERROR}")
+ endif()
+else()
+ message(STATUS "Generating self-signed certificate")
+ file(REMOVE tigervnc.keystore)
+ execute_process(COMMAND
+ ${KEYTOOL} -genkey -alias TigerVNC -keystore tigervnc.keystore -keyalg RSA
+ -storepass tigervnc -keypass tigervnc -validity 7300
+ -dname "CN=TigerVNC, OU=Software Development, O=The TigerVNC Project, L=Austin, S=Texas, C=US"
+ RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
+ if(NOT RESULT EQUAL 0)
+ message(FATAL_ERROR "${KEYTOOL} failed:\n${ERROR}")
+ endif()
+ set(JAVA_KEYSTORE "tigervnc.keystore")
+ set(JAVA_STOREPASS "tigervnc")
+ set(JAVA_KEYPASS "tigervnc")
+ set(JAVA_KEY_ALIAS "TigerVNC")
endif()
+
+message(STATUS "Signing ${JAR_FILE}")
+
+set(ARGS -keystore ${JAVA_KEYSTORE} -storetype ${JAVA_KEYSTORE_TYPE})
+
+if(${JAVA_STOREPASS} MATCHES "^:env")
+ string(REGEX REPLACE "^:env[\t ]+(.*)$" "\\1" JAVA_STOREPASS "${JAVA_STOREPASS}")
+ set(ARGS ${ARGS} -storepass:env ${JAVA_STOREPASS})
+elseif("${JAVA_STOREPASS}" MATCHES "^:file")
+ string(REGEX REPLACE "^:file[\t ]+(.*)$" "\\1" JAVA_STOREPASS "${JAVA_STOREPASS}")
+ set(ARGS ${ARGS} -storepass:file ${JAVA_STOREPASS})
+else()
+ set(ARGS ${ARGS} -storepass ${JAVA_STOREPASS})
+endif()
+
+if(${JAVA_KEYPASS} MATCHES "^:env")
+ string(REGEX REPLACE "^:env[\t ]+(.*)$" "\\1" JAVA_KEYPASS "${JAVA_KEYPASS}")
+ set(ARGS ${ARGS} -keypass:env ${JAVA_KEYPASS})
+elseif("${JAVA_KEYPASS}" MATCHES "^:file")
+ string(REGEX REPLACE "^:file[\t ]+(.*)$" "\\1" JAVA_KEYPASS "${JAVA_KEYPASS}")
+ set(ARGS ${ARGS} -keypass:file ${JAVA_KEYPASS})
+else()
+ set(ARGS ${ARGS} -keypass ${JAVA_KEYPASS})
+endif()
+
+if(JAVA_TSA_URL)
+ set(ARGS ${ARGS} -tsa ${JAVA_TSA_URL})
+endif()
+
execute_process(COMMAND
- ${JARSIGNER} -keystore tigervnc.keystore
- -storepass tigervnc -keypass tigervnc ${JAR_FILE} TigerVNC
+ ${JARSIGNER} ${ARGS} ${JAR_FILE} ${JAVA_KEY_ALIAS}
RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
+
if(NOT RESULT EQUAL 0)
message(FATAL_ERROR "${JARSIGNER} failed:\n${ERROR}")
endif()
-file(REMOVE tigervnc.keystore)
+
+if(EXISTS tigervnc.keystore)
+ file(REMOVE tigervnc.keystore)
+endif()