h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-23 10:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Customisable extra configuration, completion and function directories

Browse Source 
- Add options to the autotools build to set the path for the "vendor"
   or "extra" configuration snippets, functions and completions
   directories.

 - Remove the vendor_completions directory from the Xcode build, as
   these are relocatable and compiling the paths in does not make sense.

This allows packaging tools like Homebrew and Nix to use a common
directory outside of the main prefix for third-party completions, and
to make these available for programmatic discovery through `pkg-config`.

Closes #2113
This commit is contained in:
David Adam
2016-04-04 14:33:35 +08:00
committed by Kurtis Rader
parent cb6d5d76c8
commit 484c1484c9
8 changed files with 106 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fish.xcodeproj/project.pbxproj
View File

@@ -24,7 +24,6 @@
buildPhases = (
D07D266915E33B86009E43F6 /* CopyFiles */,
D07D266B15E33B86009E43F6 /* Copy Files */,
D01A25E11AF58D8C002F9E92 /* ShellScript */,
D01A2CA716965ADD00767098 /* CopyFiles */,
);
dependencies = (
@@ -55,7 +54,6 @@
D0F019FC15A977B40034B3B1 /* CopyFiles */,
D033780F15DC6D2A00A634BA /* CopyFiles */,
D01A2C9B16964C8200767098 /* Copy Files */,
D01A25E01AF58CD0002F9E92 /* ShellScript */,
);
dependencies = (
D0F01A1315AA36280034B3B1 /* PBXTargetDependency */,
@@ -1048,32 +1046,6 @@
shellPath = /bin/sh;
shellScript = ./build_tools/xcode_version_gen.sh;
};
D01A25E01AF58CD0002F9E92 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mkdir -p -m 755 \"${TARGET_BUILD_DIR}/base/share/fish/vendor_completions.d\"";
};
D01A25E11AF58D8C002F9E92 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "mkdir -p -m 755 \"${INSTALL_ROOT}/${INSTALL_PATH}/share/fish/vendor_completions.d\"";
};
D0A564EB168CFDDE00AF6161 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;