From ff81ede66718765e95175f1583e2bdbaebfc94fa Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 30 Aug 2012 15:21:21 -0500
Subject: Merged Javadoc packages.

The Javadocs for pki-util, pki-java-tools and pki-common have been
merged and packaged into pki-javadoc RPM.

Ticket #295
---
 base/CMakeLists.txt                |  3 +++
 base/common/src/CMakeLists.txt     | 33 -------------------------------
 base/java-tools/src/CMakeLists.txt | 31 -----------------------------
 base/javadoc/CMakeLists.txt        | 40 ++++++++++++++++++++++++++++++++++++++
 base/util/src/CMakeLists.txt       | 27 -------------------------
 5 files changed, 43 insertions(+), 91 deletions(-)
 create mode 100644 base/javadoc/CMakeLists.txt

(limited to 'base')

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index d8fcecdb6..734057374 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -16,6 +16,9 @@ if (APPLICATION_FLAVOR_PKI_CORE)
     add_subdirectory(ocsp)
     add_subdirectory(tks)
     add_subdirectory(silent)
+    if(WITH_JAVADOC)
+        add_subdirectory(javadoc)
+    endif(WITH_JAVADOC)
 endif (APPLICATION_FLAVOR_PKI_CORE)
 if (APPLICATION_FLAVOR_PKI_RA)
     add_subdirectory(ra)
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index f3702d454..fb4f5675e 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -219,39 +219,6 @@ install(
 
 set(PKI_CMS_JAR ${CMAKE_BINARY_DIR}/dist/pki-cms.jar CACHE INTERNAL "pki-cms jar file")
 
-if(WITH_JAVADOC)
-    javadoc(pki-common-javadoc
-        DEST
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-common-${APPLICATION_VERSION}
-        SUBPACKAGES
-            com.netscape.certsrv
-            com.netscape.cms
-        CLASSPATH
-            ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
-            ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
-            ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
-            ${APACHE_COMMONS_LANG_JAR}
-            ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR}
-            ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
-            ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-        OPTIONS
-            -windowtitle 'pki-common'
-            -doctitle '<h1>pki-common</h1>'
-            -author
-            -use
-            -version
-        DEPENDS
-            pki-cms pki-certsrv
-    )
-
-    install(
-        FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-common-${APPLICATION_VERSION}
-        DESTINATION
-            ${CMAKE_INSTALL_PREFIX}/share/javadoc
-    )
-endif(WITH_JAVADOC)
-
 
 # build pki-tomcat
 javac(pki-tomcat-classes
diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index a0c50d25b..c01b425a6 100644
--- a/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
@@ -133,34 +133,3 @@ install(
 )
 
 set(PKI_TOOLS_JAR ${CMAKE_BINARY_DIR}/dist/pki-tools.jar CACHE INTERNAL "pki-tools jar file")
-
-if(WITH_JAVADOC)
-    javadoc(pki-tools-javadoc
-        DEST
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-java-tools-${APPLICATION_VERSION}
-        SUBPACKAGES
-            com.netscape.cmstools
-        CLASSPATH
-            ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR}
-            ${XALAN_JAR} ${XERCES_JAR}
-            ${JSS_JAR} ${COMMONS_CODEC_JAR}
-            ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR}
-            ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
-            ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-        OPTIONS
-            -windowtitle 'pki-java-tools'
-            -doctitle '<h1>pki-java-tools</h1>'
-            -author
-            -use
-            -version
-        DEPENDS
-            pki-tools
-    )
-
-    install(
-        FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-java-tools-${APPLICATION_VERSION}
-        DESTINATION
-            ${CMAKE_INSTALL_PREFIX}/share/javadoc
-    )
-endif(WITH_JAVADOC)
diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt
new file mode 100644
index 000000000..c2d4a8012
--- /dev/null
+++ b/base/javadoc/CMakeLists.txt
@@ -0,0 +1,40 @@
+project(pki-javadoc)
+
+javadoc(pki-javadoc
+    SOURCEPATH
+        ${CMAKE_SOURCE_DIR}/base/util/src
+        ${CMAKE_SOURCE_DIR}/base/common/src
+        ${CMAKE_SOURCE_DIR}/base/java-tools/src
+    DEST
+        ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${APPLICATION_VERSION}
+    SUBPACKAGES
+        com.netscape.certsrv
+        com.netscape.cms
+        com.netscape.cmstools
+        com.netscape.cmsutil
+    CLASSPATH
+        ${XALAN_JAR} ${XERCES_JAR}
+        ${APACHE_COMMONS_CLI_JAR} ${APACHE_COMMONS_LANG_JAR}
+        ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
+        ${LDAPJDK_JAR} ${VELOCITY_JAR}
+        ${JSS_JAR} ${SYMKEY_JAR}
+        ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR}
+        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
+        ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
+        ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_TOOLS_JAR}
+    OPTIONS
+        -windowtitle 'pki-javadoc'
+        -doctitle '<h1>PKI Javadoc</h1>'
+        -author
+        -use
+        -version
+    DEPENDS
+        pki-cmsutil pki-certsrv pki-cms pki-tools
+)
+
+install(
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${APPLICATION_VERSION}
+    DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/share/javadoc
+)
diff --git a/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt
index af99da4d2..0f8eb496f 100644
--- a/base/util/src/CMakeLists.txt
+++ b/base/util/src/CMakeLists.txt
@@ -130,30 +130,3 @@ install(
 )
 
 set(PKI_CMSUTIL_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar CACHE INTERNAL "pki-cmsutil jar file")
-
-if(WITH_JAVADOC)
-    javadoc(pki-util-javadoc
-        DEST
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-util-${APPLICATION_VERSION}
-        SUBPACKAGES
-            com.netscape.cmsutil
-        CLASSPATH
-            ${APACHE_COMMONS_LANG_JAR} ${LDAPJDK_JAR} ${XALAN_JAR} ${XERCES_JAR}
-            ${JSS_JAR} ${COMMONS_CODEC_JAR}
-        OPTIONS
-            -windowtitle 'pki-util'
-            -doctitle '<h1>dogtag</h1>'
-            -author
-            -use
-            -version
-        DEPENDS
-            pki-cmsutil
-    )
-
-    install(
-        FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-util-${APPLICATION_VERSION}
-        DESTINATION
-            ${CMAKE_INSTALL_PREFIX}/share/javadoc
-    )
-endif(WITH_JAVADOC)
-- 
cgit