Merge branch 'master' of github.com:cgutman/moonlight-qt

.travis.yml

@@ -5,8 +5,12 @@ git:
 
 matrix:
   include:
-    - sudo: required
+    - os: osx
+      compiler: clang
+    - os: linux
+      sudo: required
       dist: xenial
+      compiler: gcc
       addons:
         apt:
           sources:
@@ -18,10 +22,19 @@ matrix:
             - libesd0-dev
             - libgl-dev
 
-script:
+install:
-    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then source /opt/qt59/bin/qt59-env.sh; fi
+    - '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt5'
+    - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt5'
     - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_VER=2.0.8 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make && sudo make install && cd ..; fi
-    - if [[ "$CC" == "gcc" ]]; then qmake moonlight-qt.pro -spec linux-g++; fi
+
-    - if [[ "$CC" == "clang" ]]; then qmake moonlight-qt.pro -spec linux-clang; fi
+before_script:
+    - '[ "$TRAVIS_OS_NAME" != "linux" ] || source /opt/qt59/bin/qt59-env.sh'
+    - qmake -v
+    - '[[ "$TRAVIS_OS_NAME" != linux || "$CXX" != clang++ ]] || export QMAKESPEC=linux-clang'
+    - '[[ "$TRAVIS_OS_NAME" != linux || "$CXX" != g++     ]] || export QMAKESPEC=linux-g++'
+    - '[ "$TRAVIS_OS_NAME" != osx ]                          || export QMAKESPEC=macx-clang'
+
+script:
+    - qmake moonlight-qt.pro -spec $QMAKESPEC
     - make debug
     - make release

README.md

@@ -9,6 +9,7 @@ This client is currently still in development (pre-alpha), but the streaming per
 You can follow development on our [Discord server](https://discord.gg/6ERtzFY).
 
  [![Windows AppVeyor Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master)
+ [![Mac and Linux Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-qt.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-qt)
 
 ## Features
  - Hardware accelerated video decoding on Windows, Mac, and Linux

app/Info.plist

@@ -5,22 +5,26 @@
 	<key>CFBundleExecutable</key>
 	<string>Moonlight</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
+	<string>Stream games from your NVIDIA GameStream-enabled PC</string>
 	<key>CFBundleIconFile</key>
-	<string>macos</string>
+	<string>moonlight</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.moonlight-qt</string>
+	<string>com.moonlight-stream.Moonlight</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
+	<key>CFBundleVersion</key>
+	<string>0.0.3</string>
+	<key>CFBundleDisplayName</key>
+	<string>Moonlight</string>
 </dict>
 </plist>

app/app.pro

@@ -185,16 +185,15 @@ unix:!macx: {
 
     INSTALLS += target desktop icons appdata
 }
-
 win32 {
     RC_ICONS = moonlight.ico
 }
-
 macx {
     QMAKE_INFO_PLIST = $$PWD/Info.plist
-    APP_QML_FILES.files = res/macos.icns
+
-    APP_QML_FILES.path = Contents/Resources
+    APP_BUNDLE_RESOURCES.files = moonlight.icns
-    QMAKE_BUNDLE_DATA += APP_QML_FILES
+    APP_BUNDLE_RESOURCES.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES
 }
 
 VERSION = 0.0.3

scripts/generate-dmg.sh

@@ -34,13 +34,18 @@ popd
 
 echo Copying dylib dependencies
 mkdir $BUILD_FOLDER/app/Moonlight.app/Contents/lib
-cp $SOURCE_ROOT/libs/mac/lib/*.dylib $BUILD_FOLDER/app/Moonlight.app/Contents/lib/
+cp $SOURCE_ROOT/libs/mac/lib/*.dylib $BUILD_FOLDER/app/Moonlight.app/Contents/lib/ || fail "Dylib copy failed!"
 
 echo Copying frameworks dependencies
 mkdir $BUILD_FOLDER/app/Moonlight.app/Contents/Frameworks
-cp -R $SOURCE_ROOT/libs/mac/Frameworks/ $BUILD_FOLDER/app/Moonlight.app/Contents/Frameworks/
+cp -R $SOURCE_ROOT/libs/mac/Frameworks/ $BUILD_FOLDER/app/Moonlight.app/Contents/Frameworks/ || fail "Framework copy failed!"
 
 echo Creating DMG
 EXTRA_ARGS=
-if [ "$BUILD_CONFIG" == "Debug" ]; then EXTRA_ARGS=-use-debug-libs; fi
+if [ "$BUILD_CONFIG" == "Debug" ]; then EXTRA_ARGS="$EXTRA_ARGS -use-debug-libs"; fi
-macdeployqt $BUILD_FOLDER/app/Moonlight.app -dmg $EXTRA_ARGS -qmldir=$SOURCE_ROOT/app/gui -appstore-compliant
+if [ "$SIGNING_KEY" != "" ]; then EXTRA_ARGS="$EXTRA_ARGS -codesign=$SIGNING_KEY"; fi
+echo Extra deployment arguments: $EXTRA_ARGS
+macdeployqt $BUILD_FOLDER/app/Moonlight.app -dmg $EXTRA_ARGS -qmldir=$SOURCE_ROOT/app/gui -appstore-compliant || fail "macdeployqt failed!"
+
+echo Deploying DMG
+mv $BUILD_FOLDER/app/Moonlight.dmg $INSTALLER_FOLDER/

scripts/svg2icns

@@ -0,0 +1,27 @@
+#!/bin/bash
+# https://gist.github.com/zlbruce/883605a635df8d5964bab11ed75e46ad
+echo "*** SVG 2 ICNS ***"
+if [ $# -ne 1 ]; then
+    echo "Usage:   svg2icns filename.svg"
+    exit 100
+fi
+filename="$1"
+name=${filename%.*}
+ext=${filename##*.}
+echo "processing: $name"
+dest="$name".iconset
+mkdir "$dest"
+
+convert -background none -resize '!16x16' "$1" "$dest/icon_16x16.png"
+convert -background none -resize '!32x32' "$1" "$dest/icon_16x16@2x.png"
+cp "$dest/icon_16x16@2x.png" "$dest/icon_32x32.png"
+convert -background none -resize '!64x64' "$1" "$dest/icon_32x32@2x.png"
+convert -background none -resize '!128x128' "$1" "$dest/icon_128x128.png"
+convert -background none -resize '!256x256' "$1" "$dest/icon_128x128@2x.png"
+cp "$dest/icon_128x128@2x.png" "$dest/icon_256x256.png"
+convert -background none -resize '!512x512' "$1" "$dest/icon_256x256@2x.png"
+cp "$dest/icon_256x256@2x.png" "$dest/icon_512x512.png"
+convert -background none -resize '!1024x1024' "$1" "$dest/icon_512x512@2x.png"
+
+iconutil -c icns "$dest"
+rm -R "$dest"