You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by st...@apache.org on 2022/07/06 11:51:27 UTC
[celix] branch NoDefaultCompressionOfBundles updated: Making default no compression
This is an automated email from the ASF dual-hosted git repository.
stegemr pushed a commit to branch NoDefaultCompressionOfBundles
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/NoDefaultCompressionOfBundles by this push:
new 7dfac163 Making default no compression
7dfac163 is described below
commit 7dfac16362e4d5ae6476969f363b2341738a0fce
Author: stegemanr <st...@gmail.com>
AuthorDate: Wed Jul 6 13:51:18 2022 +0200
Making default no compression
---
cmake/cmake_celix/BundlePackaging.cmake | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake
index 3b564c6c..5a46a67a 100644
--- a/cmake/cmake_celix/BundlePackaging.cmake
+++ b/cmake/cmake_celix/BundlePackaging.cmake
@@ -18,6 +18,9 @@
set(CELIX_NO_POSTFIX_BUILD_TYPES RelWithDebInfo Release CACHE STRING "The build type used for creating bundle without a build type postfix.")
+set(CELIX_DEFAULT_JAR_COMMAND_ARGUMENTS -cfm0 CACHE STRING "Default no compression is applied")
+set(CELIX_DEFAULT_ZIP_COMMAND_ARGUMENTS -rq0 CACHE STRING "Default no compression is applied")
+
find_program(JAR_COMMAND jar NO_CMAKE_FIND_ROOT_PATH)
@@ -272,7 +275,7 @@ function(add_celix_bundle)
if(JAR_COMMAND)
add_custom_command(OUTPUT ${BUNDLE_FILE}
COMMAND ${CMAKE_COMMAND} -E make_directory ${BUNDLE_CONTENT_DIR}
- COMMAND ${JAR_COMMAND} -cfm ${BUNDLE_FILE} ${BUNDLE_GEN_DIR}/MANIFEST.MF -C ${BUNDLE_CONTENT_DIR} .
+ COMMAND ${JAR_COMMAND} ${CELIX_DEFAULT_JAR_COMMAND_ARGUMENTS} ${BUNDLE_FILE} ${BUNDLE_GEN_DIR}/MANIFEST.MF -C ${BUNDLE_CONTENT_DIR} .
COMMENT "Packaging ${BUNDLE_TARGET_NAME}"
DEPENDS ${BUNDLE_TARGET_NAME} "$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_DEPEND_TARGETS>" ${BUNDLE_GEN_DIR}/MANIFEST.MF
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -282,7 +285,7 @@ function(add_celix_bundle)
add_custom_command(OUTPUT ${BUNDLE_FILE}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BUNDLE_GEN_DIR}/MANIFEST.MF META-INF/MANIFEST.MF
- COMMAND ${ZIP_COMMAND} -rq ${BUNDLE_FILE} *
+ COMMAND ${ZIP_COMMAND} ${CELIX_DEFAULT_ZIP_COMMAND_ARGUMENTS} ${BUNDLE_FILE} *
COMMENT "Packaging ${BUNDLE_TARGET_NAME}"
DEPENDS ${BUNDLE_TARGET_NAME} "$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_DEPEND_TARGETS>" ${BUNDLE_GEN_DIR}/MANIFEST.MF
WORKING_DIRECTORY ${BUNDLE_CONTENT_DIR}