From c869ab541d0fe6c1bf738346e7773d6e3b78c3ae Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 26 Jan 2019 14:58:22 -0800
Subject: [PATCH] Remove some additional xcode references

---
 CONTRIBUTING.md                  |  7 ++-----
 Makefile.in                      |  9 ---------
 build_tools/lint.fish            | 21 +--------------------
 build_tools/xcode_version_gen.sh | 12 ------------
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100755 build_tools/xcode_version_gen.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d72ffca31..b5dc2e304 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -179,12 +179,9 @@ You are strongly encouraged to add tests when changing the functionality of fish
 
 The tests can be run on your local computer on all operating systems.
 
-Running the tests is only supported from the autotools build and not xcodebuild. On OS X, you will need to install autoconf &mdash; we suggest using [Homebrew](https://brew.sh/) to install these tools.
-
 ```
-autoconf
-./configure
-make test # or "gmake test" on BSD
+cmake path/to/fish-shell
+make test
 ```
 
 ### Travis CI Build and Test
diff --git a/Makefile.in b/Makefile.in
index 059e05847..eba0b41be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -590,15 +590,6 @@ install: all install-force | check-legacy-binaries
 	@echo "$(bo)Have fun! <><$(sgr0)"
 .PHONY: install
 
-#
-# Xcode install
-#
-xcode-install:
-	rm -Rf /tmp/fish_build
-	xcrun xcodebuild install DSTROOT=/tmp/fish_build
-	ditto /tmp/fish_build /
-.PHONY: xcode-install
-
 #
 # Actually do the installation.
 #
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index d8e9ce89a..e6fd1ee09 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -127,26 +127,7 @@ if set -q c_files[1]
         # The stderr to stdout redirection is because oclint, incorrectly writes its final summary
         # counts of the errors detected to stderr. Anyone running this who wants to capture its
         # output will expect those messages to be written to stdout.
-        if test "$kernel_name" = "Darwin"
-            if not test -f compile_commands.json
-                xcodebuild -alltargets >xcodebuild.log
-                oclint-xcodebuild xcodebuild.log >/dev/null
-            end
-            if test $all = yes
-                oclint-json-compilation-database -e '/pcre2-10.32/' -- -enable-global-analysis 2>&1
-            else
-                set i_files
-                for f in $c_files
-                    set i_files $i_files -i $f
-                end
-                echo oclint-json-compilation-database -e '/pcre2-10.32/' $i_files
-                oclint-json-compilation-database -e '/pcre2-10.32/' $i_files 2>&1
-            end
-        else
-            # Presumably we're on Linux or other platform not requiring special
-            # handling for oclint to work.
-            oclint $c_files -- $argv 2>&1
-        end
+        oclint $c_files -- $argv 2>&1
     end
 else
     echo
diff --git a/build_tools/xcode_version_gen.sh b/build_tools/xcode_version_gen.sh
deleted file mode 100755
index 41cad41c3..000000000
--- a/build_tools/xcode_version_gen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# Expects to be called from Xcode (Run Script build phase),
-# write version number C preprocessor macro to header file.
-
-ver="$SCRIPT_OUTPUT_FILE_0"
-
-./build_tools/git_version_gen.sh
-
-cmp --quiet "FISH-BUILD-VERSION-FILE" "$ver"
-if [ $? -ne 0 ]; then
-    /bin/cp FISH-BUILD-VERSION-FILE "$ver"
-fi