From f4bf35b4b55f95956af5834bffe98fc916bbe092 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 6 Jun 2018 15:39:08 +0200 Subject: [PATCH 01/14] workaround a bug in lrelease, it fails to parse the .pro file --- mea.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mea.pro b/mea.pro index b2687ea0..ad60e239 100644 --- a/mea.pro +++ b/mea.pro @@ -59,8 +59,8 @@ QMAKE_EXTRA_TARGETS += osxbundle # Translations support -TRANSLATIONS += $$files(mea/translations/*.ts, true) -lrelease.commands = lrelease $$_FILE_ -lrelease-qmake_all.commands = lrelease $$_FILE_ +TRANSLATIONS += $$files($$absolute_path(mea)/translations/*.ts, true) +lrelease.commands = lrelease $$TRANSLATIONS +lrelease-qmake_all.commands = lrelease $$TRANSLATIONS QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets mea.depends += lrelease From c62f34fd53a8049d5c0fe75a7b0ab497b46a3683 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 6 Jun 2018 17:38:12 +0200 Subject: [PATCH 02/14] add ios package template --- mea/mea.pro | 7 +++++++ packaging/ios/Info.plist.in | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 packaging/ios/Info.plist.in diff --git a/mea/mea.pro b/mea/mea.pro index afc223ff..9d829a83 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -54,6 +54,13 @@ macx: { ICON = ../packaging/osx/icon.icns } +ios: { + plist.input = ../packaging/ios/Info.plist.in + plist.output = $$OUT_PWD/Info.plist + QMAKE_SUBSTITUTES += plist + QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist +} + BR=$$BRANDING !equals(BR, "") { DEFINES += BRANDING=\\\"$${BR}\\\" diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in new file mode 100644 index 00000000..c9265af5 --- /dev/null +++ b/packaging/ios/Info.plist.in @@ -0,0 +1,41 @@ + + + + + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleGetInfoString + Created by Qt/QMake + CFBundleIconFile + ${ASSETCATALOG_COMPILER_APPICON_NAME} + CFBundleIdentifier + io.guh.${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + ${QMAKE_SHORT_VERSION} + CFBundleSignature + ${QMAKE_PKGINFO_TYPEINFO} + CFBundleVersion + ${QMAKE_FULL_VERSION} + LSRequiresIPhoneOS + + MinimumOSVersion + ${IPHONEOS_DEPLOYMENT_TARGET} + NOTE + This file was generated by Qt/QMake. + UILaunchStoryboardName + LaunchScreen + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + From ed6d0f76a65227311bf74638d16b1f7a5fa7aca4 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 6 Jun 2018 19:28:54 +0200 Subject: [PATCH 03/14] add info.plis.in to other files --- mea/mea.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mea/mea.pro b/mea/mea.pro index 9d829a83..b8b15a72 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -59,6 +59,7 @@ ios: { plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist + OTHER_FILES += ../packaging/ios/Info.plist.in } BR=$$BRANDING @@ -69,5 +70,6 @@ BR=$$BRANDING win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico } + target.path = /usr/bin INSTALLS += target From 5e90b7013c93e1f26972b59f72d6ec6220674f56 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 6 Jun 2018 21:58:36 +0200 Subject: [PATCH 04/14] add scheme file --- packaging/ios/mea.xcscheme | 116 +++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 packaging/ios/mea.xcscheme diff --git a/packaging/ios/mea.xcscheme b/packaging/ios/mea.xcscheme new file mode 100644 index 00000000..123c71a3 --- /dev/null +++ b/packaging/ios/mea.xcscheme @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 52a922d862eae951ebdd3e2709995e1fbf953c46 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 7 Jun 2018 12:56:03 +0200 Subject: [PATCH 05/14] try to use our own plist again --- mea/mea.pro | 13 +++++++++++++ packaging/ios/Info.plist.in | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mea/mea.pro b/mea/mea.pro index b8b15a72..da9450f5 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -44,6 +44,18 @@ android { $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE } +BR=$$BRANDING +!equals(BR, "") { + DEFINES += BRANDING=\\\"$${BR}\\\" + win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico +} else { + win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico +} + +withavahi: { + LIBS += -lavahi-client -lavahi-common +} + macx: { PRODUCT_NAME=mea plist.input = ../packaging/osx/Info.plist.in @@ -55,6 +67,7 @@ macx: { } ios: { + QMAKE_TARGET_BUNDLE_PREFIX = "io.guh" plist.input = ../packaging/ios/Info.plist.in plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index c9265af5..95f2a07a 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - io.guh.${PRODUCT_BUNDLE_IDENTIFIER} + @BUNDLEIDENTIFIER@ CFBundleName ${PRODUCT_NAME} CFBundlePackageType From 3cd923a87fe1e9e551faceac6de9295bf7b97dff Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 7 Jun 2018 13:00:28 +0200 Subject: [PATCH 06/14] set more stuff --- mea/mea.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mea/mea.pro b/mea/mea.pro index da9450f5..79d27b77 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -67,7 +67,9 @@ macx: { } ios: { - QMAKE_TARGET_BUNDLE_PREFIX = "io.guh" + message("iOS build") + QMAKE_TARGET_BUNDLE_PREFIX = io.guh + QMAKE_BUNDLE = mea plist.input = ../packaging/ios/Info.plist.in plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist From 8632dd5c5a2718eaaf17a2e71972ac791e447b0f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 7 Jun 2018 13:32:04 +0200 Subject: [PATCH 07/14] try with our settings, but default Info.plist --- mea/mea.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mea/mea.pro b/mea/mea.pro index 79d27b77..6499b9bb 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -70,11 +70,11 @@ ios: { message("iOS build") QMAKE_TARGET_BUNDLE_PREFIX = io.guh QMAKE_BUNDLE = mea - plist.input = ../packaging/ios/Info.plist.in - plist.output = $$OUT_PWD/Info.plist - QMAKE_SUBSTITUTES += plist - QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist - OTHER_FILES += ../packaging/ios/Info.plist.in +# plist.input = ../packaging/ios/Info.plist.in +# plist.output = $$OUT_PWD/Info.plist +# QMAKE_SUBSTITUTES += plist +# QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist +# OTHER_FILES += ../packaging/ios/Info.plist.in } BR=$$BRANDING From 8fe83b49360c918e883298c19748d0c916e229b4 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 7 Jun 2018 14:02:14 +0200 Subject: [PATCH 08/14] try workaoround --- mea/mea.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mea/mea.pro b/mea/mea.pro index 6499b9bb..a598a1be 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -70,6 +70,8 @@ ios: { message("iOS build") QMAKE_TARGET_BUNDLE_PREFIX = io.guh QMAKE_BUNDLE = mea + # Configure generated xcode project to have our bundle id + xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} # plist.input = ../packaging/ios/Info.plist.in # plist.output = $$OUT_PWD/Info.plist # QMAKE_SUBSTITUTES += plist From 29cf163f9ee20495810f1fd5c55cb2324b7841f2 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 8 Jun 2018 12:17:48 +0200 Subject: [PATCH 09/14] drop some unused stuff --- mea/mea.pro | 13 ----- packaging/ios/mea.xcscheme | 116 ------------------------------------- 2 files changed, 129 deletions(-) delete mode 100644 packaging/ios/mea.xcscheme diff --git a/mea/mea.pro b/mea/mea.pro index a598a1be..f08951f9 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -44,18 +44,6 @@ android { $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE } -BR=$$BRANDING -!equals(BR, "") { - DEFINES += BRANDING=\\\"$${BR}\\\" - win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico -} else { - win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico -} - -withavahi: { - LIBS += -lavahi-client -lavahi-common -} - macx: { PRODUCT_NAME=mea plist.input = ../packaging/osx/Info.plist.in @@ -87,6 +75,5 @@ BR=$$BRANDING win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico } - target.path = /usr/bin INSTALLS += target diff --git a/packaging/ios/mea.xcscheme b/packaging/ios/mea.xcscheme deleted file mode 100644 index 123c71a3..00000000 --- a/packaging/ios/mea.xcscheme +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1dae24e184145ac384be71e1ff5bceb7b4b4fd63 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 13 Jun 2018 22:24:44 +0200 Subject: [PATCH 10/14] hardcode bundleversion --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 95f2a07a..2ec97282 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -21,7 +21,7 @@ CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - ${QMAKE_FULL_VERSION} + 1 LSRequiresIPhoneOS MinimumOSVersion From bd8c4627e015e32feaa54cde95d7516e7118dbff Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 13 Jun 2018 22:27:27 +0200 Subject: [PATCH 11/14] also hardcode shortversion --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 2ec97282..fd6f1c0e 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - ${QMAKE_SHORT_VERSION} + 1.0.2 CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion From 52c7bf2e989c88fd50d8aa7039bbdd2b89d8c4fb Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 13 Jun 2018 23:12:30 +0200 Subject: [PATCH 12/14] reenable plist substitution --- mea/mea.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mea/mea.pro b/mea/mea.pro index f08951f9..03ce7ec2 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -60,11 +60,11 @@ ios: { QMAKE_BUNDLE = mea # Configure generated xcode project to have our bundle id xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} -# plist.input = ../packaging/ios/Info.plist.in -# plist.output = $$OUT_PWD/Info.plist -# QMAKE_SUBSTITUTES += plist -# QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist -# OTHER_FILES += ../packaging/ios/Info.plist.in + plist.input = ../packaging/ios/Info.plist.in + plist.output = $$OUT_PWD/Info.plist + QMAKE_SUBSTITUTES += plist + QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist + OTHER_FILES += ../packaging/ios/Info.plist.in } BR=$$BRANDING From dd42762d807a7d469283437d94a4f0a0e9d12ff3 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 13 Jun 2018 23:30:58 +0200 Subject: [PATCH 13/14] also fill in other stuff --- packaging/ios/Info.plist.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index fd6f1c0e..95b22cf2 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -3,17 +3,17 @@ CFBundleDisplayName - ${PRODUCT_NAME} + mea CFBundleExecutable - ${EXECUTABLE_NAME} + mea CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - @BUNDLEIDENTIFIER@ + io.guh.mea CFBundleName - ${PRODUCT_NAME} + mea CFBundlePackageType APPL CFBundleShortVersionString @@ -25,7 +25,7 @@ LSRequiresIPhoneOS MinimumOSVersion - ${IPHONEOS_DEPLOYMENT_TARGET} + 10 NOTE This file was generated by Qt/QMake. UILaunchStoryboardName From d7cee301be295833b7118ae5cd846d2140861daf Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 14 Jun 2018 02:45:09 +0200 Subject: [PATCH 14/14] try to substitute teh version --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 95b22cf2..95107be6 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.2 + $$MEA_VERSION CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion