From ca303129ab9b7005c5f69f9aa9d10934c9dc2f5f Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Mar 07 2016 15:26:15 +0000 Subject: Create source tarball when and after creating distribution tarball. --- diff --git a/build.sh b/build.sh index b08a338..d19fab4 100755 --- a/build.sh +++ b/build.sh @@ -110,9 +110,15 @@ if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ] \ tar -cJpf ${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz\ $(find_with_no_paths "${TARBALL_EXCLUDE_PATHS} native/lib.bak" . \ -mindepth 1 -maxdepth 2 -type d -not -path ./native); + log_msg info "Finished building distribution tarball."; rm -rf ${PREFIX_BASENAME}/lib; mv ${PREFIX_BASENAME}/lib.bak ${PREFIX_BASENAME}/lib; + log_msg info "Restored ${PREFIX_BASENAME}/lib."; + log_msg info "Building source tarball..."; + tar -cJpf ${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz\ + $(find tmp -mindepth 1 -maxdepth 1 -type d \ + \( -name \*-native-\* -or -name \*-cross-\* \)); + log_msg info "Finished building source tarball."; cd ${OLDPWD}; - log_msg info "Finished building distribution tarball."; update_build_status tarball_finish; fi; update_build_status finish; clean_build_status; diff --git a/build.vars b/build.vars index 6cb0a5f..35039c1 100644 --- a/build.vars +++ b/build.vars @@ -27,6 +27,7 @@ : ${LOG_MSG_WARN_COLOUR:=96}; : ${MAKEFLAGS_DEFAULT:=-j8}; : ${TARBALL_FNAME_PREFIX:=midipix.}; +: ${TARBALL_SRC_FNAME_PREFIX:=midipix-src.}; : ${TARBALL_EXCLUDE_PATHS:="src tmp"}; : ${TARGET:=x86_64-nt64-midipix}; : ${PREFIX_NATIVE:=${PREFIX}/native};