From 8d77b527adf2ae4b1487ec63dd4e03835180e793 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Mon, 29 Oct 2012 13:30:42 -0700
Subject: Removal of version numbers from jar file names

* TRAC Ticket #350 - Dogtag 10: Remove version numbers from PKI jar files . . .
---
 base/util/src/CMakeLists.txt  | 26 +++-----------------------
 base/util/test/CMakeLists.txt |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

(limited to 'base/util')

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
-- 
cgit