summaryrefslogtreecommitdiffstats
path: root/base/ca/shared
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-09-30 12:21:46 -0500
committerAde Lee <alee@redhat.com>2012-10-01 14:15:44 -0400
commitf81718c563ea12240e161a807013acd2d6eb1f2e (patch)
tree2aa664ed414086ac0a19c7eb6b0ac9e3a57af256 /base/ca/shared
parentaa1c7e757ee01759cb08f3dd5d0556cfe2ef8e32 (diff)
downloadpki-f81718c563ea12240e161a807013acd2d6eb1f2e.tar.gz
pki-f81718c563ea12240e161a807013acd2d6eb1f2e.tar.xz
pki-f81718c563ea12240e161a807013acd2d6eb1f2e.zip
Using RPM version number in CMake.
The RPM spec files have been modified to pass the full RPM version number to CMake. The version number contains the product version number, release number, milestone, and platform. The CMake scritps will parse and use this version number to generate Java manifest files. The product version number will be used as the specification version and full version number will be used as the implementation version. Ticket #339
Diffstat (limited to 'base/ca/shared')
-rw-r--r--base/ca/shared/conf/CMakeLists.txt4
-rw-r--r--base/ca/shared/conf/CS.cfg.in4
2 files changed, 2 insertions, 6 deletions
diff --git a/base/ca/shared/conf/CMakeLists.txt b/base/ca/shared/conf/CMakeLists.txt
index e3cef5915..419289d03 100644
--- a/base/ca/shared/conf/CMakeLists.txt
+++ b/base/ca/shared/conf/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(VERSION ${APPLICATION_VERSION})
-set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR})
-set(MINOR_VERSION ${APPLICATION_VERSION_MINOR})
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY)
install(
diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
index 4d148945c..94a3e5b49 100644
--- a/base/ca/shared/conf/CS.cfg.in
+++ b/base/ca/shared/conf/CS.cfg.in
@@ -18,7 +18,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID]
installDate=[INSTALL_TIME]
preop.wizard.name=CA Setup Wizard
preop.product.name=CS
-preop.product.version=@VERSION@
+preop.product.version=@APPLICATION_VERSION@
preop.system.name=CA
preop.system.fullname=Certificate Authority
proxy.securePort=[PKI_PROXY_SECURE_PORT]
@@ -734,7 +734,7 @@ cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret
cms.passwordlist=internaldb,replicationdb
cms.password.ignore.publishing.failure=true
-cms.version=@MAJOR_VERSION@.@MINOR_VERSION@
+cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@
cmsgateway._000=##
cmsgateway._001=## In the event that all Admin Certificates have been lost
cmsgateway._002=## for a given instance, perform the following steps to