Merge remote-tracking branch 'origin/osx-bundle' into landing-silo

mea.pro

@@ -42,9 +42,25 @@ wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $
 message("cmd: $${wininstaller.commands}")
 QMAKE_EXTRA_TARGETS += wininstaller
 
+
+# OS X installer bundle
+osxbundle.commands += cd mea && rm -f mea.dmg mea_writable.dmg mea-osx-bundle.dmg || true &&
+osxbundle.commands += hdiutil eject /Volumes/mea || true &&
+osxbundle.commands += macdeployqt mea.app -qmldir=$$top_srcdir/mea/ui -dmg &&
+osxbundle.commands += hdiutil convert mea.dmg -format UDRW -o mea_writable.dmg &&
+osxbundle.commands += hdiutil attach -readwrite -noverify mea_writable.dmg &&
+osxbundle.commands += mkdir /Volumes/mea/.background/ && cp $$top_srcdir/packaging/osx/installer.tiff /Volumes/mea/.background/ &&
+osxbundle.commands += ln -s /Applications /Volumes/mea/Applications &&
+osxbundle.commands += osascript $$top_srcdir/packaging/osx/patchinstaller.sctp &&
+osxbundle.commands += hdiutil eject /Volumes/mea &&
+osxbundle.commands += hdiutil convert mea_writable.dmg -format UDRO -o mea-osx-bundle.dmg &&
+osxbundle.commands += rm mea.dmg mea_writable.dmg
+QMAKE_EXTRA_TARGETS += osxbundle
+
+
+# Translations support
 TRANSLATIONS += $$files(mea/translations/*.ts, true)
 lrelease.commands = lrelease $$_FILE_
 lrelease-qmake_all.commands = lrelease $$_FILE_
 QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets
-
 mea.depends += lrelease

mea/mea.pro

@@ -31,17 +31,27 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
 }
 
 android {
-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android
 
-DISTFILES += \
-    $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
-    $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.jar \
-    $$ANDROID_PACKAGE_SOURCE_DIR/gradlew \
-    $$ANDROID_PACKAGE_SOURCE_DIR/res/values/libs.xml \
-    $$ANDROID_PACKAGE_SOURCE_DIR/build.gradle \
-    $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.properties \
-    $$ANDROID_PACKAGE_SOURCE_DIR/gradlew.bat \
-    $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
+    DISTFILES += \
+        $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
+        $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.jar \
+        $$ANDROID_PACKAGE_SOURCE_DIR/gradlew \
+        $$ANDROID_PACKAGE_SOURCE_DIR/res/values/libs.xml \
+        $$ANDROID_PACKAGE_SOURCE_DIR/build.gradle \
+        $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.properties \
+        $$ANDROID_PACKAGE_SOURCE_DIR/gradlew.bat \
+        $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
+}
+
+macx: {
+    PRODUCT_NAME=mea
+    plist.input = ../packaging/osx/Info.plist.in
+    plist.output = $$OUT_PWD/Info.plist
+    QMAKE_SUBSTITUTES += plist
+    QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
+    OTHER_FILES += ../packaging/osx/Info.plist.in
+    ICON = ../packaging/osx/icon.icns
 }
 
 BR=$$BRANDING
@@ -52,9 +62,5 @@ BR=$$BRANDING
     win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico
 }
 
-withavahi: {
-    LIBS += -lavahi-client -lavahi-common
-}
-
 target.path = /usr/bin
 INSTALLS += target

packaging/osx/Info.plist.in

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>mea</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleIconFile</key>
+        <string>icon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.guh.mea</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>

packaging/osx/patchinstaller.sctp

@@ -0,0 +1,19 @@
+tell app "Finder"
+  tell disk "mea"
+    open
+    set current view of container window to icon view
+    set toolbar visible of container window to false
+    set statusbar visible of container window to false
+    set the bounds of container window to {400, 100, 944, 531}
+    set viewOptions to the icon view options of container window
+    set arrangement of viewOptions to not arranged
+    set icon size of viewOptions to 128
+    set background picture of viewOptions to file ".background:installer.tiff"
+    set position of item "mea.app" of container window to {130, 220}
+    set position of item "Applications" of container window to {412, 220}
+    close
+    open
+    update without registering applications
+    delay 2
+  end tell
+end tell