From 2ce862ea139e20f1e17065186e42acc21b0f1c76 Mon Sep 17 00:00:00 2001 From: freemountain Date: Sat, 4 Feb 2017 01:05:03 +0100 Subject: [PATCH] clean deploy path --- tools/deploy_linux.sh | 1 + tools/deploy_mac.sh | 6 ++++-- tools/deploy_win.sh | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/deploy_linux.sh b/tools/deploy_linux.sh index 705f7d8..64df33e 100755 --- a/tools/deploy_linux.sh +++ b/tools/deploy_linux.sh @@ -15,6 +15,7 @@ echo "QT: $QT_PATH" DEPLOY_CMD="$PROJECT_PATH/build/tools/linuxdeployqt $TARGET_BIN -no-strip -qmldir=$PROJECT_PATH/src/libquark/qml" pushd . > /dev/null +rm -rf "$DIST_PATH" "$PROJECT_PATH/qbs_wrapper" install --install-root $DIST_PATH -p $TARGET_APP profile:$PROFILE diff --git a/tools/deploy_mac.sh b/tools/deploy_mac.sh index 31aa152..3eacf8e 100755 --- a/tools/deploy_mac.sh +++ b/tools/deploy_mac.sh @@ -5,5 +5,7 @@ PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../" TARGET_APP=$1 QT_PATH="$($PROJECT_PATH/tools/get_qt_path.sh)" -"$PROJECT_PATH/qbs_wrapper" install --install-root $PROJECT_PATH/dist -p $TARGET_APP -$QT_PATH/macdeployqt $PROJECT_PATH/dist/$TARGET_APP.app -qmldir=$PROJECT_PATH/src/libquark/qml +rm -rf "$PROJECT_PATH/dist/mac" + +"$PROJECT_PATH/qbs_wrapper" install --install-root $PROJECT_PATH/dist/mac -p $TARGET_APP +$QT_PATH/macdeployqt $PROJECT_PATH/dist/mac/$TARGET_APP.app -qmldir=$PROJECT_PATH/src/libquark/qml diff --git a/tools/deploy_win.sh b/tools/deploy_win.sh index d97d686..aa11547 100755 --- a/tools/deploy_win.sh +++ b/tools/deploy_win.sh @@ -6,6 +6,7 @@ TARGET_APP=$1 PROFILE=$2 pushd . > /dev/null +rm -rf "$PROJECT_PATH/dist/win" "$PROJECT_PATH/qbs_wrapper" install --install-root "$PROJECT_PATH/dist/win" -p $TARGET_APP profile:$PROFILE cd "$PROJECT_PATH/dist/win"