Travis OSX: more debugging, and use ampersand to fail early

JokerSync · Apr 10, 2018 · 10b03c0 · 10b03c0
1 parent 1527dfc
commit 10b03c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/common/common.pri b/common/common.pri
@@ -39,7 +39,7 @@ if(equals(PH_GIT_BRANCH, "master") || equals(PH_GIT_BRANCH, "HEAD")) {
 	PH_FULL_VERSION = $$system(git describe --tags --dirty)_$$PH_GIT_BRANCH
 }
 
-message("Version: $${VERSION} build $${BUILD} branch: $${PH_GIT_BRANCH}")
+message("Last tag: $${LAST_TAG}, Version: $${VERSION}, build: $${BUILD}, branch: $${PH_GIT_BRANCH}, revision: $${PH_GIT_REVISION}, full version: $${PH_FULL_VERSION}")
 
 # Define the preprocessor macro to get the application version in our application.
 DEFINES += PH_VERSION=\\\"$$VERSION\\\"

diff --git a/common/deploy.pri b/common/deploy.pri
@@ -11,12 +11,12 @@ win32 {
 mac {
 	app_bundle {
 		# Info.plist
-		QMAKE_POST_LINK += plutil -replace CFBundleIdentifier -string com.phonations.$$lower($${TARGET}) $${TARGET}.app/Contents/Info.plist;
-		QMAKE_POST_LINK += plutil -replace CFBundleVersion -string $${BUILD} $${TARGET}.app/Contents/Info.plist;
-		QMAKE_POST_LINK += plutil -replace CFBundleShortVersionString -string $${VERSION} $${TARGET}.app/Contents/Info.plist;
-		QMAKE_POST_LINK += plutil -replace LSApplicationCategoryType -string public.app-category.video $${TARGET}.app/Contents/Info.plist;
-		QMAKE_POST_LINK += plutil -replace LSMinimumSystemVersion -string 10.8 $${TARGET}.app/Contents/Info.plist;
-		QMAKE_POST_LINK += plutil -replace NSHighResolutionCapable -string True $${TARGET}.app/Contents/Info.plist;
+		QMAKE_POST_LINK += plutil -replace CFBundleIdentifier -string com.phonations.$$lower($${TARGET}) $${TARGET}.app/Contents/Info.plist &&
+		QMAKE_POST_LINK += plutil -replace CFBundleVersion -string $${BUILD} $${TARGET}.app/Contents/Info.plist &&
+		QMAKE_POST_LINK += plutil -replace CFBundleShortVersionString -string $${VERSION} $${TARGET}.app/Contents/Info.plist &&
+		QMAKE_POST_LINK += plutil -replace LSApplicationCategoryType -string public.app-category.video $${TARGET}.app/Contents/Info.plist &&
+		QMAKE_POST_LINK += plutil -replace LSMinimumSystemVersion -string 10.8 $${TARGET}.app/Contents/Info.plist &&
+		QMAKE_POST_LINK += plutil -replace NSHighResolutionCapable -string True $${TARGET}.app/Contents/Info.plist
 
 		# removeapp target
 		removeapp.commands += rm -rf $${TARGET}.app