diff options
| author | Brian Hinz <bphinz@users.sourceforge.net> | 2013-12-02 02:53:10 +0000 |
|---|---|---|
| committer | Brian Hinz <bphinz@users.sourceforge.net> | 2013-12-02 02:53:10 +0000 |
| commit | f88b3add41d41de674712d9b5ce06a0f2a2f63bf (patch) | |
| tree | 57cf4db16c2cf8d413128024b0ed69c284ce4852 /java/CMakeLists.txt | |
| parent | 0990998e00a61bc653592281ad9f914aef291327 (diff) | |
| download | tigervnc-f88b3add41d41de674712d9b5ce06a0f2a2f63bf.tar.gz tigervnc-f88b3add41d41de674712d9b5ce06a0f2a2f63bf.zip | |
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
Diffstat (limited to 'java/CMakeLists.txt')
| -rw-r--r-- | java/CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 3477c8d0..c98c69c0 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -15,6 +15,12 @@ message(STATUS "Java compiler flags = ${JAVACFLAGS}") set(CLASSPATH com/tigervnc/vncviewer) set(SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) set(BINDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(JAVA_KEYSTORE NOTFOUND CACHE STRING "URL of keystore location") +set(JAVA_KEYSTORE_TYPE "jks" CACHE STRING "Type of keystore (Default: \"jks\")") +set(JAVA_KEY_ALIAS NOTFOUND CACHE STRING "Alias for the keystore entry used to generate the signature") +set(JAVA_STOREPASS NOTFOUND CACHE STRING "Password required to access the keystore") +set(JAVA_KEYPASS NOTFOUND CACHE STRING "Password used to protect the private key of the specified keystore entry") +set(JAVA_TSA_URL NOTFOUND CACHE STRING "URL of Time Stamping Authority (TSA)") if(NOT BUILD) execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD) @@ -136,6 +142,12 @@ add_custom_command(OUTPUT VncViewer.jar com/tigervnc/vncviewer/tigervnc.ico COMMAND ${CMAKE_COMMAND} ARGS -DJava_PATH=${Java_PATH} -DJAR_FILE=${BINDIR}/VncViewer.jar + -DJAVA_KEYSTORE=${JAVA_KEYSTORE} + -DJAVA_KEYSTORE_TYPE=${JAVA_KEYSTORE_TYPE} + -DJAVA_STOREPASS=${JAVA_STOREPASS} + -DJAVA_KEYPASS=${JAVA_KEYPASS} + -DJAVA_KEY_ALIAS=${JAVA_KEY_ALIAS} + -DJAVA_TSA_URL=${JAVA_TSA_URL} -P ${SRCDIR}/cmake/SignJar.cmake) add_custom_target(java ALL DEPENDS VncViewer.jar) |