Browse Source

Only sign JAR when it is built


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4703 3789f03b-4d11-0410-bbf8-ca57d06f2519
tags/v1.1.90
DRC 12 years ago
parent
commit
d000252926
2 changed files with 8 additions and 7 deletions
  1. 2
    0
      cmake/SignJar.cmake
  2. 6
    7
      java/src/CMakeLists.txt

+ 2
- 0
cmake/SignJar.cmake View File

@@ -6,6 +6,8 @@ if(NOT JAR_FILE)
message(FATAL_ERROR "JAR_FILE must be defined")
endif()

message(STATUS "Signing ${JAR_FILE}")

set(KEYTOOL "${Java_PATH}/keytool")
set(JARSIGNER "${Java_PATH}/jarsigner")


+ 6
- 7
java/src/CMakeLists.txt View File

@@ -72,6 +72,8 @@ add_custom_command(OUTPUT ${JAVA_BINDIR}/tigervnc.ico
${JAVA_SRCDIR}/tigervnc.ico ${JAVA_BINDIR}/tigervnc.ico
DEPENDS ${JAVA_SRCDIR}/tigervnc.ico)

string(REGEX REPLACE "jar" "" Java_PATH ${Java_JAR_EXECUTABLE})

add_custom_command(OUTPUT VncViewer.jar
DEPENDS ${JAVA_CLASSES_FULL}
${JAVA_SRCDIR}/MANIFEST.MF
@@ -88,17 +90,14 @@ add_custom_command(OUTPUT VncViewer.jar
com/jcraft/jzlib/*.class
com/tigervnc/vncviewer/tigervnc.png
com/tigervnc/vncviewer/tigervnc.ico
COMMAND ${CMAKE_COMMAND}
ARGS -DJava_PATH=${Java_PATH}
-DJAR_FILE=${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
-P ${CMAKE_SOURCE_DIR}/cmake/SignJar.cmake
WORKING_DIRECTORY ${OBJDIR})

add_custom_target(java ALL DEPENDS VncViewer.jar)

string(REGEX REPLACE "jar" "" Java_PATH ${Java_JAR_EXECUTABLE})

add_custom_command(TARGET java POST_BUILD COMMAND
${CMAKE_COMMAND} -DJava_PATH=${Java_PATH}
-DJAR_FILE=${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
-P ${CMAKE_SOURCE_DIR}/cmake/SignJar.cmake)

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
${JAVA_SRCDIR}/README

Loading…
Cancel
Save