Skip to content

Commit

Permalink
Update project to Xcode 13.1 recommendations.
Browse files Browse the repository at this point in the history 
Fix lex error "gm4:stdin:1743: ERROR: end of file in string" when
building `cat2html.l` by replacing line comment (`//`) with block
comment (`/* ... */`) since lex doesn't understand line comments and
tries to parse the comment.
  • Loading branch information
@donmccaughey
donmccaughey committed Dec 8, 2021
1 parent df13a06 commit 007b3bb
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 62 deletions.
43 changes: 26 additions & 17 deletions ManOpen.xcodeproj/project.pbxproj
View file
Expand Up @@ -206,13 +206,6 @@
D48A125A20300CC300EC13E5 /* NSString+ManOpenTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+ManOpenTests.m"; sourceTree = "<group>"; };
D49FB8BA1F9C1EDC00ECE338 /* AproposDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AproposDocument.h; sourceTree = "<group>"; };
D49FB8BB1F9C1EDC00ECE338 /* AproposDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AproposDocument.m; sourceTree = "<group>"; };
D49FB8BD1F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Apropos.xib; sourceTree = "<group>"; };
D49FB8BF1F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
D49FB8C11F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DocController.xib; sourceTree = "<group>"; };
D49FB8C31F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D49FB8C51F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ManOpen.xib; sourceTree = "<group>"; };
D49FB8C71F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ManPage.xib; sourceTree = "<group>"; };
D49FB8C91F9C1EDC00ECE338 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PrefPanel.xib; sourceTree = "<group>"; };
D49FB8CA1F9C1EDC00ECE338 /* helpQMark.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = helpQMark.tiff; sourceTree = "<group>"; };
D49FB8CB1F9C1EDC00ECE338 /* Info-ManOpen.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-ManOpen.plist"; sourceTree = "<group>"; };
D49FB8CC1F9C1EDC00ECE338 /* LinkCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = LinkCursor.tiff; sourceTree = "<group>"; };
Expand All @@ -236,6 +229,13 @@
D4D1246A1FF20C8E00314FBD /* NSDictionary+ManOpen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+ManOpen.h"; sourceTree = "<group>"; };
D4D1246B1FF20C8E00314FBD /* NSDictionary+ManOpen.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ManOpen.m"; sourceTree = "<group>"; };
D4D1246D1FF20CD700314FBD /* NSDictionary+ManOpenTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ManOpenTests.m"; sourceTree = "<group>"; };
D4DAF8E7276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Apropos.xib; sourceTree = "<group>"; };
D4DAF8E8276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DocController.xib; sourceTree = "<group>"; };
D4DAF8E9276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ManOpen.xib; sourceTree = "<group>"; };
D4DAF8EA276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ManPage.xib; sourceTree = "<group>"; };
D4DAF8EB276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/PrefPanel.xib; sourceTree = "<group>"; };
D4DAF8EC276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
D4DAF8ED276132DE00A8D6BA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -581,7 +581,7 @@
D39279890821FFA400376676 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1310;
TargetAttributes = {
D420E6A620338A6D00178C47 = {
CreatedOnToolsVersion = 9.2;
Expand All @@ -606,7 +606,7 @@
);
knownRegions = (
en,
English,
Base,
);
mainGroup = D39278DB0821FF9D00376676 /* ManOpen */;
productRefGroup = D39278ED0821FFA400376676 /* Products */;
Expand Down Expand Up @@ -785,55 +785,55 @@
D49FB8BC1F9C1EDC00ECE338 /* Apropos.xib */ = {
isa = PBXVariantGroup;
children = (
D49FB8BD1F9C1EDC00ECE338 /* English */,
D4DAF8E7276132DE00A8D6BA /* en */,
);
name = Apropos.xib;
sourceTree = "<group>";
};
D49FB8BE1F9C1EDC00ECE338 /* Credits.rtf */ = {
isa = PBXVariantGroup;
children = (
D49FB8BF1F9C1EDC00ECE338 /* English */,
D4DAF8EC276132DE00A8D6BA /* en */,
);
name = Credits.rtf;
sourceTree = "<group>";
};
D49FB8C01F9C1EDC00ECE338 /* DocController.xib */ = {
isa = PBXVariantGroup;
children = (
D49FB8C11F9C1EDC00ECE338 /* English */,
D4DAF8E8276132DE00A8D6BA /* en */,
);
name = DocController.xib;
sourceTree = "<group>";
};
D49FB8C21F9C1EDC00ECE338 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
D49FB8C31F9C1EDC00ECE338 /* English */,
D4DAF8ED276132DE00A8D6BA /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
D49FB8C41F9C1EDC00ECE338 /* ManOpen.xib */ = {
isa = PBXVariantGroup;
children = (
D49FB8C51F9C1EDC00ECE338 /* English */,
D4DAF8E9276132DE00A8D6BA /* en */,
);
name = ManOpen.xib;
sourceTree = "<group>";
};
D49FB8C61F9C1EDC00ECE338 /* ManPage.xib */ = {
isa = PBXVariantGroup;
children = (
D49FB8C71F9C1EDC00ECE338 /* English */,
D4DAF8EA276132DE00A8D6BA /* en */,
);
name = ManPage.xib;
sourceTree = "<group>";
};
D49FB8C81F9C1EDC00ECE338 /* PrefPanel.xib */ = {
isa = PBXVariantGroup;
children = (
D49FB8C91F9C1EDC00ECE338 /* English */,
D4DAF8EB276132DE00A8D6BA /* en */,
);
name = PrefPanel.xib;
sourceTree = "<group>";
Expand Down Expand Up @@ -862,6 +862,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -908,6 +909,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -932,7 +934,7 @@
D38A242A14E4C3FE00F6AFFE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = K39VF43BJL;
INFOPLIST_FILE = "ManOpen/Info-ManOpen.plist";
Expand All @@ -950,6 +952,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = K39VF43BJL;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "ManOpen/Info-ManOpen.plist";
INSTALL_PATH = "$(HOME)/Apps";
PRODUCT_BUNDLE_IDENTIFIER = cc.donm.ManOpen;
Expand All @@ -962,41 +965,47 @@
D38A243614E4C3FE00F6AFFE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = cat2rtf;
};
name = Development;
};
D38A243714E4C3FE00F6AFFE /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = cat2rtf;
};
name = Deployment;
};
D38A244214E4C3FE00F6AFFE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = cat2html;
};
name = Development;
};
D38A244314E4C3FE00F6AFFE /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = cat2html;
};
name = Deployment;
};
D38A244F14E4C3FE00F6AFFE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = openman;
};
name = Development;
};
D38A245014E4C3FE00F6AFFE /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = openman;
};
name = Deployment;
Expand Down
28 changes: 12 additions & 16 deletions ManOpen.xcodeproj/xcshareddata/xcschemes/ManOpen.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,17 @@
buildConfiguration = "Development"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D38A23FD14E4C3FE00F6AFFE"
BuildableName = "ManOpen.app"
BlueprintName = "ManOpen"
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -50,17 +59,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D38A23FD14E4C3FE00F6AFFE"
BuildableName = "ManOpen.app"
BlueprintName = "ManOpen"
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Development"
Expand All @@ -82,8 +80,6 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Deployment"
Expand Down
10 changes: 3 additions & 7 deletions ManOpen.xcodeproj/xcshareddata/xcschemes/cat2html.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Development"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Deployment"
Expand Down
10 changes: 3 additions & 7 deletions ManOpen.xcodeproj/xcshareddata/xcschemes/cat2rtf.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Development"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Deployment"
Expand Down
24 changes: 10 additions & 14 deletions ManOpen.xcodeproj/xcshareddata/xcschemes/openman.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D38A244614E4C3FE00F6AFFE"
BuildableName = "openman"
BlueprintName = "openman"
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D38A244614E4C3FE00F6AFFE"
BuildableName = "openman"
BlueprintName = "openman"
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Development"
Expand All @@ -71,8 +69,6 @@
ReferencedContainer = "container:ManOpen.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Deployment"
Expand Down
0 ManOpen/English.lproj/Apropos.xib → ManOpen/en.lproj/Apropos.xib
View file
File renamed without changes.
0 ManOpen/English.lproj/Credits.rtf → ManOpen/en.lproj/Credits.rtf
View file
File renamed without changes.
0 ManOpen/English.lproj/DocController.xib → ManOpen/en.lproj/DocController.xib
View file
File renamed without changes.
0 ManOpen/English.lproj/InfoPlist.strings → ManOpen/en.lproj/InfoPlist.strings
View file
File renamed without changes.
0 ManOpen/English.lproj/ManOpen.xib → ManOpen/en.lproj/ManOpen.xib
View file
File renamed without changes.
0 ManOpen/English.lproj/ManPage.xib → ManOpen/en.lproj/ManPage.xib
View file
File renamed without changes.
0 ManOpen/English.lproj/PrefPanel.xib → ManOpen/en.lproj/PrefPanel.xib
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cat2html/cat2html.l
View file
Expand Up @@ -273,7 +273,7 @@ SGRSTART \x1B\[
/*
* nroff bullets
*/
o\010"+" emitRaw("&middot;"); // "&bull;" doesn't work
o\010"+" emitRaw("&middot;"); /* "&bull;" doesn't work */
"+"\010o emitRaw("&middot;");
o\010o\010"+"\010"+" emitRaw("&middot;");
"+"\010"+\010"o\010o emitRaw("&middot;");
Expand Down

0 comments on commit 007b3bb

Please sign in to comment.