Merge pull request #7586 from livecodeian/bugfix-22791

livecodepanos · web-flow · commit 8627bf84178f · 2021-06-30T10:46:15.000+03:00
[[ Bug 22791 ]] Fix error signing Mac standalones when app name contains accents
diff --git a/docs/notes/bugfix-22791.md b/docs/notes/bugfix-22791.md
@@ -0,0 +1 @@
+# Fix codesigning error saving Mac standalone app when the app name contains accented characters
diff --git a/engine/rsrc/Installer-Info.plist b/engine/rsrc/Installer-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
diff --git a/engine/rsrc/LiveCode-Info.plist b/engine/rsrc/LiveCode-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
diff --git a/engine/rsrc/Standalone-Info.plist b/engine/rsrc/Standalone-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -672,7 +672,7 @@ command revSaveAsMacStandalone pStack, pRestoreFileName, pFolder, @xStandalonePa
    put sStandaloneSettingsA into tStandaloneSettingsA
    repeat for each key tTarget in sPlatformDirectoriesA["MacOSX"]
       put sPlatformDirectoriesA["MacOSX"][tTarget] into tTargetDir
-      put tTargetDir & sStandaloneSettingsA["name"] & ".app/Contents/MacOS/" into tDirectory
+      put tTargetDir & normalizeForDisk(sStandaloneSettingsA["name"]) & ".app/Contents/MacOS/" into tDirectory
       
       -- Ensure standalone settings script local is reset when building for subsequent targets
       put tStandaloneSettingsA into sStandaloneSettingsA
@@ -697,7 +697,7 @@ command revSaveAsMacStandalone pStack, pRestoreFileName, pFolder, @xStandalonePa
                & return & tEngineSourceFile
       end if
       
-      put tDirectory & sStandaloneSettingsA["name"] into tStandalonePath
+      put tDirectory & normalizeForDisk(sStandaloneSettingsA["name"]) into tStandalonePath
       
       put tStandalonePath into xStandalonePaths[tTarget]
       
@@ -1783,9 +1783,18 @@ end revSetMacOS
 --    plists as Mavericks doesn't like it!
 private function escapeForXml pString
    replace "&" with "&amp;" in pString
-   return pString
+   return normalizeText(pString, "NFD")
 end escapeForXml
 
+private function normalizeForDisk pString
+   if the platform is "MacOS" then
+      // Composed unicode chars can cause problems with codesign so we normalize them to NFD form
+      return normalizeText(pString, "NFD")
+   else
+      return pString
+   end if
+end normalizeForDisk
+
 #####################################################################
 # revSetStackProps is a combination of revRemoveProps and revSetProfiles
 # There's no point walking every object in the distribution twice

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix codesigning error saving Mac standalone app when the app name contains accented characters`