浏览代码

Merge pull request #71143 from bruvzg/ios_xcode_info

[iOS] Move name and version information to the Xcode project.
Rémi Verschelde 2 年之前
父节点
当前提交
c551b5bfb8

+ 10 - 2
misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj

@@ -328,7 +328,11 @@
 					"$(PROJECT_DIR)/**",
 					"$(PROJECT_DIR)/**",
 				);
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = $bundle_identifier;
 				PRODUCT_BUNDLE_IDENTIFIER = $bundle_identifier;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				INFOPLIST_KEY_CFBundleDisplayName = "$name";
+				PRODUCT_NAME = "$binary";
+				EXECUTABLE_NAME = "$binary";
+				MARKETING_VERSION = $short_version;
+				CURRENT_PROJECT_VERSION = $version;
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				VALID_ARCHS = "arm64 x86_64";
 				VALID_ARCHS = "arm64 x86_64";
@@ -360,7 +364,11 @@
 					"$(PROJECT_DIR)/**",
 					"$(PROJECT_DIR)/**",
 				);
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = $bundle_identifier;
 				PRODUCT_BUNDLE_IDENTIFIER = $bundle_identifier;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				INFOPLIST_KEY_CFBundleDisplayName = "$name";
+				PRODUCT_NAME = "$binary";
+				EXECUTABLE_NAME = "$binary";
+				MARKETING_VERSION = $short_version;
+				CURRENT_PROJECT_VERSION = $version;
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				VALID_ARCHS = "arm64 x86_64";
 				VALID_ARCHS = "arm64 x86_64";

+ 5 - 5
misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist

@@ -5,9 +5,9 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
 	<key>CFBundleDisplayName</key>
-	<string>$name</string>
+	<string>$(INFOPLIST_KEY_CFBundleDisplayName)</string>
 	<key>CFBundleExecutable</key>
 	<key>CFBundleExecutable</key>
-	<string>$binary</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIcons</key>
 	<key>CFBundleIcons</key>
 	<dict/>
 	<dict/>
 	<key>CFBundleIcons~ipad</key>
 	<key>CFBundleIcons~ipad</key>
@@ -17,15 +17,15 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<key>CFBundleName</key>
-	<string>$name</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>$short_version</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>$signature</string>
 	<string>$signature</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>$version</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<false />
 	<key>LSRequiresIPhoneOS</key>
 	<key>LSRequiresIPhoneOS</key>