cross compile for windows #4

.travis.yml

@@ -13,7 +13,6 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" |sudo tee --append /etc/apt/sources.list; fi
 
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then MXE_PREFIX="mxe-i686-w64-mingw32.static"; sudo apt-get -y --force-yes install $MXE_PREFIX-qtdeclarative $MXE_PREFIX-qtquickcontrols $MXE_PREFIX-qtquickcontrols2 $MXE_PREFIX-qtgraphicaleffects $MXE_PREFIX-qttools $MXE_PREFIX-qtsvg; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install qt58declarative qt58quickcontrols qt58quickcontrols2 qt58graphicaleffects qt58tools qt58svg mesa-common-dev libglu1-mesa-dev qt58qbs gcc-5 g++-5 nodejs; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=/opt/qt58/bin:$PATH; fi
 
@@ -36,16 +35,24 @@ before_install:
 
 script:
   - ./configure
-  - qbs build
-  - qbs build profile:qt5-mxe
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./tools/deploy_linux.sh QuarkGui; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./tools/deploy_win.sh QuarkGui qt5-mxe; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./tools/deploy_linux.sh QuarkGui qt5; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/deploy_mac.sh QuarkGui && cd dist && 7z a quark-osx-x64.7z QuarkGui.app; fi
   - ls .
 deploy:
   - provider: releases
     api_key:
       secure: IckXTW+tOTID4xV9tc1arkNlJPNA7gUfziDbWyjuqxgmIdrMJthpT6BSzhaCb3+yFqXDDuNn73li4SJz0Xy6jvQXLK+Jgsl3iyOButiyq7X61bxeA0fd9Kc5Y3P7lVQbYPvaczIRT0NOBPwmRjPZr1bvIESS/jnVvBF0uM+jIilJAMDYVBcSr0jZz0JJLs9eBTBZiH6lH1FD1NWhBpYpYA0P39O39nofZOGvZRdRgZ97pxBRGhVhjy5LwysDnza78ik92lQSBb1PcItM4wm9gt6eEBjgvP/rfl5JHn0ST5226Me98Ppq88hJ5sCZRXdmWg30CJ4WrTg/NCEp/bZXx8m2iKSA0QCei9Et8nnlSSYzrMGfTCvGbFLKWb027rcNsbohkfUTV8BKooPPSx/24t3lN6J3baYLD4ilDwkBAGouKti4+qLkT5BipxTOeBIW6Ot/SW7kv7ivnqrLsCzNHrtlqawURmaOSot4Noz0j4ZyuH1jbML3NsqNBCWZDsTsnLCkXYz05zPF+xtXxIUR8X6SKILWMp531aIhU/hhOcl8ajBp4ri+JQwTIqqXfkBidzfTI+d94EWukDclEa4YDqAO8FLLVv1cIwZH3PrqWH8dRrOxdUZTB+dTohJkkwufoMAvy83AoE1T3gpdd8JNdRJP+h6jC3HTCQLFw3gmkpA=
-    file: /home/travis/build/freemountain/quark/dist/Quark-x86_64.AppImage
+    file: /home/travis/build/freemountain/quark/dist/win/quark-win.zip
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: freemountain/quark
+      condition: $TRAVIS_OS_NAME = linux
+  - provider: releases
+    api_key:
+      secure: IckXTW+tOTID4xV9tc1arkNlJPNA7gUfziDbWyjuqxgmIdrMJthpT6BSzhaCb3+yFqXDDuNn73li4SJz0Xy6jvQXLK+Jgsl3iyOButiyq7X61bxeA0fd9Kc5Y3P7lVQbYPvaczIRT0NOBPwmRjPZr1bvIESS/jnVvBF0uM+jIilJAMDYVBcSr0jZz0JJLs9eBTBZiH6lH1FD1NWhBpYpYA0P39O39nofZOGvZRdRgZ97pxBRGhVhjy5LwysDnza78ik92lQSBb1PcItM4wm9gt6eEBjgvP/rfl5JHn0ST5226Me98Ppq88hJ5sCZRXdmWg30CJ4WrTg/NCEp/bZXx8m2iKSA0QCei9Et8nnlSSYzrMGfTCvGbFLKWb027rcNsbohkfUTV8BKooPPSx/24t3lN6J3baYLD4ilDwkBAGouKti4+qLkT5BipxTOeBIW6Ot/SW7kv7ivnqrLsCzNHrtlqawURmaOSot4Noz0j4ZyuH1jbML3NsqNBCWZDsTsnLCkXYz05zPF+xtXxIUR8X6SKILWMp531aIhU/hhOcl8ajBp4ri+JQwTIqqXfkBidzfTI+d94EWukDclEa4YDqAO8FLLVv1cIwZH3PrqWH8dRrOxdUZTB+dTohJkkwufoMAvy83AoE1T3gpdd8JNdRJP+h6jC3HTCQLFw3gmkpA=
+    file: /home/travis/build/freemountain/quark/dist/linux/Quark-x86_64.AppImage
     skip_cleanup: true
     on:
       tags: true

tools/deploy_linux.sh

@@ -1,19 +1,23 @@
 #!/bin/bash
+set -e
 
 PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
 
 TARGET_APP=$1
-TARGET_PATH="$PROJECT_PATH/dist/$TARGET_APP"
+PROFILE=$2
+
+DIST_PATH="$PROJECT_PATH/dist/linux"
+TARGET_PATH="$DIST_PATH/$TARGET_APP"
 TARGET_BIN="$TARGET_PATH/$TARGET_APP"
 
-QT_PATH="$($PROJECT_PATH/tools/get_qt_path.sh)"
+QT_PATH="$($PROJECT_PATH/tools/get_qt_path.sh $PROFILE)"
 echo "QT: $QT_PATH"
-DEPLOY_CMD="$PROJECT_PATH/build/tools/linuxdeployqt $TARGET_BIN -no-strip -verbose=2 -qmldir=$PROJECT_PATH/src/libquark/qml"
+DEPLOY_CMD="$PROJECT_PATH/build/tools/linuxdeployqt $TARGET_BIN -no-strip -qmldir=$PROJECT_PATH/src/libquark/qml"
 
 pushd . > /dev/null
 
-"$PROJECT_PATH/qbs_wrapper" install --install-root $PROJECT_PATH/dist -p $TARGET_APP
-echo "HELLOOO $TARGET_PATH"
+"$PROJECT_PATH/qbs_wrapper" install --install-root $DIST_PATH -p $TARGET_APP profile:$PROFILE
+
 cat << EOF > "$TARGET_PATH/quark.desktop"
 [Desktop Entry]
 Type=Application
@@ -24,10 +28,10 @@ Comment=Edit this default file
 Terminal=true
 EOF
 
-cp quark.svg dist/$TARGET_APP/quark.svg
+cp quark.svg "$TARGET_PATH/quark.svg"
 
 PATH="$QT_PATH:$PATH"
-cd "$PROJECT_PATH/dist"
+cd "$DIST_PATH"
 $DEPLOY_CMD
 $DEPLOY_CMD -appimage
 

tools/deploy_mac.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
 TARGET_APP=$1

tools/deploy_win.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
+TARGET_APP=$1
+PROFILE=$2
+
+pushd . > /dev/null
+
+"$PROJECT_PATH/qbs_wrapper" install --install-root "$PROJECT_PATH/dist/win" -p $TARGET_APP profile:$PROFILE
+cd "$PROJECT_PATH/dist/win"
+zip -r quark-win.zip QuarkGui
+popd > /dev/null