Teach Xcode project how to build successfully without Doxygen

1 files changed, 15 insertions, 38 deletions

diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj
index 9a48bda9..4c813b06 100644
--- a/fish.xcodeproj/project.pbxproj
+++ b/fish.xcodeproj/project.pbxproj
@@ -45,7 +45,7 @@
 				D0F019F715A977A00034B3B1 /* CopyFiles */,
 				D0F019FC15A977B40034B3B1 /* CopyFiles */,
 				D033780F15DC6D2A00A634BA /* CopyFiles */,
-				D01A2C9B16964C8200767098 /* CopyFiles */,
+                                D01A2C9B16964C8200767098 /* Copy Files */,
 			);
 			dependencies = (
 				D0F01A1315AA36280034B3B1 /* PBXTargetDependency */,
@@ -61,16 +61,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		D01A2CA216965AD000767098 /* fish.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9D16964D0500767098 /* fish.1 */; };
-		D01A2CA316965AD000767098 /* set_color.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9E16964D1900767098 /* set_color.1 */; };
-		D01A2CA416965AD000767098 /* fish_pager.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9F16964D2800767098 /* fish_pager.1 */; };
-		D01A2CA516965AD000767098 /* fishd.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2CA016964D2F00767098 /* fishd.1 */; };
-		D01A2CA616965AD000767098 /* fish_indent.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2CA116964D3500767098 /* fish_indent.1 */; };
-		D01A2CA816965AEC00767098 /* fish.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9D16964D0500767098 /* fish.1 */; };
-		D01A2CA916965AEC00767098 /* set_color.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9E16964D1900767098 /* set_color.1 */; };
-		D01A2CAA16965AEC00767098 /* fish_pager.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2C9F16964D2800767098 /* fish_pager.1 */; };
-		D01A2CAB16965AEC00767098 /* fishd.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2CA016964D2F00767098 /* fishd.1 */; };
-		D01A2CAC16965AEC00767098 /* fish_indent.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2CA116964D3500767098 /* fish_indent.1 */; };
+                D01A2D24169B736200767098 /* man1 in Copy Files */ = {isa = PBXBuildFile; fileRef = D01A2D23169B730A00767098 /* man1 */; };
+                D01A2D25169B737700767098 /* man1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2D23169B730A00767098 /* man1 */; };
 		D031890C15E36E4600D9CC39 /* base in Resources */ = {isa = PBXBuildFile; fileRef = D031890915E36D9800D9CC39 /* base */; };
 		D033781115DC6D4C00A634BA /* completions in CopyFiles */ = {isa = PBXBuildFile; fileRef = D025C02715D1FEA100B9DB63 /* completions */; };
 		D033781215DC6D5200A634BA /* functions in CopyFiles */ = {isa = PBXBuildFile; fileRef = D025C02815D1FEA100B9DB63 /* functions */; };
@@ -264,31 +256,24 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		D01A2C9B16964C8200767098 /* CopyFiles */ = {
+                D01A2C9B16964C8200767098 /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = base/share/man/man1;
+                        dstPath = base/share/man;
 			dstSubfolderSpec = 1;
 			files = (
-				D01A2CA216965AD000767098 /* fish.1 in CopyFiles */,
-				D01A2CA316965AD000767098 /* set_color.1 in CopyFiles */,
-				D01A2CA416965AD000767098 /* fish_pager.1 in CopyFiles */,
-				D01A2CA516965AD000767098 /* fishd.1 in CopyFiles */,
-				D01A2CA616965AD000767098 /* fish_indent.1 in CopyFiles */,
+                                D01A2D24169B736200767098 /* man1 in Copy Files */,
 			);
+                        name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		D01A2CA716965ADD00767098 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 8;
-			dstPath = "${INSTALL_PATH}/share/man/man1/";
+                        dstPath = "${INSTALL_PATH}/share/man/";
 			dstSubfolderSpec = 0;
 			files = (
-				D01A2CA816965AEC00767098 /* fish.1 in CopyFiles */,
-				D01A2CA916965AEC00767098 /* set_color.1 in CopyFiles */,
-				D01A2CAA16965AEC00767098 /* fish_pager.1 in CopyFiles */,
-				D01A2CAB16965AEC00767098 /* fishd.1 in CopyFiles */,
-				D01A2CAC16965AEC00767098 /* fish_indent.1 in CopyFiles */,
+                                D01A2D25169B737700767098 /* man1 in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
@@ -367,11 +352,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		D01A2C9D16964D0500767098 /* fish.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = fish.1; path = man/man1/fish.1; sourceTree = BUILT_PRODUCTS_DIR; };
-		D01A2C9E16964D1900767098 /* set_color.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = set_color.1; path = man/man1/set_color.1; sourceTree = BUILT_PRODUCTS_DIR; };
-		D01A2C9F16964D2800767098 /* fish_pager.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = fish_pager.1; path = man/man1/fish_pager.1; sourceTree = BUILT_PRODUCTS_DIR; };
-		D01A2CA016964D2F00767098 /* fishd.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = fishd.1; path = man/man1/fishd.1; sourceTree = BUILT_PRODUCTS_DIR; };
-		D01A2CA116964D3500767098 /* fish_indent.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = fish_indent.1; path = man/man1/fish_indent.1; sourceTree = BUILT_PRODUCTS_DIR; };
+                D01A2D23169B730A00767098 /* man1 */ = {isa = PBXFileReference; lastKnownFileType = text; name = man1; path = pages_for_manpath/man1; sourceTree = BUILT_PRODUCTS_DIR; };
 		D025C02715D1FEA100B9DB63 /* completions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = completions; path = share/completions; sourceTree = "<group>"; };
 		D025C02815D1FEA100B9DB63 /* functions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = functions; path = share/functions; sourceTree = "<group>"; };
 		D025C02915D1FEA100B9DB63 /* tools */ = {isa = PBXFileReference; lastKnownFileType = folder; name = tools; path = share/tools; sourceTree = "<group>"; };
@@ -560,16 +541,12 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		D01A2C9C16964CF600767098 /* manpath_pages */ = {
+                D01A2C9C16964CF600767098 /* pages_for_manpath */ = {
 			isa = PBXGroup;
 			children = (
-				D01A2C9D16964D0500767098 /* fish.1 */,
-				D01A2C9E16964D1900767098 /* set_color.1 */,
-				D01A2C9F16964D2800767098 /* fish_pager.1 */,
-				D01A2CA016964D2F00767098 /* fishd.1 */,
-				D01A2CA116964D3500767098 /* fish_indent.1 */,
+                                D01A2D23169B730A00767098 /* man1 */,
 			);
-			name = manpath_pages;
+                        name = pages_for_manpath;
 			sourceTree = "<group>";
 		};
 		D031890A15E36DB500D9CC39 /* Other Build Products */ = {
@@ -725,7 +702,7 @@
 				D07B247515BCC4BE00D4ADB4 /* install.sh */,
 				D0D02AA915985C0C008E62BD /* Info.plist */,
 				D0A564F2168D1F2000AF6161 /* build_documentation.sh */,
-				D01A2C9C16964CF600767098 /* manpath_pages */,
+                                D01A2C9C16964CF600767098 /* pages_for_manpath */,
 				D0A564F1168D0BAB00AF6161 /* man */,
 				D025C02715D1FEA100B9DB63 /* completions */,
 				D025C02815D1FEA100B9DB63 /* functions */,
@@ -1084,7 +1061,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"${SRCROOT}\" ;\n. \"./build_tools/build_documentation.sh\" \"./Doxyfile.help\" \"./doc_src\" \"$BUILT_PRODUCTS_DIR\"\n";
+                        shellScript = "cd \"${SRCROOT}\" ;\n# Run build_documentation.sh\n# Do this in a subshell so that we keep going even if it calls exit\n( . \"./build_tools/build_documentation.sh\" \"./Doxyfile.help\" \"./doc_src\" \"$BUILT_PRODUCTS_DIR\" )\n\n# Copy certain files into man1, destined for share/man/man1 (instead of share/fish/man/man1)\n# These copies will fail of the documentation did not build; that's OK\n# We want to create the directory even if the documentation did not build, so that the Xcode build can still succeed\nmanpathdir=\"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1\"\necho \"Copying pages destined for manpath into $manpathdir\"\nrm -Rf \"$manpathdir\"\nmkdir -p \"$manpathdir\"\nfor manpage in fish.1 set_color.1 fish_pager.1 fishd.1 fish_indent.1; do\n  manpagepath=\"${BUILT_PRODUCTS_DIR}/man/man1/${manpage}\"\n  test -f \"$manpagepath\" && cp \"$manpagepath\" \"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1/\"\ndone\n\n# Always succeed\ntrue\n";
 		};
 /* End PBXShellScriptBuildPhase section */