From ce58e2bb0793f3d164d2726dc4a108e13ae17e30 Mon Sep 17 00:00:00 2001 From: Lars Sonchocky-Helldorf Date: Thu, 31 Oct 2019 23:35:21 +0100 Subject: [PATCH 1/2] make F-Script compile with Xcode 10.1 --- F-Script 10.10 copy-Info.plist | 109 + F-Script/DemoAssistant.xib | 149 +- F-Script/English.lproj/fs.xib | 3764 +++-------------- F-Script/English.lproj/fs~.xib | 3052 ------------- F-Script/FScriptAppPreference.xib | 750 +--- FSTest1/MainMenu.nib/classes.nib | 4 - FSTest1/MainMenu.nib/designable.nib | 230 + FSTest1/MainMenu.nib/info.nib | 18 - FSTest1/MainMenu.nib/keyedobjects.nib | Bin 0 -> 11214 bytes FSTest1/MainMenu.nib/objects.nib | Bin 5002 -> 0 bytes FScript.xcodeproj/project.pbxproj | 2 +- .../xcschemes/F-Script 10.10.xcscheme | 10 +- .../xcschemes/F-Script 10.7.xcscheme | 10 +- .../xcschemes/F-Script 10.8.xcscheme | 10 +- .../xcschemes/F-Script 10.9.xcscheme | 10 +- FScriptFramework 10.10 copy-Info.plist | 28 + FScriptFramework/ArrayTableView.xib | 22 +- .../FSAttributedStringInspector.xib | 833 +--- FScriptFramework/FSCollectionInspector.xib | 454 +- .../FSCollectionInspectorView.xib | 1293 +----- FScriptFramework/FSConsole.xib | 10 +- FScriptFramework/FSImageInspector.xib | 417 +- .../FSManagedObjectContextInspector.xib | 45 +- FScriptFramework/FSObjectBrowser.xib | 7 +- .../FSObjectBrowserButtonsInspector.xib | 31 +- FScriptFramework/FScriptPreferences.xib | 755 +--- FScriptFramework/blockInspector.xib | 976 +---- .../genObjInspector.nib/designable.nib | 618 +-- .../genObjInspector.nib/keyedobjects.nib | Bin 8650 -> 16770 bytes 29 files changed, 1784 insertions(+), 11823 deletions(-) create mode 100755 F-Script 10.10 copy-Info.plist delete mode 100755 F-Script/English.lproj/fs~.xib delete mode 100755 FSTest1/MainMenu.nib/classes.nib create mode 100644 FSTest1/MainMenu.nib/designable.nib delete mode 100755 FSTest1/MainMenu.nib/info.nib create mode 100644 FSTest1/MainMenu.nib/keyedobjects.nib delete mode 100755 FSTest1/MainMenu.nib/objects.nib create mode 100755 FScriptFramework 10.10 copy-Info.plist mode change 100755 => 100644 FScriptFramework/genObjInspector.nib/designable.nib mode change 100755 => 100644 FScriptFramework/genObjInspector.nib/keyedobjects.nib diff --git a/F-Script 10.10 copy-Info.plist b/F-Script 10.10 copy-Info.plist new file mode 100755 index 0000000..a9898a5 --- /dev/null +++ b/F-Script 10.10 copy-Info.plist @@ -0,0 +1,109 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + F-Script + CFBundleGetInfoString + + CFBundleIconFile + fs.icns + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + F-Script + CFBundlePackageType + APPL + CFBundleShortVersionString + 2.2 + CFBundleSignature + ???? + CFBundleVersion + 2.2 + LSEnvironment + + NSAppleScriptEnabled + YES + NSHumanReadableCopyright + Copyright © 1998-2010 Philippe Mougin. + NSMainNibFile + fs.nib + NSPrincipalClass + NSApplication + NSServices + + + NSMenuItem + + default + F-Script/Execute Selection + + NSMessage + execute + NSPortName + F-Script + NSReturnTypes + + NSStringPboardType + + NSSendTypes + + NSStringPboardType + + + + NSMenuItem + + default + F-Script/View/Put Command + + NSMessage + putCommand + NSPortName + F-Script + NSSendTypes + + NSStringPboardType + + + + NSMenuItem + + default + F-Script/View/Put Command (Ret=execute) + + NSMessage + putCommand + NSPortName + F-Script + NSSendTypes + + NSStringPboardType + + NSUserData + DECOMPOSE + + + NSMenuItem + + default + F-Script/View/Put Command (Ret=newline) + + NSMessage + putCommand + NSPortName + F-Script + NSSendTypes + + NSStringPboardType + + NSUserData + NO_DECOMPOSE + + + + diff --git a/F-Script/DemoAssistant.xib b/F-Script/DemoAssistant.xib index d2fbd7b..f51e741 100755 --- a/F-Script/DemoAssistant.xib +++ b/F-Script/DemoAssistant.xib @@ -1,8 +1,9 @@ - + - - + + + @@ -22,7 +23,7 @@ - + @@ -153,7 +154,7 @@ - + @@ -165,19 +166,21 @@ - + - + - + + + @@ -285,13 +288,12 @@ - - - + @@ -628,14 +636,15 @@ rect := (150<>200 extent:600<>400). - + - + - + + @@ -658,6 +667,7 @@ rect := (150<>200 extent:600<>400). NSBundle loadNibFile:'/Users/pmougin/Desktop/Sample/build/Debug/Sample.app/Contents/Resources/English.lproj/MainMenu.nib' externalNameTable:nil withZone:nil + @@ -666,13 +676,12 @@ NSBundle loadNibFile:'/Users/pmougin/Desktop/Sample/build/Debug/Sample.app/Conte - - - + @@ -692,19 +701,21 @@ NSBundle loadNibFile:'/Users/pmougin/Desktop/Sample/build/Debug/Sample.app/Conte - + - + - + + + @@ -713,13 +724,12 @@ NSBundle loadNibFile:'/Users/pmougin/Desktop/Sample/build/Debug/Sample.app/Conte - -