diff --git a/build_tools/xcode_version_gen.sh b/build_tools/xcode_version_gen.sh index 28e9dbbec..41cad41c3 100755 --- a/build_tools/xcode_version_gen.sh +++ b/build_tools/xcode_version_gen.sh @@ -2,16 +2,11 @@ # Expects to be called from Xcode (Run Script build phase), # write version number C preprocessor macro to header file. -tmp="$SCRIPT_OUTPUT_FILE_1" ver="$SCRIPT_OUTPUT_FILE_0" ./build_tools/git_version_gen.sh -cat FISH-BUILD-VERSION-FILE | awk -F= '{printf("#define %s \"%s\"\n",$1,$2)}' > "$tmp" - -cmp --quiet "$tmp" "$ver" +cmp --quiet "FISH-BUILD-VERSION-FILE" "$ver" if [ $? -ne 0 ]; then - /bin/mv "$tmp" "$ver" -else - /bin/rm "$tmp" + /bin/cp FISH-BUILD-VERSION-FILE "$ver" fi diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index eb812e451..9c365ccbc 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1534,8 +1534,7 @@ inputPaths = ( ); outputPaths = ( - "$(SHARED_DERIVED_FILE_DIR)/fish-build-version.h", - "$(SHARED_DERIVED_FILE_DIR)/force-fish-build-version.h", + "$(SHARED_DERIVED_FILE_DIR)/FISH-BUILD-VERSION-FILE", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh;