summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-10-25 09:12:16 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-25 09:14:03 +0300
commit421a605a863ee840127180ab02264b3d9d04c846 (patch)
treec23fc63e7fcd9a0490a1aa4da7fefa29313fc9fc /tools
parent986060cbcfd51c332c5832219147c3aff8f2141d (diff)
Work around git archive bug by explicitly deleting tests and tools
Change-Id: I85ab290f5da1b866bbbaa888c1d5371c8e935174 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/generate_package_linux.sh8
1 files changed, 7 insertions, 1 deletions
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