[macOS export, 3.x] Implements ad-hoc signing on Linux/Windows, adds …

…extra privacy settings, entitlements warnings and error checking.
godotengine · Jan 20, 2022 · 30ee208 · 30ee208
1 parent e3e45de
commit 30ee208
Show file tree

Hide file tree

Showing 12 changed files with 4,105 additions and 99 deletions.
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
@@ -246,12 +246,12 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 				}
 				error += " - " + items[i];
 			}
-
 			export_error->set_text(error);
 			export_error->show();
 		} else {
 			export_error->hide();
 		}
+		export_warning->hide();
 		if (needs_templates) {
 			export_templates_error->show();
 		} else {
@@ -262,6 +262,20 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 		get_ok()->set_disabled(true);
 
 	} else {
+		if (error != String()) {
+			Vector<String> items = error.split("\n", false);
+			error = "";
+			for (int i = 0; i < items.size(); i++) {
+				if (i > 0) {
+					error += "\n";
+				}
+				error += " - " + items[i];
+			}
+			export_warning->set_text(error);
+			export_warning->show();
+		} else {
+			export_warning->hide();
+		}
 		export_error->hide();
 		export_templates_error->hide();
 		export_button->set_disabled(false);
@@ -1144,6 +1158,11 @@ ProjectExportDialog::ProjectExportDialog() {
 	export_error->hide();
 	export_error->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor"));
 
+	export_warning = memnew(Label);
+	main_vb->add_child(export_warning);
+	export_warning->hide();
+	export_warning->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("warning_color", "Editor"));
+
 	export_templates_error = memnew(HBoxContainer);
 	main_vb->add_child(export_templates_error);
 	export_templates_error->hide();

diff --git a/editor/project_export.h b/editor/project_export.h
@@ -99,6 +99,7 @@ class ProjectExportDialog : public ConfirmationDialog {
 	Label *script_key_error;
 
 	Label *export_error;
+	Label *export_warning;
 	HBoxContainer *export_templates_error;
 
 	String default_filename;

diff --git a/misc/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist
@@ -24,10 +24,7 @@
 	<string>$signature</string>
 	<key>CFBundleVersion</key>
 	<string>$version</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>$microphone_usage_description</string>
-	<key>NSCameraUsageDescription</key>
-	<string>$camera_usage_description</string>
+$usage_descriptions
 	<key>NSHumanReadableCopyright</key>
 	<string>$copyright</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -46,6 +43,6 @@
 		<string>10.12</string>
 	</dict>
 	<key>NSHighResolutionCapable</key>
-	$highres
+$highres
 </dict>
 </plist>