From 421a605a863ee840127180ab02264b3d9d04c846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 25 Oct 2013 09:12:16 +0300 Subject: Work around git archive bug by explicitly deleting tests and tools Change-Id: I85ab290f5da1b866bbbaa888c1d5371c8e935174 Reviewed-by: Miikka Heikkinen --- tools/generate_package_linux.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tools/generate_package_linux.sh') diff --git a/tools/generate_package_linux.sh b/tools/generate_package_linux.sh index 6a596d35..97aff841 100755 --- a/tools/generate_package_linux.sh +++ b/tools/generate_package_linux.sh @@ -13,7 +13,7 @@ fi if [ "$2" = "" ] then - DATAVIS_BRANCH=master + DATAVIS_BRANCH=origin/master else DATAVIS_BRANCH=$2 fi @@ -30,6 +30,7 @@ DATAVIS_FINAL_TAR=$DATAVIS_CURRENT_DIR/../qtdatavisualization_$DATAVIS_VERSION.t echo Exporting $DATAVIS_BRANCH to $DATAVIS_TEMP_TAR_FULL... rm -r -f $DATAVIS_TEMP_DIR_FULL 2> /dev/null mkdir -p $DATAVIS_TEMP_DIR_FULL 2> /dev/null +git fetch git archive --format tar --output $DATAVIS_TEMP_TAR_FULL $DATAVIS_BRANCH echo Unpacking $DATAVIS_TEMP_TAR_FULL to $DATAVIS_PACKAGE_UNTAR_DIR and $DATAVIS_BUILD_DIR... @@ -37,6 +38,11 @@ mkdir -p $DATAVIS_PACKAGE_UNTAR_DIR 2> /dev/null mkdir -p $DATAVIS_BUILD_DIR 2> /dev/null tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_PACKAGE_UNTAR_DIR > /dev/null tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_BUILD_DIR > /dev/null +#Workaround for git archive bug +rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tools +rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tests +rm -r -f $DATAVIS_BUILD_DIR/tools +rm -r -f $DATAVIS_BUILD_DIR/tests echo Generating includes, mkspecs, and docs in $DATAVIS_BUILD_DIR... cd $DATAVIS_BUILD_DIR -- cgit v1.2.3