From 92a7936202106d2e5ff0406cba7db8ba96925f06 Mon Sep 17 00:00:00 2001
From: Andrey Filipenkov <decapitator@ukr.net>
Date: Wed, 10 Mar 2021 10:57:07 +0300
Subject: [PATCH] add Info.plist to sources

---
 CMakeLists.txt                         | 10 ++++-
 client/CMakeLists.txt                  |  2 +
 Info.plist => client/ios/Info.plist.in | 45 ++++++----------------
 configure_ios.sh                       |  2 +-
 package_ios.sh                         |  5 ---
 server/CMakeLists.txt                  |  5 ++-
 server/ios/Info.plist.in               | 52 ++++++++++++++++++++++++++
 server/{main_ios.mm => ios/main.mm}    |  0
 8 files changed, 79 insertions(+), 42 deletions(-)
 rename Info.plist => client/ios/Info.plist.in (60%)
 create mode 100644 server/ios/Info.plist.in
 rename server/{main_ios.mm => ios/main.mm} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0355d928..968f76536 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,18 @@ endif()
 set(VCMI_VERSION_MAJOR 1)
 set(VCMI_VERSION_MINOR 0)
 set(VCMI_VERSION_PATCH 0)
+if(APPLE_IOS)
+	set(APP_SHORT_VERSION "${VCMI_VERSION_MAJOR}.${VCMI_VERSION_MINOR}")
+	if(NOT VCMI_VERSION_PATCH EQUAL 0)
+		string(APPEND APP_SHORT_VERSION ".${VCMI_VERSION_PATCH}")
+	endif()
+endif()
 
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
 option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
-if(NOT APPLE_IOS)
+if(APPLE_IOS)
+	set(BUNDLE_IDENTIFIER_PREFIX "eu.vcmi" CACHE STRING "Bundle identifier prefix")
+else()
 	option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
 endif()
 option(ENABLE_TEST "Enable compilation of unit tests" ON)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 20b19af97..3c031e6ee 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -180,6 +180,8 @@ elseif(APPLE_IOS)
 		"-framework Foundation -framework UIKit -framework QuartzCore -framework CoreGraphics -framework CoreServices -framework ImageIO" # SDL2_image
 	)
 
+	set_target_properties(vcmiclient PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist.in")
+
 	target_sources(vcmiclient PRIVATE ${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard)
 	set_source_files_properties(${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
diff --git a/Info.plist b/client/ios/Info.plist.in
similarity index 60%
rename from Info.plist
rename to client/ios/Info.plist.in
index fd7ef47e7..e50e209ff 100644
--- a/Info.plist
+++ b/client/ios/Info.plist.in
@@ -2,14 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildMachineOSBuild</key>
-	<string>19H524</string>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>vcmiclient</string>
 	<key>CFBundleIdentifier</key>
-	<string>eu.vcmi.client</string>
+	<string>@BUNDLE_IDENTIFIER_PREFIX@.vcmiclient</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,52 +15,33 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>@APP_SHORT_VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>iPhoneOS</string>
-	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>17H22</string>
-	<key>DTPlatformName</key>
-	<string>iphoneos</string>
-	<key>DTPlatformVersion</key>
-	<string>13.7</string>
-	<key>DTSDKBuild</key>
-	<string>17H22</string>
-	<key>DTSDKName</key>
-	<string>iphoneos13.7</string>
-	<key>DTXcode</key>
-	<string>1170</string>
-	<key>DTXcodeBuild</key>
-	<string>11E801a</string>
-	<key>MinimumOSVersion</key>
-	<string>11.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>2</integer>
-	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>arm64</string>
-		<string>metal</string>
+		<string>armv7</string>
+		<string>opengles-2</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
diff --git a/configure_ios.sh b/configure_ios.sh
index 93153f630..f8f8049a6 100755
--- a/configure_ios.sh
+++ b/configure_ios.sh
@@ -6,7 +6,7 @@ sdlLibsDir=~/dev/ios/vcmi-ios-deps/SDL2-lib
 
 srcDir="../vcmi"
 /Users/Shared/xbmc-depends/x86_64-darwin19.6.0-native/bin/cmake "$srcDir" -G Xcode \
-  -DENABLE_LAUNCHER=0 \
+  -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \
   -Wno-dev \
   -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \
   -DPLATFORM=${1:-OS64} \
diff --git a/package_ios.sh b/package_ios.sh
index 5240b74a1..ec3dadf1b 100755
--- a/package_ios.sh
+++ b/package_ios.sh
@@ -25,11 +25,6 @@ done
 mv -f *.dylib Frameworks
 popd
 
-for app in vcmiclient vcmiserver; do
-  cp -f ../vcmi/Info.plist "$productsDir/$app.app"
-done
-sed -i '' -e 's/client/server/g' -e 's/>VCMI</>VCMI server</' "$productsDir/vcmiserver.app/Info.plist"
-
 cp -R bin/Debug-iphoneos/* "$productsDir/vcmiclient.app"
 cp -fR "$productsDir/vcmiclient.app/Frameworks" "$productsDir/vcmiserver.app"
 
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c6eb684e3..2026c0a4f 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -17,7 +17,7 @@ set(server_HEADERS
 )
 
 if(APPLE_IOS)
-	set(server_SRCS ${server_SRCS} main_ios.mm)
+	set(server_SRCS ${server_SRCS} ios/main.mm)
 endif(APPLE_IOS)
 
 assign_source_group(${server_SRCS} ${server_HEADERS})
@@ -47,8 +47,9 @@ if(WIN32)
 			PROJECT_LABEL "VCMI_server"
 	)
 elseif(APPLE_IOS)
+	set_target_properties(vcmiserver PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist.in")
 	# TODO: move to a common dir / add macro?
-	target_sources(vcmiclient PRIVATE ${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard)
+	target_sources(vcmiserver PRIVATE ${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard)
 	set_source_files_properties(${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
diff --git a/server/ios/Info.plist.in b/server/ios/Info.plist.in
new file mode 100644
index 000000000..e80d25667
--- /dev/null
+++ b/server/ios/Info.plist.in
@@ -0,0 +1,52 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>vcmiserver</string>
+	<key>CFBundleIdentifier</key>
+	<string>@BUNDLE_IDENTIFIER_PREFIX@.vcmiserver</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>VCMI server</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@APP_SHORT_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+</dict>
+</plist>
diff --git a/server/main_ios.mm b/server/ios/main.mm
similarity index 100%
rename from server/main_ios.mm
rename to server/ios/main.mm