[Scummvm-git-logs] scummvm master -> b33746e37fc1338a536c128a4904bf7f4fd69a34

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b33746e37f IOS7: Fix building with Xcode


Commit: b33746e37fc1338a536c128a4904bf7f4fd69a34
    https://github.com/scummvm/scummvm/commit/b33746e37fc1338a536c128a4904bf7f4fd69a34
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-12T21:27:30+01:00

Commit Message:
IOS7: Fix building with Xcode

This partially revert commit 0ff00cca2a and should hopefully
fix bug #12647.

The issue is that the executable name in the Info.plist did not
match the name of the executable generated by Xcode (ScummVM vs
scummvm). I changed it back to $(EXECUTABLE_NAME), which is
automatically replaced by Xcode, and added a sed command to the
make target to replace it with the actual executable name (as
we did with the $(PRODUCT_BUNDLE_IDENTIFIER) already).

An alternative would be to hardcode the name to "scummvm" in the
Info.plist and change the iphonebundle and ios7bundle target to
also use all lower case scummvm when copying the executable.

Changed paths:
    dists/ios7/Info.plist
    dists/ios7/Info.plist.in
    ports.mk


diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist
index c08fcbb0b6..fe4df7543b 100644
--- a/dists/ios7/Info.plist
+++ b/dists/ios7/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>ScummVM</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIcons</key>
 	<dict/>
 	<key>CFBundleIcons~ipad</key>
diff --git a/dists/ios7/Info.plist.in b/dists/ios7/Info.plist.in
index 6b42c4ced7..161893071b 100644
--- a/dists/ios7/Info.plist.in
+++ b/dists/ios7/Info.plist.in
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>ScummVM</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIcons</key>
 	<dict/>
 	<key>CFBundleIcons~ipad</key>
diff --git a/ports.mk b/ports.mk
index 693440396d..27b00768b2 100644
--- a/ports.mk
+++ b/ports.mk
@@ -177,6 +177,8 @@ endif
 iphonebundle: iphone
 	mkdir -p $(bundle_name)
 	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
+	sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
+	sed -i'' -e 's/$$(EXECUTABLE_NAME)/ScummVM/' $(bundle_name)/Info.plist
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/
 ifdef DIST_FILES_NETWORKING
@@ -291,6 +293,7 @@ ios7bundle: iphone
 		s==0 {print $$0}\
 		s > 0 { s-- }' $(srcdir)/dists/ios7/Info.plist >$(bundle_name)/Info.plist
 	sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
+	sed -i'' -e 's/$$(EXECUTABLE_NAME)/ScummVM/' $(bundle_name)/Info.plist
 	sed -i'' -e '/UILaunchStoryboardName/{N;d;}' $(bundle_name)/Info.plist
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/