Remove some additional xcode references

This commit is contained in:
ridiculousfish 2019-01-26 14:58:22 -08:00
parent 807f79df03
commit c869ab541d
4 changed files with 3 additions and 46 deletions

View file

@ -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 — 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

View file

@ -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.
#

View file

@ -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

View file

@ -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