1 files changed, 43 insertions, 52 deletions

diff --git a/base/silent/src/CMakeLists.txt b/base/silent/src/CMakeLists.txt
index a3e6034f8..0240439ce 100644
--- a/base/silent/src/CMakeLists.txt
+++ b/base/silent/src/CMakeLists.txt
@@ -24,59 +24,50 @@ find_file(XERCES_JAR
         /usr/share/java
 )
 
-set(pki-silent_java_SRCS
-     com/netscape/pkisilent/ConfigureTKS.java
-     com/netscape/pkisilent/ConfigureCA.java
-     com/netscape/pkisilent/argparser/CharHolder.java
-     com/netscape/pkisilent/argparser/ArgParseException.java
-     com/netscape/pkisilent/argparser/StringHolder.java
-     com/netscape/pkisilent/argparser/SimpleExample.java
-     com/netscape/pkisilent/argparser/ArgParser.java
-     com/netscape/pkisilent/argparser/DoubleHolder.java
-     com/netscape/pkisilent/argparser/ObjectHolder.java
-     com/netscape/pkisilent/argparser/FloatHolder.java
-     com/netscape/pkisilent/argparser/BooleanHolder.java
-     com/netscape/pkisilent/argparser/StringScanException.java
-     com/netscape/pkisilent/argparser/StringScanner.java
-     com/netscape/pkisilent/argparser/LongHolder.java
-     com/netscape/pkisilent/argparser/IntHolder.java
-     com/netscape/pkisilent/ConfigureTPS.java
-     com/netscape/pkisilent/http/HTTPClient.java
-     com/netscape/pkisilent/http/HTMLDocument.java
-     com/netscape/pkisilent/http/HTTPResponse.java
-     com/netscape/pkisilent/http/CertSelection.java
-     com/netscape/pkisilent/common/Request.java
-     com/netscape/pkisilent/common/CertificateRecord.java
-     com/netscape/pkisilent/common/Utilities.java
-     com/netscape/pkisilent/common/ComCrypto.java
-     com/netscape/pkisilent/common/BaseState.java
-     com/netscape/pkisilent/common/CMSLDAP.java
-     com/netscape/pkisilent/common/CMSConfig.java
-     com/netscape/pkisilent/common/PostQuery.java
-     com/netscape/pkisilent/common/ServerInfo.java
-     com/netscape/pkisilent/common/UserEnroll.java
-     com/netscape/pkisilent/common/ParseXML.java
-     com/netscape/pkisilent/common/CMSProperties.java
-     com/netscape/pkisilent/common/DirEnroll.java
-     com/netscape/pkisilent/common/Con2Agent.java
-     com/netscape/pkisilent/common/TestClient.java
-     com/netscape/pkisilent/common/CMSTask.java
-     com/netscape/pkisilent/ConfigureOCSP.java
-     com/netscape/pkisilent/ConfigureRA.java
-     com/netscape/pkisilent/ConfigureSubCA.java
-     com/netscape/pkisilent/ConfigureDRM.java
-     com/netscape/pkisilent/PKISilent.java
+# build pki-silent
+javac(pki-silent-classes
+    SOURCES
+        com/netscape/pkisilent/*.java
+    CLASSPATH
+        ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR}
+        ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
+        ${LDAPJDK_JAR} ${XERCES_JAR}
+        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    DEPENDS
+        symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms
 )
 
-set(CMAKE_JAVA_INCLUDE_PATH
-    ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR}
-    ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
-    ${LDAPJDK_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+jar(pki-silent-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-silent-${APPLICATION_VERSION}.jar
+    INPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    FILES
+        com/netscape/pkisilent/*.class
+    EXCLUDE
+        com/netscape/pkisilent/argparser/ArgParserTest*.class
+        com/netscape/pkisilent/common/checkRequest.class
+    DEPENDS
+        pki-silent-classes
+)
+
+link(pki-silent
+    SOURCE
+        ${CMAKE_BINARY_DIR}/dist/pki-silent.jar
+    DEST
+        pki-silent-${APPLICATION_VERSION}.jar
+    DEPENDS
+        pki-silent-jar
+)
 
-set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-silent.jar
+        ${CMAKE_BINARY_DIR}/dist/pki-silent-${APPLICATION_VERSION}.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
 
-add_jar(pki-silent ${pki-silent_java_SRCS})
-add_dependencies(pki-silent symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms)
-install_jar(pki-silent ${JAVA_JAR_INSTALL_DIR}/pki)
-set(PKI_SILENT_JAR ${pki-silent_JAR_FILE} CACHE INTERNAL "pki-silent jar file")
+set(PKI_SILENT_JAR ${CMAKE_BINARY_DIR}/dist/pki-silent.jar CACHE INTERNAL "pki-silent jar file")