diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-11-04 21:32:01 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-11-11 23:22:07 +0100 |
| commit | fdb4b69e839db08f686e744c0dfeff8890068491 (patch) | |
| tree | ecbf2a2e3294c17263444579768eb0e1203b8cfa /base/server | |
| parent | 22ca258a846fe95dde281b15be067e6f3e304127 (diff) | |
| download | pki-fdb4b69e839db08f686e744c0dfeff8890068491.tar.gz pki-fdb4b69e839db08f686e744c0dfeff8890068491.tar.xz pki-fdb4b69e839db08f686e744c0dfeff8890068491.zip | |
Generalized list of files in CMakeLists.txt.
The list of source and class files in some CMake files have been
generalized to allow renaming Java packages without changing the
CMake files again.
https://fedorahosted.org/pki/ticket/6
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/cms/src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | base/server/cmscore/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | base/server/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/server/tomcat/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/server/tomcat7/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | base/server/tomcat8/src/CMakeLists.txt | 4 |
6 files changed, 6 insertions, 18 deletions
diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt index 447dcb18b..5017ba87b 100644 --- a/base/server/cms/src/CMakeLists.txt +++ b/base/server/cms/src/CMakeLists.txt @@ -121,8 +121,7 @@ find_file(HTTPCORE_JAR # build pki-cms javac(pki-cms-classes SOURCES - com/netscape/cms/*.java - org/dogtagpki/server/*.java + *.java CLASSPATH ${COMMONS_CODEC_JAR} ${COMMONS_IO_JAR} ${COMMONS_LANG_JAR} ${COMMONS_HTTPCLIENT_JAR} ${HTTPCLIENT_JAR} ${HTTPCORE_JAR} @@ -152,11 +151,6 @@ jar(pki-cms-jar ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf INPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/classes - FILES - com/netscape/cms/*.class - org/dogtagpki/server/*.class - EXCLUDE - com/netscape/cms/tomcat/*.class DEPENDS pki-cms-classes ) diff --git a/base/server/cmscore/src/CMakeLists.txt b/base/server/cmscore/src/CMakeLists.txt index fe8dba207..4ac1d46f3 100644 --- a/base/server/cmscore/src/CMakeLists.txt +++ b/base/server/cmscore/src/CMakeLists.txt @@ -122,7 +122,7 @@ find_file(NUXWDOG_JAR # build pki-cmscore javac(pki-cmscore-classes SOURCES - com/netscape/cmscore/*.java + *.java CLASSPATH ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_TOMCAT_JAR} ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR} @@ -152,8 +152,6 @@ jar(pki-cmscore-jar ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf INPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/classes - FILES - com/netscape/cmscore/*.class DEPENDS pki-cmscore-classes ) diff --git a/base/server/test/CMakeLists.txt b/base/server/test/CMakeLists.txt index 5abd26409..11c858250 100644 --- a/base/server/test/CMakeLists.txt +++ b/base/server/test/CMakeLists.txt @@ -32,7 +32,7 @@ find_file(PKI_CMSBUNDLE_JAR # TODO: build test only when the test is invoked javac(pki-server-test-classes SOURCES - com/netscape/cmscore/*.java + *.java CLASSPATH ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} ${PKI_CMSBUNDLE_JAR} diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt index c5897580d..7595f47ee 100644 --- a/base/server/tomcat/src/CMakeLists.txt +++ b/base/server/tomcat/src/CMakeLists.txt @@ -129,7 +129,7 @@ find_file(NUXWDOG_JAR # build pki-tomcat javac(pki-tomcat-classes SOURCES - com/netscape/cms/tomcat/*.java + *.java CLASSPATH ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${NUXWDOG_JAR} ${APACHE_COMMONS_LANG_JAR} ${TOMCATJSS_JAR} diff --git a/base/server/tomcat7/src/CMakeLists.txt b/base/server/tomcat7/src/CMakeLists.txt index 18f0b91dc..c8156138e 100644 --- a/base/server/tomcat7/src/CMakeLists.txt +++ b/base/server/tomcat7/src/CMakeLists.txt @@ -114,7 +114,7 @@ find_file(HTTPCORE_JAR # build pki-tomcat javac(pki-tomcat7-classes SOURCES - com/netscape/cms/tomcat/*.java + *.java CLASSPATH ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${JAXRS_API_JAR} @@ -139,8 +139,6 @@ jar(pki-tomcat-jar ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf INPUT_DIR ${CMAKE_BINARY_DIR}/../../tomcat - FILES - com/netscape/cms/tomcat/*.class DEPENDS pki-tomcat-classes pki-tomcat7-classes diff --git a/base/server/tomcat8/src/CMakeLists.txt b/base/server/tomcat8/src/CMakeLists.txt index db1b9dc31..a80a2125c 100644 --- a/base/server/tomcat8/src/CMakeLists.txt +++ b/base/server/tomcat8/src/CMakeLists.txt @@ -121,7 +121,7 @@ find_file(HTTPCORE_JAR # build pki-tomcat javac(pki-tomcat8-classes SOURCES - com/netscape/cms/tomcat/*.java + *.java CLASSPATH ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${TOMCAT_API_JAR} ${JAXRS_API_JAR} @@ -146,8 +146,6 @@ jar(pki-tomcat-jar ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf INPUT_DIR ${CMAKE_BINARY_DIR}/../../tomcat - FILES - com/netscape/cms/tomcat/*.class DEPENDS pki-tomcat-classes pki-tomcat8-classes |