diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-25 00:43:31 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-28 09:42:24 -0500 |
| commit | 9368ef42cea4e1e46f22628cffaa29fba66cfec6 (patch) | |
| tree | cef737e524f9d19f919a5f3e260cc4bad6b35121 /base/util | |
| parent | 854ecce0fc312e65804d84041cbc93b17cce88a5 (diff) | |
| download | pki-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/util')
| -rw-r--r-- | base/util/src/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | base/util/src/pki-cmsutil.mf | 2 | ||||
| -rw-r--r-- | base/util/src/pki-nsutil.mf | 2 |
3 files changed, 22 insertions, 0 deletions
diff --git a/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt index 0f8eb496f..a39d9d828 100644 --- a/base/util/src/CMakeLists.txt +++ b/base/util/src/CMakeLists.txt @@ -57,9 +57,18 @@ javac(pki-nsutil-classes ${CMAKE_BINARY_DIR}/classes ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/pki-nsutil.mf + ${CMAKE_CURRENT_BINARY_DIR}/pki-nsutil.mf +) + jar(pki-nsutil-jar CREATE ${CMAKE_BINARY_DIR}/dist/pki-nsutil-${APPLICATION_VERSION}.jar + OPTIONS + m + PARAMS + ${CMAKE_CURRENT_BINARY_DIR}/pki-nsutil.mf INPUT_DIR ${CMAKE_BINARY_DIR}/classes FILES @@ -101,9 +110,18 @@ javac(pki-cmsutil-classes pki-nsutil ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsutil.mf + ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsutil.mf +) + jar(pki-cmsutil-jar CREATE ${CMAKE_BINARY_DIR}/dist/pki-cmsutil-${APPLICATION_VERSION}.jar + OPTIONS + m + PARAMS + ${CMAKE_CURRENT_BINARY_DIR}/pki-cmsutil.mf INPUT_DIR ${CMAKE_BINARY_DIR}/classes FILES diff --git a/base/util/src/pki-cmsutil.mf b/base/util/src/pki-cmsutil.mf new file mode 100644 index 000000000..87382b9aa --- /dev/null +++ b/base/util/src/pki-cmsutil.mf @@ -0,0 +1,2 @@ +Name: pki-cmsutil +Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file diff --git a/base/util/src/pki-nsutil.mf b/base/util/src/pki-nsutil.mf new file mode 100644 index 000000000..272200d67 --- /dev/null +++ b/base/util/src/pki-nsutil.mf @@ -0,0 +1,2 @@ +Name: pki-nsutil +Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file |