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

[Dmitry Shachnev]

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.

[Alberts Muktupāvels (muktupavels)]

review: Approve

diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake
index e48da17..8c71cac 100644
--- a/cmake/CompizCommon.cmake
+++ b/cmake/CompizCommon.cmake
@@ -293,7 +293,8 @@ endfunction ()
 macro (compiz_add_git_dist)
 
 	add_custom_target (dist
-			   COMMAND git archive -o ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD
+			   COMMAND git config tar.tar.xz.command "xz -c"
+			   && git archive -o ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD
 			   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 endmacro ()
@@ -301,9 +302,9 @@ endmacro ()
 macro (compiz_add_distcheck)
 	add_custom_target (distcheck 
 			   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/dist-build
-			   && cp ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2 ${CMAKE_BINARY_DIR}/dist-build
+			   && cp ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz ${CMAKE_BINARY_DIR}/dist-build
 			   && cd ${CMAKE_BINARY_DIR}/dist-build
-			   && tar xvf ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2
+			   && tar xvf ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz
 			   && mkdir -p ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}/build
 			   && cd ${CMAKE_BINARY_DIR}/dist-build/${CMAKE_PROJECT_NAME}-${VERSION}/build
 			   && cmake -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dist-build/buildroot -DCOMPIZ_PLUGIN_INSTALL_TYPE='package' .. -DCMAKE_MODULE_PATH=/usr/share/cmake
@@ -338,15 +339,15 @@ macro (compiz_add_release_signoff)
 	add_custom_target (release-version-bump)
 
 	add_custom_target (release-sign-tarballs
-		   COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2
+		   COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz
 	   COMMENT "Signing tarball"
 	   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 	add_custom_target (release-sha1-tarballs
-		   COMMAND sha1sum ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2 > ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2.sha1
+		   COMMAND sha1sum ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz > ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz.sha1
 		   COMMENT "SHA1Summing tarball"
 		   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 	add_custom_target (release-sign-sha1-tarballs
-		   COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2.sha1
+		   COMMAND gpg --armor --sign --detach-sig ${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz.sha1
 		   COMMENT "Signing SHA1Sum checksum"
 		   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})