Compiz

Merge compiz:mitya57/xz-tarballs into compiz:master

  1. Git
  2. lp:compiz
  3. mitya57/xz-tarballs
  4. Merge into master
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 2ea8a694ff9d644b4a9df49d5a34cc41327130f3
Merged at revision: 2ea8a694ff9d644b4a9df49d5a34cc41327130f3
Proposed branch: compiz:mitya57/xz-tarballs
Merge into: compiz:master
Diff against target: 44 lines (+7/-6)
1 file modified
cmake/CompizCommon.cmake (+7/-6)
Reviewer Review Type Date Requested Status
Alberts Muktupāvels Approve
Marco Trevisan (Treviño) Pending
Compiz Maintainers Pending
Review via email: mp+363208@code.launchpad.net

Description of the change

More fixes related to tarballs generation.

- There are no advantages of .tar.bz2 over .tar.xz. The latter has higher compression ratios and faster decompression. It can be slower in compression but that does not matter for tarballs, as they are only compressed once. So let’s switch to .tar.xz.

- Git does not support .tar.xz out of the box (it only supports .tar.gz), so a config is needed. I had that locally so I did not notice it in the previous commit.

- Update release commands to work with .tar.xz tarballs.

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake
2index e48da17..8c71cac 100644
3--- a/cmake/CompizCommon.cmake
4+++ b/cmake/CompizCommon.cmake
5@@ -293,7 +293,8 @@ endfunction ()
6 macro (compiz_add_git_dist)
7
8 add_custom_target (dist
9- COMMAND git archive -o ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD
10+ COMMAND git config tar.tar.xz.command "xz -c"
11+ && git archive -o ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD
12 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
13
14 endmacro ()
15@@ -301,9 +302,9 @@ endmacro ()
16 macro (compiz_add_distcheck)
17 add_custom_target (distcheck
18 COMMAND mkdir -p ${CMAKE_BINARY_DIR}/dist-build
19- && cp ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2 ${CMAKE_BINARY_DIR}/dist-build
20+ && cp ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz ${CMAKE_BINARY_DIR}/dist-build
21 && cd ${CMAKE_BINARY_DIR}/dist-build
22- && tar xvf ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2
23+ && tar xvf ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz
24 && mkdir -p ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}/build
25 && cd ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}/build
26 && cmake -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dist-build/buildroot -DCOMPIZ_PLUGIN_INSTALL_TYPE='package' .. -DCMAKE_MODULE_PATH=/usr/share/cmake
27@@ -338,15 +339,15 @@ macro (compiz_add_release_signoff)
28 add_custom_target (release-version-bump)
29
30 add_custom_target (release-sign-tarballs
31- COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2
32+ COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz
33 COMMENT "Signing tarball"
34 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
35 add_custom_target (release-sha1-tarballs
36- COMMAND sha1sum ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2 > ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2.sha1
37+ COMMAND sha1sum ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz > ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz.sha1
38 COMMENT "SHA1Summing tarball"
39 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
40 add_custom_target (release-sign-sha1-tarballs
41- COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2.sha1
42+ COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz.sha1
43 COMMENT "Signing SHA1Sum checksum"
44 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
45

Subscribers

People subscribed via source and target branches