From f81718c563ea12240e161a807013acd2d6eb1f2e Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sun, 30 Sep 2012 12:21:46 -0500 Subject: 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 --- base/kra/shared/conf/CMakeLists.txt | 4 ---- base/kra/shared/conf/CS.cfg.in | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'base/kra/shared') diff --git a/base/kra/shared/conf/CMakeLists.txt b/base/kra/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/kra/shared/conf/CMakeLists.txt +++ b/base/kra/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/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in index c2655fc75..28653a958 100644 --- a/base/kra/shared/conf/CS.cfg.in +++ b/base/kra/shared/conf/CS.cfg.in @@ -17,7 +17,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID] installDate=[INSTALL_TIME] preop.wizard.name=DRM Setup Wizard preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.name=DRM preop.system.fullname=Data Recovery Manager proxy.securePort=[PKI_PROXY_SECURE_PORT] @@ -175,7 +175,7 @@ cmc.lraPopWitness.verify.allow=true cmc.revokeCert.verify=true cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ dbs.enableSerialManagement=false dbs.beginRequestNumber=1 dbs.endRequestNumber=10000000 -- cgit