diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-10-29 13:30:42 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-10-29 13:32:23 -0700 |
commit | 8d77b527adf2ae4b1487ec63dd4e03835180e793 (patch) | |
tree | b124b13d79ffba45f116c04971b8adde20bd6d02 /base/util | |
parent | c1aa8b2d05cb1873990d1a3e9cf007cca240f135 (diff) | |
download | pki-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/util')
-rw-r--r-- | base/util/src/CMakeLists.txt | 26 | ||||
-rw-r--r-- | base/util/test/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 24 deletions
diff --git a/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt index a39d9d828..767db7d69 100644 --- a/base/util/src/CMakeLists.txt +++ b/base/util/src/CMakeLists.txt @@ -64,7 +64,7 @@ configure_file( jar(pki-nsutil-jar CREATE - ${CMAKE_BINARY_DIR}/dist/pki-nsutil-${APPLICATION_VERSION}.jar + ${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar OPTIONS m PARAMS @@ -77,19 +77,9 @@ jar(pki-nsutil-jar pki-nsutil-classes ) -link(pki-nsutil - SOURCE - ${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar - DEST - pki-nsutil-${APPLICATION_VERSION}.jar - DEPENDS - pki-nsutil-jar -) - install( FILES ${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar - ${CMAKE_BINARY_DIR}/dist/pki-nsutil-${APPLICATION_VERSION}.jar DESTINATION ${JAVA_JAR_INSTALL_DIR}/pki ) @@ -107,7 +97,7 @@ javac(pki-cmsutil-classes OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes DEPENDS - pki-nsutil + pki-nsutil-jar ) configure_file( @@ -117,7 +107,7 @@ configure_file( jar(pki-cmsutil-jar CREATE - ${CMAKE_BINARY_DIR}/dist/pki-cmsutil-${APPLICATION_VERSION}.jar + ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar OPTIONS m PARAMS @@ -130,19 +120,9 @@ jar(pki-cmsutil-jar pki-cmsutil-classes ) -link(pki-cmsutil - SOURCE - ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar - DEST - pki-cmsutil-${APPLICATION_VERSION}.jar - DEPENDS - pki-cmsutil-jar -) - install( FILES ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar - ${CMAKE_BINARY_DIR}/dist/pki-cmsutil-${APPLICATION_VERSION}.jar DESTINATION ${JAVA_JAR_INSTALL_DIR}/pki ) diff --git a/base/util/test/CMakeLists.txt b/base/util/test/CMakeLists.txt index 28aae0a14..fdb97e5a1 100644 --- a/base/util/test/CMakeLists.txt +++ b/base/util/test/CMakeLists.txt @@ -13,7 +13,7 @@ javac(pki-util-test-classes OUTPUT_DIR ${CMAKE_BINARY_DIR}/test/classes DEPENDS - pki-test-classes pki-nsutil pki-cmsutil + pki-test-classes pki-nsutil-jar pki-cmsutil-jar ) # create test target |