From 4d7a2f4b463fbdf0cf4736f2f636c5672bd972a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 30 Jul 2020 01:12:11 +0200 Subject: Use tde_create_tarball, which is ready for reproducible builds, instead of calling 'tar' and requiring GNU extensions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit c7d308a9ba6c0ef1639b7b78848a3dd2117fde0a) --- parts/appwizard/common/CMakeLists.txt | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'parts') diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt index 8451d3f7..916a8157 100644 --- a/parts/appwizard/common/CMakeLists.txt +++ b/parts/appwizard/common/CMakeLists.txt @@ -9,18 +9,26 @@ # ################################################# -function( generate_tar output source ) - add_custom_target( ${output} ALL - COMMAND ${TAR} -zcf ${output} --exclude=.svn --exclude=*.cdbs-orig -C ${CMAKE_CURRENT_SOURCE_DIR}/${source} ${ARGN} ) -endfunction( ) +file( GLOB _admin_content RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} admin/* ) +list( + REMOVE_ITEM _admin_content admin/.git + admin/config.guess.cdbs-orig admin/config.sub.cdbs-orig +) + +file( GLOB _incadmin_content RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/incadmin incadmin/* ) +list( REMOVE_ITEM _incadmin_content config.guess.cdbs-orig config.sub.cdbs-orig ) -generate_tar( admin.tar.gz "" admin ) -generate_tar( gnome.tar.gz gnome macros ) -generate_tar( gnome2.tar.gz gnome2 macros ) -generate_tar( gnu.tar.gz gnu AUTHORS COPYING ChangeLog INSTALL NEWS README TODO ) -generate_tar( wxwidgets.tar.gz wx macros ) -generate_tar( incadmin.tar.gz incadmin config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs ) -generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py ) +tde_create_tarball( TARGET admin.tar.gz FILES ${_admin_content} ) +tde_create_tarball( TARGET gnome.tar.gz SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/gnome ) +tde_create_tarball( TARGET gnome2.tar.gz SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/gnome2 ) +tde_create_tarball( TARGET gnu.tar.gz SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/gnu ) +tde_create_tarball( TARGET wxwidgets.tar.gz SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/wx ) +tde_create_tarball( + TARGET incadmin.tar.gz + SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/incadmin + FILES ${_incadmin_content} +) +tde_create_tarball( TARGET scons.tar.gz SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/scons ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/admin.tar.gz -- cgit v1.2.1