summaryrefslogtreecommitdiffstats
path: root/base/common
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-09-25 00:43:31 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-09-28 09:42:24 -0500
commit9368ef42cea4e1e46f22628cffaa29fba66cfec6 (patch)
treecef737e524f9d19f919a5f3e260cc4bad6b35121 /base/common
parent854ecce0fc312e65804d84041cbc93b17cce88a5 (diff)
downloadpki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.tar.gz
pki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.tar.xz
pki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.zip
Added VERSION file.
The CMake scripts have been modified to store the version number in /usr/share/pki/VERSION and in JAR manifest files. These files can be read by PKI applications to obtain the version number without having to query the RPM database. Fixed warnings in Java.cmake file. Ticket #339
Diffstat (limited to 'base/common')
-rw-r--r--base/common/src/CMakeLists.txt45
-rw-r--r--base/common/src/pki-certsrv.mf2
-rw-r--r--base/common/src/pki-cms.mf2
-rw-r--r--base/common/src/pki-cmsbundle.mf2
-rw-r--r--base/common/src/pki-cmscore.mf2
-rw-r--r--base/common/src/pki-tomcat.mf2
6 files changed, 55 insertions, 0 deletions
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index fb4f5675e..516c7ad2d 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -136,9 +136,18 @@ javac(pki-certsrv-classes
pki-nsutil pki-cmsutil
)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pki-certsrv.mf
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-certsrv.mf
+)
+
jar(pki-certsrv-jar
CREATE
${CMAKE_BINARY_DIR}/dist/pki-certsrv-${APPLICATION_VERSION}.jar
+ OPTIONS
+ m
+ PARAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-certsrv.mf
INPUT_DIR
${CMAKE_BINARY_DIR}/classes
FILES
@@ -187,9 +196,18 @@ javac(pki-cms-classes
pki-nsutil pki-cmsutil pki-certsrv
)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pki-cms.mf
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
+)
+
jar(pki-cms-jar
CREATE
${CMAKE_BINARY_DIR}/dist/pki-cms-${APPLICATION_VERSION}.jar
+ OPTIONS
+ m
+ PARAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
INPUT_DIR
${CMAKE_BINARY_DIR}/classes
FILES
@@ -232,9 +250,18 @@ javac(pki-tomcat-classes
pki-cms
)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pki-tomcat.mf
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
+)
+
jar(pki-tomcat-jar
CREATE
${CMAKE_BINARY_DIR}/dist/pki-tomcat-${APPLICATION_VERSION}.jar
+ OPTIONS
+ m
+ PARAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
INPUT_DIR
${CMAKE_BINARY_DIR}/classes
FILES
@@ -281,9 +308,18 @@ javac(pki-cmscore-classes
pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-tomcat
)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmscore.mf
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
+)
+
jar(pki-cmscore-jar
CREATE
${CMAKE_BINARY_DIR}/dist/pki-cmscore-${APPLICATION_VERSION}.jar
+ OPTIONS
+ m
+ PARAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
INPUT_DIR
${CMAKE_BINARY_DIR}/classes
FILES
@@ -313,9 +349,18 @@ set(PKI_CMSCORE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar CACHE INTERNAL "pki
# build pki-cmsbundle
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsbundle.mf
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
+)
+
jar(pki-cmsbundle-jar
CREATE
${CMAKE_BINARY_DIR}/dist/pki-cmsbundle-${APPLICATION_VERSION}.jar
+ OPTIONS
+ m
+ PARAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsbundle.mf
FILES
LogMessages.properties
UserMessages.properties
diff --git a/base/common/src/pki-certsrv.mf b/base/common/src/pki-certsrv.mf
new file mode 100644
index 000000000..fe2ed1ffe
--- /dev/null
+++ b/base/common/src/pki-certsrv.mf
@@ -0,0 +1,2 @@
+Name: pki-certsrv
+Implementation-Version: ${APPLICATION_VERSION} \ No newline at end of file
diff --git a/base/common/src/pki-cms.mf b/base/common/src/pki-cms.mf
new file mode 100644
index 000000000..2c6f8010f
--- /dev/null
+++ b/base/common/src/pki-cms.mf
@@ -0,0 +1,2 @@
+Name: pki-cms
+Implementation-Version: ${APPLICATION_VERSION} \ No newline at end of file
diff --git a/base/common/src/pki-cmsbundle.mf b/base/common/src/pki-cmsbundle.mf
new file mode 100644
index 000000000..84d6f0e7a
--- /dev/null
+++ b/base/common/src/pki-cmsbundle.mf
@@ -0,0 +1,2 @@
+Name: pki-cmsbundle
+Implementation-Version: ${APPLICATION_VERSION} \ No newline at end of file
diff --git a/base/common/src/pki-cmscore.mf b/base/common/src/pki-cmscore.mf
new file mode 100644
index 000000000..1b1a03f50
--- /dev/null
+++ b/base/common/src/pki-cmscore.mf
@@ -0,0 +1,2 @@
+Name: pki-cmscore
+Implementation-Version: ${APPLICATION_VERSION} \ No newline at end of file
diff --git a/base/common/src/pki-tomcat.mf b/base/common/src/pki-tomcat.mf
new file mode 100644
index 000000000..a6e4889b8
--- /dev/null
+++ b/base/common/src/pki-tomcat.mf
@@ -0,0 +1,2 @@
+Name: pki-tomcat
+Implementation-Version: ${APPLICATION_VERSION} \ No newline at end of file