summaryrefslogtreecommitdiffstats
path: root/base/common
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2012-10-29 13:30:42 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2012-10-29 13:32:23 -0700
commit8d77b527adf2ae4b1487ec63dd4e03835180e793 (patch)
treeb124b13d79ffba45f116c04971b8adde20bd6d02 /base/common
parentc1aa8b2d05cb1873990d1a3e9cf007cca240f135 (diff)
downloadpki-8d77b527adf2ae4b1487ec63dd4e03835180e793.tar.gz
pki-8d77b527adf2ae4b1487ec63dd4e03835180e793.tar.xz
pki-8d77b527adf2ae4b1487ec63dd4e03835180e793.zip
Removal of version numbers from jar file names
* TRAC Ticket #350 - Dogtag 10: Remove version numbers from PKI jar files . . .
Diffstat (limited to 'base/common')
-rw-r--r--base/common/src/CMakeLists.txt68
-rw-r--r--base/common/test/CMakeLists.txt10
2 files changed, 14 insertions, 64 deletions
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index 516c7ad2d..d5caff43e 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -133,7 +133,7 @@ javac(pki-certsrv-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil
+ pki-nsutil-jar pki-cmsutil-jar
)
configure_file(
@@ -143,7 +143,7 @@ configure_file(
jar(pki-certsrv-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
OPTIONS
m
PARAMS
@@ -156,19 +156,9 @@ jar(pki-certsrv-jar
pki-certsrv-classes
)
-link(pki-certsrv
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
- DEST
- pki-certsrv-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-certsrv-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -193,7 +183,7 @@ javac(pki-cms-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil pki-certsrv
+ pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
)
configure_file(
@@ -203,7 +193,7 @@ configure_file(
jar(pki-cms-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cms-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
OPTIONS
m
PARAMS
@@ -218,19 +208,9 @@ jar(pki-cms-jar
pki-cms-classes
)
-link(pki-cms
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
- DEST
- pki-cms-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cms-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cms.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cms-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -247,7 +227,7 @@ javac(pki-tomcat-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-cms
+ pki-cms-jar
)
configure_file(
@@ -257,7 +237,7 @@ configure_file(
jar(pki-tomcat-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
OPTIONS
m
PARAMS
@@ -270,19 +250,9 @@ jar(pki-tomcat-jar
pki-tomcat-classes
)
-link(pki-tomcat
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
- DEST
- pki-tomcat-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-tomcat-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -305,7 +275,7 @@ javac(pki-cmscore-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-tomcat
+ pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tomcat-jar
)
configure_file(
@@ -315,7 +285,7 @@ configure_file(
jar(pki-cmscore-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
OPTIONS
m
PARAMS
@@ -328,19 +298,9 @@ jar(pki-cmscore-jar
pki-cmscore-classes
)
-link(pki-cmscore
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
- DEST
- pki-cmscore-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cmscore-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -356,7 +316,7 @@ configure_file(
jar(pki-cmsbundle-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
OPTIONS
m
PARAMS
@@ -368,19 +328,9 @@ jar(pki-cmsbundle-jar
pki-cmsbundle-jar
)
-link(pki-cmsbundle
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
- DEST
- pki-cmsbundle-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cmsbundle-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/common/test/CMakeLists.txt b/base/common/test/CMakeLists.txt
index 181c7530f..d39b34f54 100644
--- a/base/common/test/CMakeLists.txt
+++ b/base/common/test/CMakeLists.txt
@@ -9,21 +9,21 @@ find_file(PKI_CERTSRV_JAR
find_file(PKI_CMS_JAR
NAMES
- pki-cms
+ pki-cms.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
find_file(PKI_CMSCORE_JAR
NAMES
- pki-cmscore
+ pki-cmscore.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
find_file(PKI_CMSBUNDLE_JAR
NAMES
- pki-cmsbundle
+ pki-cmsbundle.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -44,8 +44,8 @@ javac(pki-common-test-classes
${CMAKE_BINARY_DIR}/test/classes
DEPENDS
pki-test-classes
- pki-nsutil pki-cmsutil
- pki-certsrv pki-cms pki-cmscore pki-cmsbundle
+ pki-nsutil-jar pki-cmsutil-jar
+ pki-certsrv-jar pki-cms-jar pki-cmscore-jar pki-cmsbundle-jar
)
# create test target