Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 07:34:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
fish-shell/Makefile.in

1243 lines
53 KiB
Makefile
Raw Normal View History

Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
# Copyright (C) 2005-2006 Axel Liljencrantz
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Use the same wording about license in Makefile and main.c. darcs-hash:20061101144747-ac50b-fac8e3693445a8601f0c71ab191a64dac0ad7a67.gz
2006-11-01 14:47:47 +00:00
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
Update Free Software Foundation address. Fixes #1184.
2013-12-13 20:51:52 +00:00
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Minor tweaks, including a few small performance improvements darcs-hash:20060204130914-ac50b-331e83fd8fe472545fce60fc4b76bb8300526d64.gz
2006-02-04 13:09:14 +00:00
#
# @configure_input@
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
# Makefile for the fish shell. Can build fish and associated
autoconf build: clean up Makefile, remove fish.spec Removes some unused variables and out-of-date references. Wraps some tests in quotes to avoid expansion errors. Removes the fish.spec generated file as it is out of date and is arguably better maintained by downstream packagers. See http://github.com/zanchey/fish-build/ for a better RPM spec file.
2013-11-30 07:11:05 +00:00
# applications, install them, and recalculate dependencies.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Control Makefile verbosity level with V=. Instead of using @ directly most of the time, use $(v) which can be '' or @ controlled by V. Defaults to 0. make V=1 for a verbose make.
2016-07-18 20:48:15 +00:00
# Verbosity
# make V=1 causes a noisy make, V=0 is silent/quiet. If one uses (lower case v)
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# $v as a substitute for @, it will be replaced with an empty string for the
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# default (V=1) case and replaced with @ in the V=0 case. You can use a bare @
# for things that should almost never print.
Control Makefile verbosity level with V=. Instead of using @ directly most of the time, use $(v) which can be '' or @ controlled by V. Defaults to 0. make V=1 for a verbose make.
2016-07-18 20:48:15 +00:00
V := 0
Silence the Makefile build There was a lot of very noisy output for things we do not care about, particularly the echoing of clang commands, installs, and doxygen output. We now show output like " CXX src/fish.o" and not much else unless there is a problem. Add mechanism to show e.g. CXXFLAGS variables at top of build. Improve make docs output Highlight FISH_BUILD_VERSION FISH_BUILD_VERSION is yellow. Run ./configure with -q
2016-07-16 18:48:11 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Makefile: Provide PACKAGE_TARNAME for autoconf default docdir docdir was previously being set to "${prefix}/share/doc/${PACKAGE_NAME}" when it wasn't explicitely set on configuration using --docdir. Without this appearing in the Makefile, some files silently get silently installed directly into ${prefix}/share/doc instead within a fish subdirectory. I also added datarootdir to fix an autoconf warning, since autoconf normally would use it for the directory paths (e.g. docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}). The autoconf generated configure script has a hack to fix this, but states: "FIXME: This hack should be removed a few years after 2.60."
2010-11-22 11:05:06 +00:00
# Used by docdir
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
PACKAGE_TARNAME := @PACKAGE_TARNAME@
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
# The default: /bin/sh
# Fish won't work.
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
SHELL := @SHELL@
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
Cleanup Makefile.in and make sure gen_hdr.sh is executable before using it darcs-hash:20060123113807-ac50b-3959a084721ea2aebd7e5751788c82f633c2984a.gz
2006-01-23 11:38:07 +00:00
# Programs
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
CXX := @CXX@
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
INSTALL := @INSTALL@
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
LN_S := @LN_S@
Makefile/configure: detect and use sed from configure
2014-09-18 12:29:49 +00:00
SED := @SED@
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
MKDIR_P := @MKDIR_P@
AWK := @AWK@
GREP := @GREP@
FGREP := @FGREP@
Cleanup Makefile.in and make sure gen_hdr.sh is executable before using it darcs-hash:20060123113807-ac50b-3959a084721ea2aebd7e5751788c82f633c2984a.gz
2006-01-23 11:38:07 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
# Installation directories
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
prefix = @prefix@
exec_prefix = @exec_prefix@
Makefile: Provide PACKAGE_TARNAME for autoconf default docdir docdir was previously being set to "${prefix}/share/doc/${PACKAGE_NAME}" when it wasn't explicitely set on configuration using --docdir. Without this appearing in the Makefile, some files silently get silently installed directly into ${prefix}/share/doc instead within a fish subdirectory. I also added datarootdir to fix an autoconf warning, since autoconf normally would use it for the directory paths (e.g. docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}). The autoconf generated configure script has a hack to fix this, but states: "FIXME: This hack should be removed a few years after 2.60."
2010-11-22 11:05:06 +00:00
datarootdir = @datarootdir@
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
datadir = @datadir@
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
bindir = @bindir@
mandir = @mandir@
sysconfdir = @sysconfdir@
docdir = @docdir@
Set value of install path macros like DATADIR from the Makefile, not automatically by Autoconf using AC_DEFINE. That way we get correct expansion of ${prefix} and friends to their install-time value. This fixes a bug reported by James Vega. darcs-hash:20060719144104-ac50b-05001b151a54bf893ff4c5a82c5f040529e27f57.gz
2006-07-19 14:41:04 +00:00
localedir = @localedir@
Customisable extra configuration, completion and function directories - 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
2016-04-04 06:33:35 +00:00
extra_completionsdir = @extra_completionsdir@
extra_functionsdir = @extra_functionsdir@
Rename "snippets" to "conf" internally, and document them as snippets Discussed in #2896.
2016-04-05 14:22:12 +00:00
extra_confdir = @extra_confdir@
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
#
# muparser
#
Update MuParser source Drop build system artefacts and move to versioned directory. Tarball from https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz with samples/example2 directory removed.
2017-08-24 17:26:16 +00:00
MUPARSER_DIR = muparser-2.2.5
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
MUPARSER_LIBDIR = $(MUPARSER_DIR)/lib
MUPARSER_LIB = $(MUPARSER_LIBDIR)/libmuparser.a
MUPARSER_H = $(MUPARSER_DIR)/include/muParser.h
EXTRA_MUPARSER = @EXTRA_MUPARSER@
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
#
# pcre2
#
PCRE2_WIDTH = @WCHAR_T_BITS@
New pcre2
2017-01-16 07:10:28 +00:00
PCRE2_DIR = pcre2-10.22
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
PCRE2_LIBDIR = $(PCRE2_DIR)/.libs
PCRE2_LIB = $(PCRE2_LIBDIR)/libpcre2-$(PCRE2_WIDTH).a
PCRE2_H = $(PCRE2_DIR)/src/pcre2.h
configure/Makefile: allow the use of a system libpcre2 if available
2015-10-01 08:33:23 +00:00
EXTRA_PCRE2 = @EXTRA_PCRE2@
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Various flags
#
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
CPPFLAGS = -D_UNICODE=1 -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\" -iquote. -iquote./src/
configure/Makefile: respect $LIBS, remove some egregarious lies - expunge LIBS_COMMON, it doesn't get used anywhere - don't reset LIBS to empty - move the gettext test as every binary depends on it - only include one set of libraries
2013-11-09 11:43:32 +00:00
LDFLAGS = @LDFLAGS@
configure/Makefile: allow the use of a system libpcre2 if available
2015-10-01 08:33:23 +00:00
LIBS = @LIBS@
configure/Makefile: remove unused $LIBS and $LDFLAGS complications
2014-03-29 15:28:11 +00:00
LDFLAGS_FISH = ${LDFLAGS} @LDFLAGS_FISH@
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
# Set to 1 if we have gettext
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
HAVE_GETTEXT=@HAVE_GETTEXT@
docs: configure/Makefile changes to require at least Doxygen 1.5
2013-06-19 15:59:13 +00:00
#
# Set to 1 if we have doxygen
#
HAVE_DOXYGEN=@HAVE_DOXYGEN@
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Raname main.c into fish.c. NAme makes more sense. darcs-hash:20080112192135-75c98-dc3f8480f1b25f6ab866c252c7edace862298f38.gz
2008-01-12 19:21:35 +00:00
# All objects that the system needs to build fish, except fish.o
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
more builtin style cleanup
2017-06-15 05:12:29 +00:00
FISH_OBJS := obj/autoload.o obj/builtin.o obj/builtin_bg.o obj/builtin_bind.o obj/builtin_block.o \
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/builtin_builtin.o obj/builtin_cd.o obj/builtin_command.o \
obj/builtin_commandline.o obj/builtin_complete.o obj/builtin_contains.o \
obj/builtin_disown.o obj/builtin_echo.o obj/builtin_emit.o \
obj/builtin_exit.o obj/builtin_fg.o obj/builtin_function.o \
obj/builtin_functions.o obj/builtin_argparse.o obj/builtin_history.o \
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
obj/builtin_jobs.o obj/builtin_math.o obj/builtin_printf.o obj/builtin_pwd.o \
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/builtin_random.o obj/builtin_read.o obj/builtin_realpath.o \
obj/builtin_return.o obj/builtin_set.o obj/builtin_set_color.o \
obj/builtin_source.o obj/builtin_status.o obj/builtin_string.o \
obj/builtin_test.o obj/builtin_ulimit.o obj/color.o obj/common.o \
obj/complete.o obj/env.o obj/env_universal_common.o obj/event.o obj/exec.o \
obj/expand.o obj/fallback.o obj/fish_version.o obj/function.o obj/highlight.o \
obj/history.o obj/input.o obj/input_common.o obj/intern.o obj/io.o \
obj/iothread.o obj/kill.o obj/output.o obj/pager.o obj/parse_execution.o \
obj/parse_productions.o obj/parse_tree.o obj/parse_util.o obj/parser.o \
obj/parser_keywords.o obj/path.o obj/postfork.o obj/proc.o obj/reader.o \
obj/sanity.o obj/screen.o obj/signal.o obj/tokenizer.o obj/utf8.o obj/util.o \
obj/wcstringutil.o obj/wgetopt.o obj/wildcard.o obj/wutil.o
Another halloc:ification of fish. Halloc has been extended to allow registering function calls, this has allowed the creation of halloc-handled arraylists, stringbuffers, etc. More job parsing halloc-ification has reduced the error handling code to only a shadow of it's former self darcs-hash:20060209155020-ac50b-e119c5293ce2368e252cfc01b98ab7c629fdd678.gz
2006-02-09 15:50:20 +00:00
update lexicon for latest docs Closes #2699 Fixes issues with: * 'string' function synopsis * Redirection display issues * Better file & path detection * Rendering of % & @ chars in both html and man * @ symbol in tutorial Improves robustness by implementing an @EOL marker to prevent hold buffer dumping extra chars after the end of an expression. Added new '{{' and '}}' meta-chars for when you want curly braces in a regexp that was previously tripping up the lexicon. Improve man/html presentation consistency for * string * printf * prompt_pwd * type Use cli-styling for 'practical' examples. Add <bs> tag for presenting content with preceding backslash. Signed-off-by: Mark Griffiths <mark@thebespokepixel.com>
2016-04-04 12:43:37 +00:00
FISH_INDENT_OBJS := obj/fish_indent.o obj/print_help.o $(FISH_OBJS)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Run make depend!
2016-07-03 12:04:19 +00:00
FISH_KEYREAD_OBJS := obj/fish_key_reader.o obj/print_help.o $(FISH_OBJS)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
# All objects that the system needs to build fish_tests
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Migrate source files into src/ directory This change moves source files into a src/ directory, and puts object files into an obj/ directory. The Makefile and xcode project are updated accordingly. Fixes #1866
2015-07-24 07:50:58 +00:00
FISH_TESTS_OBJS := $(FISH_OBJS) obj/fish_tests.o
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Update 'depend' target so make depend works again This is very ugly because makedepend has no native support for building outside the source tree. It always wants to prepend 'src/' to the object file path. So instead we have to cons up a new source tree, with the sources files at the root, and run makedepend on that.
2015-07-25 22:15:54 +00:00
# All of the sources that produce object files
# (that is, are not themselves #included in other source files)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
FISH_ALL_OBJS := $(sort $(FISH_OBJS) $(FISH_INDENT_OBJS) $(FISH_TESTS_OBJS) $(FISH_KEYREAD_OBJS) obj/fish.o)
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Simplify Makefile by using a wildcard to specify help files darcs-hash:20061120010620-ac50b-1a838bdd75607a503bc8335bb39abd2aa11ac7e8.gz
2006-11-20 01:06:20 +00:00
# Files containing user documentation
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
#
# These files are the source files, they contain a few @FOO@-style substitutions
New documentation UI, including tutorial.
2013-10-05 07:37:44 +00:00
# Note that this order defines the order that they appear in the documentation
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
#
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
HDR_FILES_SRC := doc_src/index.hdr.in doc_src/tutorial.hdr doc_src/design.hdr doc_src/license.hdr doc_src/commands.hdr.in doc_src/faq.hdr
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
#
# These are the generated result files
#
Remove some GNU-makeisms from the Makefile to try to get us to build with BSD make. Not quite there yet.
2013-03-30 19:21:49 +00:00
HDR_FILES := $(HDR_FILES_SRC:.hdr.in=.hdr)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Fix to incorporate C++ build changes into configure.ac and Makefile.in
2012-01-06 18:23:38 +00:00
# Use a pattern rule so that Make knows to only issue one invocation
# per http://www.gnu.org/software/make/manual/make.html#Pattern-Intro
Disable internalized scripts
2012-06-01 21:00:04 +00:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
remove trialing spaces #2
2010-09-18 02:18:26 +00:00
# Files containing documentation for external commands.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
HELP_SRC := $(wildcard doc_src/*.txt)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Documentation update Rework for Doxygen >1.8. Moved large parts of the documentation to a simplified format, making use of Markdown enhancements and fixing bad long options.
2014-08-01 02:37:32 +00:00
#
# HTML includes needed for HTML help
#
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
HTML_SRC := doc_src/user_doc.header.html doc_src/user_doc.footer.html doc_src/user_doc.css
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
.po should not depend on the messages.pot file, since it will cause that file to be autogenerated on build. Also, add a few comments to the Makefile. darcs-hash:20060122213548-ac50b-e3d6c30bdfa401c03248fb88f96a0c6457fe9773.gz
2006-01-22 21:35:48 +00:00
#
# Files in the test directory
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
TEST_IN := $(wildcard tests/test*.in)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Further improvements to build system wrt detection of compiler and libc features and prototypes, as discussed with James Antill on mailin list darcs-hash:20060329002500-ac50b-e7618e476ea69802bd2cb0076244f49a0f178df7.gz
2006-03-29 00:25:00 +00:00
# Files in ./share/completions/
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
remove deprecated `.` (dot) command Fixes #4294
2017-08-08 01:29:33 +00:00
COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Further improvements to build system wrt detection of compiler and libc features and prototypes, as discussed with James Antill on mailin list darcs-hash:20060329002500-ac50b-e7618e476ea69802bd2cb0076244f49a0f178df7.gz
2006-03-29 00:25:00 +00:00
# Files in ./share/functions/
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Redo installation file structure, move lots of things to $PREFIX/share/fish darcs-hash:20060217101339-ac50b-d93d2c620a4b7f75f05ff461a6edbee001da7613.gz
2006-02-17 10:13:39 +00:00
FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
Autoloaded functions darcs-hash:20060208092005-ac50b-8e784f79a4e158c8c15b553fad85002dccc7bd03.gz
2006-02-08 09:20:05 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Programs to install
#
enhance the key_reader program The original `key_reader` program was useful but didn't do much that `xxd` or `od -tx1z` didn't do. Furthermore, it wasn't built and installed by default. This change adds features that make it superior to those programs for decoding interactive key presses and makes it a first-class citizen like the `fish_indent` program that is always available. Fixes #2991
2016-05-07 04:22:28 +00:00
PROGRAMS := fish fish_indent fish_key_reader
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
# Manual pages to install
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Silence the Makefile build There was a lot of very noisy output for things we do not care about, particularly the echoing of clang commands, installs, and doxygen output. We now show output like " CXX src/fish.o" and not much else unless there is a problem. Add mechanism to show e.g. CXXFLAGS variables at top of build. Improve make docs output Highlight FISH_BUILD_VERSION FISH_BUILD_VERSION is yellow. Run ./configure with -q
2016-07-16 18:48:11 +00:00
MANUALS := $(addsuffix .1, $(addprefix share/man/man1/, $(PROGRAMS)))
Makefile: use recursively expanded variable for the list of manpages Restores the installation of manual pages when running `make install` without running `make` first, a bug introduced with 417255fc. Closes #3813.
2017-02-05 05:27:48 +00:00
HELP_MANPAGES = $(wildcard share/man/man1/*.1)
Makefile: skip the open manpage on OS X This is normally handled by the build_documentation.sh script, but if the tarball includes the documentation then that script is never run. We should do it in both places as the Xcode build uses only the build_documentation.sh script! Fixes #2561.
2016-12-02 12:25:54 +00:00
# Determine which man pages we don't want to install
# On OS X, don't install a man page for open, since we defeat fish's open
# function on OS X.
# This is also done in build_tools/build_documentation.sh, but because the
# tarball includes this page, we need to skip it in the Makefile too (see
# https://github.com/fish-shell/fish-shell/issues/2561).
ifeq ($(shell uname), Darwin)
Makefile: use recursively expanded variable for the list of manpages Restores the installation of manual pages when running `make install` without running `make` first, a bug introduced with 417255fc. Closes #3813.
2017-02-05 05:27:48 +00:00
CONDEMNED_PAGES := open.1
HELP_MANPAGES = $(filter-out share/man/man1/open.1, $(wildcard share/man/man1/*.1))
Makefile: skip the open manpage on OS X This is normally handled by the build_documentation.sh script, but if the tarball includes the documentation then that script is never run. We should do it in both places as the Xcode build uses only the build_documentation.sh script! Fixes #2561.
2016-12-02 12:25:54 +00:00
endif
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
support the LINGUAS variable by `make install` Fixes 3863
2017-02-22 04:49:34 +00:00
# All translation message catalogs, filter files based on LINGUAS.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
TRANSLATIONS_SRC := $(wildcard po/*.po)
support the LINGUAS variable by `make install` Fixes 3863
2017-02-22 04:49:34 +00:00
ifeq ($(HAVE_GETTEXT), 1)
Makefile: check HAVE_GETTEXT in Makefile not shell Tidy up the handling of gettext/non-gettext builds a bit
2014-11-17 09:27:25 +00:00
TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
support the LINGUAS variable by `make install` Fixes 3863
2017-02-22 04:49:34 +00:00
ifdef LINGUAS
TRANSLATIONS_ALL := $(TRANSLATIONS)
TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS))
TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL))
endif
Makefile: check HAVE_GETTEXT in Makefile not shell Tidy up the handling of gettext/non-gettext builds a bit
2014-11-17 09:27:25 +00:00
else
TRANSLATIONS :=
endif
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
docs: configure/Makefile changes to require at least Doxygen 1.5
2013-06-19 15:59:13 +00:00
#
# If Doxygen is not available, don't attempt to build the documentation
#
ifeq ($(HAVE_DOXYGEN), 1)
rename make target "user_doc" to "doc" Fixes #2875
2016-03-31 06:51:58 +00:00
user_doc=doc
docs: don't remove/rebuild share/man if we don't have doxygen
2013-09-02 05:05:55 +00:00
share_man=share/man
docs: configure/Makefile changes to require at least Doxygen 1.5
2013-06-19 15:59:13 +00:00
else
user_doc=
docs: don't remove/rebuild share/man if we don't have doxygen
2013-09-02 05:05:55 +00:00
share_man=
docs: configure/Makefile changes to require at least Doxygen 1.5
2013-06-19 15:59:13 +00:00
endif
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
t_co:=$(shell tput colors || echo '') 2> /dev/null
green := $(shell ( tput setaf 2 || tput AF 2 ) 2> /dev/null )
yellow := $(shell ( tput setaf 3 || tput AF 3 ) 2> /dev/null )
cyan := $(shell ( tput setaf 6 || tput AF 6 ) 2> /dev/null )
red := $(shell ( tput setaf 1 || tput AF 1 ) 2> /dev/null )
bo := $(shell ( tput bold || tput md ) 2> /dev/null )
'ZH' fallback for tput sitm, fix forced dim OS X
2016-09-01 14:38:18 +00:00
# * Italic: Rarely defined - it's common for it to work despite
Makefile bug fixes, tweaks Fix problem with Makefile not escaping 'echo' correctly Support systems where 'tput' only works with termcap names Adjust output. Shade out most run-of-the-mill output so you can't miss warnigns and our status signposts amonst the .o files created.
2016-09-01 13:58:51 +00:00
# terminfo entries and isn't known to cause any recent > 256-color terminals
# to explode. If terminfo says a terminal supports 256 colors - it's fancy enough
# and won't have trouble the escape.
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
ifeq ($(t_co), 256)
em := $(shell ( tput sitm || tput ZH || echo "\\033[3m" ) 2> /dev/null )
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# * Half-bright/faint 'dim' mode - rarely works - rarely in terminfo when it does
# but it's cool. Use it with one of the basic colors to get a fainter version
# of it. We use this to shade the output from any reconfigures we trigger.
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
dim := $(shell ( tput dim || tput mh || [ $(TERM_PROGRAM) = Apple_Terminal ] && echo "\\033[2m") 2> /dev/null )
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
else
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
em := $(shell ( tput sitm || tput ZH ) 2> /dev/null )
dim := $(shell ( tput dim || tput mh) 2> /dev/null )
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
endif
Makefile bug fixes, tweaks Fix problem with Makefile not escaping 'echo' correctly Support systems where 'tput' only works with termcap names Adjust output. Shade out most run-of-the-mill output so you can't miss warnigns and our status signposts amonst the .o files created.
2016-09-01 13:58:51 +00:00
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
sgr0 := $(shell ( tput sgr0 || tput me) 2> /dev/null )
Makefile bug fixes, tweaks Fix problem with Makefile not escaping 'echo' correctly Support systems where 'tput' only works with termcap names Adjust output. Shade out most run-of-the-mill output so you can't miss warnigns and our status signposts amonst the .o files created.
2016-09-01 13:58:51 +00:00
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
#
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# A target that shows VAR='$(VAR)' (properly escaped)
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# Cool trick: `make show-$var` (e.g. make show-HAVE_DOXYGEN) to quickly see what $var is.
#
show-%:
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
-@echo " $* = $(em)$(cyan)'$(subst ',''',$($*))'$(sgr0)"
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Make everything needed for installing fish
#
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
all: show-CXX show-CXXFLAGS $(PROGRAMS) $(user_doc) $(share_man) $(TRANSLATIONS) fish.pc share/__fish_build_paths.fish
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
ifneq (,$(findstring install,$(MAKECMDGOALS)))
Delete trailing spaces
2017-01-15 22:51:10 +00:00
# Fish has been built, but if the goal was 'install', we aren't done yet and this output isnt't desirable
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(green)fish has now been built.$(sgr0)"
@echo "Run $(yellow)$(notdir $(MAKE)) install$(sgr0) to install fish.$(sgr0)"
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
endif
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: all
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Generate version numbers dynamically This commit hooks the Makefile up to generate a FISH_BUILD_VERSION symbol and kills off PACKAGE_VERSION in .cpp files. It also modifies the tarball generation script to add the necessary version file for releases.
2013-06-24 10:12:09 +00:00
#
# Pull version information
#
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
FISH-BUILD-VERSION-FILE: FORCE | show-FISH_BUILD_VERSION
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v build_tools/git_version_gen.sh 2> /dev/null
Generate version numbers dynamically This commit hooks the Makefile up to generate a FISH_BUILD_VERSION symbol and kills off PACKAGE_VERSION in .cpp files. It also modifies the tarball generation script to add the necessary version file for releases.
2013-06-24 10:12:09 +00:00
-include FISH-BUILD-VERSION-FILE
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
CPPFLAGS += -DFISH_BUILD_VERSION=\"$(FISH_BUILD_VERSION)\"
Generate version numbers dynamically This commit hooks the Makefile up to generate a FISH_BUILD_VERSION symbol and kills off PACKAGE_VERSION in .cpp files. It also modifies the tarball generation script to add the necessary version file for releases.
2013-06-24 10:12:09 +00:00
.PHONY: FORCE
Correction to make rule for fish_version
2016-03-31 21:19:27 +00:00
obj/fish_version.o: FISH-BUILD-VERSION-FILE
Generate version numbers dynamically This commit hooks the Makefile up to generate a FISH_BUILD_VERSION symbol and kills off PACKAGE_VERSION in .cpp files. It also modifies the tarball generation script to add the necessary version file for releases.
2013-06-24 10:12:09 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# These dependencies make sure that autoconf and configure are run
# when the source code for the build configuration has changed.
#
Add Makefile rules for regenerating Makefile, configure script, etc. when needed darcs-hash:20060402111525-ac50b-533e15f7ab5d63c2f8258b5a5ae8adc5bafd9221.gz
2006-04-02 11:15:25 +00:00
configure: configure.ac
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Rechecking config.status; rerunning ./configure if necessary...$(dim)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v ./config.status --recheck
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(sgr0)"
Add Makefile rules for regenerating Makefile, configure script, etc. when needed darcs-hash:20060402111525-ac50b-533e15f7ab5d63c2f8258b5a5ae8adc5bafd9221.gz
2006-04-02 11:15:25 +00:00
Makefile: Makefile.in configure
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Checking config.status...$(dim)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v ./config.status
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(sgr0)"
Add Makefile rules for regenerating Makefile, configure script, etc. when needed darcs-hash:20060402111525-ac50b-533e15f7ab5d63c2f8258b5a5ae8adc5bafd9221.gz
2006-04-02 11:15:25 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Build fish with some debug flags specified. This is GCC specific,
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# and should only be used when debugging fish.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Large set of changes related to making fish relocatable, and improving the build and install story. - etc/config.fish and share/config.fish are now "universal" and no longer reference install paths or need to be touched by autotools. They've been removed from config.fish.in to config.fish. - fish now attempts to determine __fish_datadir and __fish_sysconfdir relative to the path of the fish executable itself (typically by walking up one directory). This means that you can copy the directory hierarchy around and things will still work. The compiled-in paths are used as a backup. - The fish Xcode project now can build fish natively, without needing autotools. - Version bumped to 2.0
2012-07-08 22:20:39 +00:00
prof: EXTRA_CXXFLAGS += -pg
prof: LDFLAGS += -pg
prof: all
add prof target
2010-10-04 18:23:18 +00:00
.PHONY: prof
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# User documentation, describing the features of the fish shell.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
remove "doc" make target and rename "user_doc" Fixes #2874
2016-03-30 22:35:14 +00:00
# Depend on the sources (*.hdr.in) and manually make the intermediate *.hdr
# and doc.h files if needed. The sed command deletes everything including and
# after the first -, for simpler version numbers. Cleans up the user_doc/html
# directory once Doxygen is done.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Don't show all the help input files on build It's too much!
2016-10-03 21:35:14 +00:00
doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FILES) lexicon_filter
Makefile.in: fix output alignment spacing
2016-11-20 22:38:02 +00:00
@echo " doxygen $(em)user_doc$(sgr0)"
Factor out script to build user_doc As part of factoring out the documentation building parts of the fish build, add a new file build_user_doc.sh that builds the user_doc directory. Invoke it from both the Makefile and CMake build.
2017-10-05 04:26:34 +00:00
$v env FISH_BUILD_VERSION=$(FISH_BUILD_VERSION) ./build_tools/build_user_doc.sh Doxyfile.user ./lexicon_filter
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# PDF version of the source code documentation.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
remove trialing spaces #2
2010-09-18 02:18:26 +00:00
doc/refman.pdf: doc
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " MAKE $(em)doc/latex$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v cd doc/latex
$v $(MAKE) V=$(V)
$v mv refman.pdf ..
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# Prep the environment for running the unit tests. When specifying DESTDIR on
# the command line (e.g., `make DESTDIR=/usr/local/`) you must have previously
# installed fish using the same prefix; e.g., `./configure --prefix=/usr/local`
# followed by `make install`.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
test-prep: show-DESTDIR show-LN_S show-FISH_VERSION
$v rm -rf test
$v $(MKDIR_P) test/data test/home test/temp
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
ifdef DESTDIR
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(LN_S) $(DESTDIR) test/root
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
else
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(MKDIR_P) test/root
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
endif
.PHONY: test-prep
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# The test target runs both the low level code tests and the high level script
# tests.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# Note that doing `make DESTDIR=/some/path/ test` overrides this assignment.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
test: DESTDIR = $(PWD)/test/root/
test: prefix = .
test: test-prep install-force test_low_level test_high_level
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v rm -f /tmp/file_truncation_test.txt /tmp/tee_test.txt /tmp/fish_foo.txt
$v rm -rf /tmp/is_potential_path_test
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: test
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
# We want the various tests to run serially so their output doesn't mix
# We can do that by adding ordering dependencies based on what goals are being used.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
fix bug in `env_get()` involving empty vars My previous change to eliminate `class var_entry_t` caused me to notice that `env_get()` turned a set but empty var into a missing var. Which is wrong. Fixing that brought to light several other pieces of code that were wrong as a consequence of the aforementioned bug. Another step to fixing issue #4200.
2017-08-09 18:11:58 +00:00
test_goals := test_low_level test_fishscript test_interactive test_invocation
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
# The following variables define targets that depend on the tests. If any more targets
# are added that depend, directly or indirectly, on tests, they need to be recorded here.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
test_test_deps = test_low_level $(test_high_level_test_deps)
change env_var_t to a vector of strings Internally fish should store vars as a vector of elements. The current flat string representation is a holdover from when the code was written in C. Fixes #4200
2017-08-05 22:08:39 +00:00
test_high_level_test_deps = test_fishscript test_interactive test_invocation
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
active_test_goals = $(filter $(test_goals),$(foreach a,$(or $(MAKECMDGOALS),$(.DEFAULT_GOAL)),$(a) $($(a)_test_deps)))
Something got caught in my sed net: `$(b)` -> `$(bo)` Oops. Fixes #3394
2016-09-20 19:03:03 +00:00
filter_up_to = $(eval b:=1)$(foreach a,$(2),$(and $(b),$(if $(subst $(1),,$(a)),$(a),$(eval b:=))))
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
don't let low level tests pollute user home dir Fixes #3228
2016-07-14 05:46:46 +00:00
# The values for XDG_DATA_HOME and XDG_CONFIG_HOME mimic those from tests/test_util.fish.
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
test_low_level: fish_tests $(call filter_up_to,test_low_level,$(active_test_goals))
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v rm -rf test/data test/home
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
$(MKDIR_P) test/data test/home
don't let low level tests pollute user home dir Fixes #3228
2016-07-14 05:46:46 +00:00
env XDG_DATA_HOME=test/data XDG_CONFIG_HOME=test/home ./fish_tests
Cleanup fish tests a bit Split `make test` into two targets `make test_low_level` and `make test_fishscript`, primarily so fishscript tests can be rechecked quickly after edits. Reformat the test.fish file and update some of the code to be a little more straightforward (e.g. `if not cmd` instead of `if cmd; else`).
2014-09-05 05:26:10 +00:00
.PHONY: test_low_level
fix `make test_high_level` so it works
2017-04-26 04:18:14 +00:00
test_high_level: DESTDIR = $(PWD)/test/root/
test_high_level: prefix = .
fix bug in `env_get()` involving empty vars My previous change to eliminate `class var_entry_t` caused me to notice that `env_get()` turned a set but empty var into a missing var. Which is wrong. Fixing that brought to light several other pieces of code that were wrong as a consequence of the aforementioned bug. Another step to fixing issue #4200.
2017-08-09 18:11:58 +00:00
test_high_level: test-prep install-force test_fishscript test_interactive test_invocation
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
.PHONY: test_high_level
Add test harness for fish command invocation, and tests for init command. The new '-C' initial command needs some tests, and as there are no tests just yet for the command invocation, this change adds a harness and calls it from the high-level tests in the Makefile. The tests are similar in style to the other high level tests, in that we capture the output and compare it to that which we expect. The harness itself is written in bash - sorry - because we're testing the fish shell's invocation, and trying to do that with the fish we've just built wouldn't actually make for a very useful test when things go wrong. The 'tests/invocation.sh' script can be executed manually, or as part of the 'make test' target, to make it easy to use both as part of the development and as part of automation. The harness has only been tested on linux with bash 4.3.11, and requires grep and sed. Although not tested with OS X, I believe I have avoided the syntax which is inconsistent. The tests added here cover just the initial command's basic execution, and when it is mixed with the regular '-c' command.
2017-06-29 15:11:58 +00:00
test_invocation: $(call filter_up_to,test_invocation,$(active_test_goals))
cd tests; ./invocation.sh
.PHONY: test_invocation
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
test_fishscript: $(call filter_up_to,test_fishscript,$(active_test_goals))
cd tests; ../test/root/bin/fish test.fish
Cleanup fish tests a bit Split `make test` into two targets `make test_low_level` and `make test_fishscript`, primarily so fishscript tests can be rechecked quickly after edits. Reformat the test.fish file and update some of the code to be a little more straightforward (e.g. `if not cmd` instead of `if cmd; else`).
2014-09-05 05:26:10 +00:00
.PHONY: test_fishscript
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
test_interactive: $(call filter_up_to,test_interactive,$(active_test_goals))
cd tests; ../test/root/bin/fish interactive.fish
Rejigger test suite Split test_interactive off from test_fishscript and add a new target test_high_level that tests both. Add some Makefile magic so the tests can be run serially without using sub-make, which gets rid of a little noise from the make output. Rewrite interactive tests to look better.
2014-09-23 23:29:36 +00:00
.PHONY: test_interactive
Add test harness for fish command invocation, and tests for init command. The new '-C' initial command needs some tests, and as there are no tests just yet for the command invocation, this change adds a harness and calls it from the high-level tests in the Makefile. The tests are similar in style to the other high level tests, in that we capture the output and compare it to that which we expect. The harness itself is written in bash - sorry - because we're testing the fish shell's invocation, and trying to do that with the fish we've just built wouldn't actually make for a very useful test when things go wrong. The 'tests/invocation.sh' script can be executed manually, or as part of the 'make test' target, to make it easy to use both as part of the development and as part of automation. The harness has only been tested on linux with bash 4.3.11, and requires grep and sed. Although not tested with OS X, I believe I have avoided the syntax which is inconsistent. The tests added here cover just the initial command's basic execution, and when it is mixed with the regular '-c' command.
2017-06-29 15:11:58 +00:00
Add table of contents to begining of documentation. This involves some restructuring of the documentation files. darcs-hash:20061031153614-ac50b-7a6e97e30ae759591028227466e76c574b931fd5.gz
2006-10-31 15:36:14 +00:00
#
# commands.hdr collects documentation on all commands, functions and
# builtins
#
Factor out script to build commands.hdr As part of factoring out the documentation building parts of the fish build, add a new file build_commands_hdr.sh that builds the commands.hdr file. Invoke it from both the Makefile and CMake build.
2017-09-17 22:01:15 +00:00
doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in build_tools/build_commands_hdr.sh
build_tools/build_commands_hdr.sh ${HELP_SRC} < doc_src/commands.hdr.in > $@
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
Factor out script to build index.hdr As part of factoring out the documentation building parts of the fish build, add a new file build_index_hdr.sh that builds the index.hdr file. Invoke it from both the Makefile and CMake build.
2017-10-05 06:18:52 +00:00
toc.txt: $(HDR_FILES:index.hdr=index.hdr.in) build_tools/build_toc_txt.sh | show-SED
FISH_BUILD_VERSION=${FISH_BUILD_VERSION} build_tools/build_toc_txt.sh \
$(HDR_FILES:index.hdr=index.hdr.in) > toc.txt
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
doc_src/index.hdr: toc.txt doc_src/index.hdr.in | show-AWK
Makefile.in: fix output alignment spacing
2016-11-20 22:38:02 +00:00
@echo " AWK CAT $(em)$@$(sgr0)"
Factor out script to build index.hdr As part of factoring out the documentation building parts of the fish build, add a new file build_index_hdr.sh that builds the index.hdr file. Invoke it from both the Makefile and CMake build.
2017-10-05 04:20:32 +00:00
$v build_tools/build_index_hdr.sh toc.txt < $@.in > $@
Add table of contents to begining of documentation. This involves some restructuring of the documentation files. darcs-hash:20061031153614-ac50b-7a6e97e30ae759591028227466e76c574b931fd5.gz
2006-10-31 15:36:14 +00:00
Documentation update Rework for Doxygen >1.8. Moved large parts of the documentation to a simplified format, making use of Markdown enhancements and fixing bad long options.
2014-08-01 02:37:32 +00:00
#
# Compile Doxygen Input Filter from the lexicon. This is an executable sed
# script as Doxygen opens it via popen()(3) Input (doc.h) is piped through and
# matching words inside /fish../endfish blocks are marked up, contextually,
# with custom Doxygen commands in the form of @word_type{content}. These are
# trapped by ALIASES in the various Doxyfiles, allowing the content to be
# transformed depending on output type (HTML, man page, developer docs). In
# HTML, a style context can be applied through the /fish{style} block and
# providing suitable CSS in user_doc.css.in
#
Factor out building lexicon_filter into separate script This adds a new script build_tools/build_lexicon_filter.sh that builds the lexicon filter. It is factored out from the Makefile, and both the Makefile and CMake build invoke it.
2017-09-12 05:58:49 +00:00
lexicon_filter: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES) \
lexicon_filter.in build_tools/build_lexicon_filter.sh \
share/functions/__fish_config_interactive.fish
$v build_tools/build_lexicon_filter.sh share/functions/ share/completions/ < lexicon_filter.in > $@
$v chmod a+x lexicon_filter
Add table of contents to begining of documentation. This involves some restructuring of the documentation files. darcs-hash:20061031153614-ac50b-7a6e97e30ae759591028227466e76c574b931fd5.gz
2006-10-31 15:36:14 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# doc.h is a compilation of the various snipptes of text used both for
# the user documentation and for internal help functions into a single
Documentation update Rework for Doxygen >1.8. Moved large parts of the documentation to a simplified format, making use of Markdown enhancements and fixing bad long options.
2014-08-01 02:37:32 +00:00
# file that can be parsed by Doxygen to generate the user
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# documentation.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Simplify documentation building - again. darcs-hash:20061122185333-ac50b-078910540c33e18265c7d5804d1f14f241ad597f.gz
2006-11-22 18:53:33 +00:00
doc.h: $(HDR_FILES)
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " HDR_FILES $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v cat $(HDR_FILES) >$@
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# This rule creates complete doxygen headers from each of the various
# snipptes of text used both for the user documentation and for
# internal help functions, that can be parsed to Doxygen to generate
# the internal help function text.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
%.doxygen:%.txt
Makefile.in: fix output alignment spacing
2016-11-20 22:38:02 +00:00
@echo " cat * $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v echo "/** \page " `basename $*` >$@;
$v cat $*.txt >>$@;
$v echo "*/" >>$@
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Rebuild fish.pc as appropriate Re-running ./configure will cause fish.pc to rebuild, in case any of the paths changed. It looks like this actually won't rebuild the rest of fish, but figuring out how to handle that is out of scope for this commit. More importantly, this will rebuild fish.pc when the version string changes.
2014-10-07 02:02:43 +00:00
# Depend on Makefile because I don't see a better way of rebuilding
# if any of the paths change.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
%: %.in Makefile FISH-BUILD-VERSION-FILE | show-prefix show-sysconfdir show-docdir show-extra_completionsdir show-extra_functionsdir show-extra_confdir show-prefix show-FISH_BUILD_VERSION
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " SED $(em)$@$(sgr0)"
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(SED) <$< >$@ \
Tweak Makefile, including fixing slight dependency problem darcs-hash:20061111105314-ac50b-69703cc2575856a321515aa0554e97d1895a4606.gz
2006-11-11 10:53:14 +00:00
-e "s,@sysconfdir\@,$(sysconfdir),g" \
-e "s,@datadir\@,$(datadir),g" \
-e "s,@docdir\@,$(docdir),g" \
Customisable extra configuration, completion and function directories - 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
2016-04-04 06:33:35 +00:00
-e "s,@extra_completionsdir\@,$(extra_completionsdir),g" \
-e "s,@extra_functionsdir\@,$(extra_functionsdir),g" \
Rename "snippets" to "conf" internally, and document them as snippets Discussed in #2896.
2016-04-05 14:22:12 +00:00
-e "s,@extra_confdir\@,$(extra_confdir),g" \
Tweak Makefile, including fixing slight dependency problem darcs-hash:20061111105314-ac50b-69703cc2575856a321515aa0554e97d1895a4606.gz
2006-11-11 10:53:14 +00:00
-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
-e "s,@prefix\@,$(prefix),g" \
fish.pc: add pkgconfig file for fish Assists other packages in finding the path to install completions: call `pkg-config --variable=completionsdir fish` or so (like bash-completion). As discussed in #1485.
2014-10-01 14:02:55 +00:00
-e "s,@fish_build_version\@,$(FISH_BUILD_VERSION),g" \
Initialize etc/fish and share/fish from the Makefile, not automatically by Autoconf. That way we get correct expansion of ${prefix} and friends to their install-time value. This fixes a bug reported by James Vega. darcs-hash:20060718164155-ac50b-8ec6c63d9c4e52db2c1884fcffeab78333367773.gz
2006-07-18 16:41:55 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
improve detection of msgs to be translated This change does several things. First, it works around a quirk of the `xgetttext` command that only recognizes description strings in even numbered position on the command. Second, it allows descriptions introduced by the `-d` short flag to be recognized. More importantly, it normalizes the strings so that `xgettext` correctly extracts them into the *.po file. Prior to this change many fish script strings were ignored due to how they were written (e.g., single versus double quotes). Fixes #4073
2017-05-28 05:13:18 +00:00
# Compile translation files to binary format.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Hopefully the last attempt at fixing the build rules for making .po and .gmo files darcs-hash:20060123174742-ac50b-194561d756a9f3d78e1aeffe16e6c4d7c81593fe.gz
2006-01-23 17:47:42 +00:00
%.gmo:
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " msgfmt $(em)$@$(sgr0)"
improve detection of msgs to be translated This change does several things. First, it works around a quirk of the `xgetttext` command that only recognizes description strings in even numbered position on the command. Second, it allows descriptions introduced by the `-d` short flag to be recognized. More importantly, it normalizes the strings so that `xgettext` correctly extracts them into the *.po file. Prior to this change many fish script strings were ignored due to how they were written (e.g., single versus double quotes). Fixes #4073
2017-05-28 05:13:18 +00:00
$v msgfmt --use-fuzzy -o $@ $*.po
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
# Update existing po file or copy messages.pot
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Hopefully the last attempt at fixing the build rules for making .po and .gmo files darcs-hash:20060123174742-ac50b-194561d756a9f3d78e1aeffe16e6c4d7c81593fe.gz
2006-01-23 17:47:42 +00:00
%.po:messages.pot
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " msgmerge $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v if test -f $*.po; then \
Makefile: check HAVE_GETTEXT in Makefile not shell Tidy up the handling of gettext/non-gettext builds a bit
2014-11-17 09:27:25 +00:00
msgmerge -U --backup=existing $*.po messages.pot;\
else \
cp messages.pot $*.po;\
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
fi
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
# Create a template translation object
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
improve detection of msgs to be translated This change does several things. First, it works around a quirk of the `xgetttext` command that only recognizes description strings in even numbered position on the command. Second, it allows descriptions introduced by the `-d` short flag to be recognized. More importantly, it normalizes the strings so that `xgettext` correctly extracts them into the *.po file. Prior to this change many fish script strings were ignored due to how they were written (e.g., single versus double quotes). Fixes #4073
2017-05-28 05:13:18 +00:00
messages.pot: fish $(wildcard src/*.cpp src/*.h share/completions/*.fish share/functions/*.fish)
Makefile.in: fix output alignment spacing
2016-11-20 22:38:02 +00:00
@echo " xgettext $(em)$@$(sgr0)"
improve detection of msgs to be translated This change does several things. First, it works around a quirk of the `xgetttext` command that only recognizes description strings in even numbered position on the command. Second, it allows descriptions introduced by the `-d` short flag to be recognized. More importantly, it normalizes the strings so that `xgettext` correctly extracts them into the *.po file. Prior to this change many fish script strings were ignored due to how they were written (e.g., single versus double quotes). Fixes #4073
2017-05-28 05:13:18 +00:00
$v xgettext -k -k_ -kN_ -LC++ --no-wrap -o messages.pot src/*.cpp src/*.h
$v rm -rf /tmp/fish
$v ./fish build_tools/fish_xgettext.fish
$v xgettext -j -k -kN_ -LShell --from-code=UTF-8 -cDescription --no-wrap -o messages.pot /tmp/fish/explicit/share/*.fish /tmp/fish/explicit/share/*/*.fish
$v xgettext -j -k -kN_ -LShell --from-code=UTF-8 -cDescription --no-wrap -o messages.pot /tmp/fish/implicit/share/*.fish /tmp/fish/implicit/share/*/*.fish
$v rm -rf /tmp/fish
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
Makefile: improve integration with pcre2 build Work on #2446
2015-10-02 07:29:08 +00:00
ifdef EXTRA_PCRE2
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
src/builtin_string.cpp: $(PCRE2_H)
Makefile: improve integration with pcre2 build Work on #2446
2015-10-02 07:29:08 +00:00
endif
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
#ifdef EXTRA_MUPARSER
#src/env.cpp: $(MUPARSER_H)
#endif
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# Generate the internal help functions by making doxygen create
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-17 16:24:38 +00:00
# man-pages. The convertion path looks like this:
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
#
# .txt file
# ||
# (make)
# ||
# \/
# .doxygen file
# ||
# (doxygen)
# ||
# \/
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-17 16:24:38 +00:00
# roff file
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# ||
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-17 16:24:38 +00:00
# (__fish_print_help)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# ||
# \/
remove trialing spaces #2
2010-09-18 02:18:26 +00:00
# formated text
# with escape
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
# sequences
#
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-17 16:24:38 +00:00
#
# There ought to be something simpler.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
share/man: $(HELP_SRC) lexicon_filter | show-FISH_BUILD_VERSION show-SED
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
-$v $(MKDIR_P) share/man
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " doxygen $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v touch share/man
-$v rm -Rf share/man/man1
Additional work on building docs with CMake
2017-10-05 04:30:20 +00:00
$v echo "$(dim)" && FISH_BUILD_VERSION=${FISH_BUILD_VERSION} INPUT_FILTER=./lexicon_filter \
build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share;
Major restructuring of the buildsystem, meaning that the documentation doesn't needlessly rebuild itself, and the size of the fish binary drops slightly darcs-hash:20060613134328-ac50b-05ae75eb5cc081b680f38e8866fac00a679cc266.gz
2006-06-13 13:43:28 +00:00
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
#
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
# The build rules for installing/uninstalling fish
#
Change Makefile to not delete legacy binaries, but instead just notify the user about them. Change Makefile to only look for legacy binaries in $PREFIX instead of using which. https://github.com/fish-shell/fish-shell/pull/655
2013-04-12 20:46:27 +00:00
check-legacy-binaries:
Make: improve readability for black-on-white terms
2016-08-09 13:06:09 +00:00
@echo "Checking for legacy binaries..."
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v KR_LOC=$(prefix)/bin/key_reader;\
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
if test -x "$$KR_LOC" && env TERM=dumb "$$KR_LOC" cr | grep -q 26; then\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo "$(red)A key_reader binary was found. You might want to remove this, and use 'fish_key_reader':";\
echo " '$$KR_LOC'$(sgr0)";\
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
fi;
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v SEQLOC=$(prefix)/bin/seq;\
Change Makefile to not delete legacy binaries, but instead just notify the user about them. Change Makefile to only look for legacy binaries in $PREFIX instead of using which. https://github.com/fish-shell/fish-shell/pull/655
2013-04-12 20:46:27 +00:00
if test -f "$$SEQLOC" && grep -q '\(^#!/.*/fish\|^#!/usr/bin/env fish\)' "$$SEQLOC"; then\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo "$(red)An outdated seq from a previous fish install was found. You should remove it with:";\
echo " rm '$$SEQLOC'$(sgr0)";\
Change Makefile to not delete legacy binaries, but instead just notify the user about them. Change Makefile to only look for legacy binaries in $PREFIX instead of using which. https://github.com/fish-shell/fish-shell/pull/655
2013-04-12 20:46:27 +00:00
fi;
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v SETCOLOR_LOC=$(prefix)/bin/set_color;\
Teach fish how to clean up installed versions of set_color
2013-02-15 23:38:08 +00:00
if test -x "$$SETCOLOR_LOC" && $$SETCOLOR_LOC -v 2>&1 >/dev/null | grep -q "^set_color, version "; then\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo "$(red)An outdated set_color from a previous fish install was found. You should remove it with:";\
echo " rm '$$SETCOLOR_LOC'$(sgr0)";\
Change Makefile to not delete legacy binaries, but instead just notify the user about them. Change Makefile to only look for legacy binaries in $PREFIX instead of using which. https://github.com/fish-shell/fish-shell/pull/655
2013-04-12 20:46:27 +00:00
fi;
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v MIMEDB_LOC=$(prefix)/bin/mimedb;\
Makefile: Add mimedb and fishd to check-legacy-binaries target
2015-07-24 07:56:21 +00:00
if test -x "$$MIMEDB_LOC" && $$MIMEDB_LOC --version 2>&1 | grep -q "^mimedb, version "; then\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo "$(red)An outdated mimedb binary from a previous fish install was found. You should remove it with:";\
echo " rm '$$MIMEDB_LOC'$(sgr0)";\
Makefile: Add mimedb and fishd to check-legacy-binaries target
2015-07-24 07:56:21 +00:00
fi;
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v FISHD_LOC=$(prefix)/bin/fishd;\
Makefile: Add mimedb and fishd to check-legacy-binaries target
2015-07-24 07:56:21 +00:00
if test -x "$$FISHD_LOC" && $$FISHD_LOC --version 2>&1 | grep -q "^fishd: fishd, version "; then\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo "$(red)An outdated fishd binary from a previous fish install was found. You should remove it with:";\
echo " rm '$$FISHD_LOC'$(sgr0)";\
Makefile: Add mimedb and fishd to check-legacy-binaries target
2015-07-24 07:56:21 +00:00
fi;
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v true;
Change Makefile to not delete legacy binaries, but instead just notify the user about them. Change Makefile to only look for legacy binaries in $PREFIX instead of using which. https://github.com/fish-shell/fish-shell/pull/655
2013-04-12 20:46:27 +00:00
.PHONY: check-legacy-binaries
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
install: all install-force | check-legacy-binaries
Delete trailing spaces
2017-01-15 22:51:10 +00:00
@echo
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(bo)fish is now installed on your system.$(sgr0)"
@echo "To run fish, type $(bo)$(green)fish$(sgr0) in your terminal."
@echo "$(T_YELLOW)Even if you are already in fish, you should now start a new fish session.$(sgr0)"
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
@echo
@if type chsh >/dev/null 2>&1; then \
echo To use fish as your login shell:; \
Add instructions on appending to /etc/shells Print the command to append safely to /etc/shells with sudo and tee upon completion of `make install`.
2017-10-25 21:34:17 +00:00
grep -q -- "$(DESTDIR)$(bindir)/fish" /etc/shells || echo -e " * add the line '$(DESTDIR)$(bindir)/fish' to the file '/etc/shells':" \
"\n echo '$(DESTDIR)$(bindir)/fish' | sudo tee -a /etc/shells > /dev/null"; \
Make instructions after `make install` more uniformly formatted Fixed indentation and quoting to match between all three commands printed after `make install`
2017-09-24 18:58:13 +00:00
echo " * run '$(yellow)chsh -s $(DESTDIR)$(bindir)/fish$(sgr0)'"; \
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
echo; \
fi;
@if type chcon >/dev/null 2>&1; then \
echo If you have SELinux enabled, you may need to manually update the security policy:; \
Make instructions after `make install` more uniformly formatted Fixed indentation and quoting to match between all three commands printed after `make install`
2017-09-24 18:58:13 +00:00
echo \ \* use the command \'chcon -t shell_exec_t $(DESTDIR)$(bindir)/fish\'; \
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
echo; \
fi;
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "To set your colors, run $(green)$(bo)fish_config$(sgr0)"
@echo "To scan your man pages for completions, run $(green)$(bo)fish_update_completions$(sgr0)"
@echo "To accept autosuggestions (in $(dim)grey$(sgr0)) as you type, hit $(bo)ctrl-F$(sgr0) or right arrow key."
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
@echo
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(bo)Have fun! <><$(sgr0)"
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
.PHONY: install
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
Added xcodebuild target in Makefile
2012-12-02 04:05:35 +00:00
#
# Xcode install
#
xcode-install:
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
rm -Rf /tmp/fish_build
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
xcrun xcodebuild install DSTROOT=/tmp/fish_build
Fix the ditto command in make xcode-install
2017-05-23 23:57:17 +00:00
ditto /tmp/fish_build /
Added xcodebuild target in Makefile
2012-12-02 04:05:35 +00:00
.PHONY: xcode-install
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
# Actually do the installation.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Extract doc install into a separate target install-doc This way people who install via Xcode can run `make install-doc` to get the documentation pages, as Xcode doesn't include them.
2017-05-23 23:57:26 +00:00
install-force: all install-translations install-doc | show-datadir show-sysconfdir show-extra_completionsdir show-extra_functionsdir show-extra_confdir show-mandir
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
$v for i in $(PROGRAMS); do\
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir);\
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
echo " Installing $(bo)$$i$(sgr0)";\
Changed the Makefile to no longer fail if man pages are missing, etc.
2012-02-10 00:36:35 +00:00
true ;\
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
done;
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo "Creating sysconfdir tree"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d
$v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo "Creating datadir tree"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
workaround broken groff man page config Fixes #2673
2016-10-19 20:35:30 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/groff
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man/man1
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/js
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/partials
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
$v $(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/
$v $(INSTALL) -m 644 share/__fish_build_paths.fish $(DESTDIR)$(datadir)/fish/
$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/pkgconfig
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
@echo "Creating placeholder vendor/'extra_' directories"
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
-$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
-$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
-$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo "Installing pkgconfig file"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig
Fix "libraryn" typo
2016-09-20 00:18:43 +00:00
@echo "Installing the $(bo)fish completion library$(sgr0)...";
Use one invocation of $INSTALL instead of looping Speed up our Makefile by using $INSTALL once per type of file, rather than passing them individually.
2017-01-22 01:39:00 +00:00
$v $(INSTALL) -m 644 $(COMPLETIONS_DIR_FILES:%='%') $(DESTDIR)$(datadir)/fish/completions/
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Installing $(bo)fish functions$(sgr0)";
Use one invocation of $INSTALL instead of looping Speed up our Makefile by using $INSTALL once per type of file, rather than passing them individually.
2017-01-22 01:39:00 +00:00
$v $(INSTALL) -m 644 $(FUNCTIONS_DIR_FILES:%='%') $(DESTDIR)$(datadir)/fish/functions/
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Installing $(bo)man pages$(sgr0)";
workaround broken groff man page config Fixes #2673
2016-10-19 20:35:30 +00:00
$v $(INSTALL) -m 644 share/groff/* $(DESTDIR)$(datadir)/fish/groff/
Makefile: use recursively expanded variable for the list of manpages Restores the installation of manual pages when running `make install` without running `make` first, a bug introduced with 417255fc. Closes #3813.
2017-02-05 05:27:48 +00:00
$v test -z "$(wildcard share/man/man1/*.1)" || $(INSTALL) -m 644 $(filter-out $(addprefix share/man/man1/, $(CONDEMNED_PAGES)), $(wildcard share/man/man1/*.1)) $(DESTDIR)$(datadir)/fish/man/man1/
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
@echo "Installing helper tools";
Use one invocation of $INSTALL instead of looping Speed up our Makefile by using $INSTALL once per type of file, rather than passing them individually.
2017-01-22 01:39:00 +00:00
$v $(INSTALL) -m 755 share/tools/*.py $(DESTDIR)$(datadir)/fish/tools/
$v $(INSTALL) -m 644 share/tools/web_config/*.* $(DESTDIR)$(datadir)/fish/tools/web_config/
$v $(INSTALL) -m 644 share/tools/web_config/js/*.* $(DESTDIR)$(datadir)/fish/tools/web_config/js/
$v $(INSTALL) -m 644 share/tools/web_config/partials/* $(DESTDIR)$(datadir)/fish/tools/web_config/partials/
$v $(INSTALL) -m 644 share/tools/web_config/sample_prompts/*.fish $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts/
$v $(INSTALL) -m 755 share/tools/web_config/*.py $(DESTDIR)$(datadir)/fish/tools/web_config/
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo "Installing more man pages";
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1;
$v for i in $(MANUALS); do \
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
Changed the Makefile to no longer fail if man pages are missing, etc.
2012-02-10 00:36:35 +00:00
true; \
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
done;
Install custom LSS script to /usr/local/share/fish on make install Decided to move doc_src/fish.lss to share/lynx.lss, which just makes more sense all around. Accordingly, now using {$__fish_datadir} instead of {$__fish_help_dir} in help.fish. Makefile now installs the custom lss on make install
2017-09-26 19:31:11 +00:00
@echo "Installing miscellaneous helper resources";
$v $(INSTALL) -m 644 share/lynx.lss $(DESTDIR)$(datadir)/fish/
Minor edits to Makefile. A mistyped .PHONY was corrected, a few stray .o files are now properly removed by make clean, and the dependency list has been updated darcs-hash:20060420150028-ac50b-b3b6b04023f1c039d167e5f67c89cbbaa6bd0cdc.gz
2006-04-20 15:00:28 +00:00
.PHONY: install-force
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
# Uninstall this fish version
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show-datadir show-docdir show-mandir
@echo
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(bo)$(yellow)Uninstalling fish$(sgr0) from configured \$$prefix: $(bo)$(prefix)$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "In 5 seconds, $(red)all data$(sgr0) (includes functions, completions, tools) in"
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo $$'\t$(bo)$(DESTDIR)$(datadir)/fish$(sgr0) will be deleted!'
Delete trailing spaces
2017-01-15 22:51:10 +00:00
@echo
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "If you put things there, $(red)stop now!$(sgr0)"
@echo "$(bo)5$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@sleep 1
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "$(bo)4$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@sleep 1
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "$(bo)3$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@sleep 1
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "$(bo)2$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@sleep 1
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "$(bo)1$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@sleep 1
@echo ...
@sleep 2
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "... deleting $(bo)$(DESTDIR)$(datadir)/fish/*$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
-$v if test -d $(DESTDIR)$(datadir)/fish; then \
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
rm -rf $(DESTDIR)$(datadir)/fish; \
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
fi
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "Deleting programs: [ $(bo)$(PROGRAMS)$(sgr0) ] in $(em)$(bindir)$(sgr0)"
-$v for i in $(PROGRAMS); do \
rm -f $(DESTDIR)$(bindir)/$$i; \
done;
@echo "Deleting configuration: $(bo)$(DESTDIR)$(sysconfdir)/fish/*$(sgr0)"
-$v rm -rf $(DESTDIR)$(sysconfdir)/fish
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Deleting documentation: $(bo)$(DESTDIR)$(docdir)/*$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
-$v if test -d $(DESTDIR)$(docdir); then \
Large set of changes related to making fish relocatable, and improving the build and install story. - etc/config.fish and share/config.fish are now "universal" and no longer reference install paths or need to be touched by autotools. They've been removed from config.fish.in to config.fish. - fish now attempts to determine __fish_datadir and __fish_sysconfdir relative to the path of the fish executable itself (typically by walking up one directory). This means that you can copy the directory hierarchy around and things will still work. The compiled-in paths are used as a backup. - The fish Xcode project now can build fish natively, without needing autotools. - Version bumped to 2.0
2012-07-08 22:20:39 +00:00
rm -rf $(DESTDIR)$(docdir);\
Update of the makefile on how to handle the directory hierarchy transition darcs-hash:20060223153556-ac50b-4af8c2376a37c28f056b7fef37db3fb371a3e899.gz
2006-02-23 15:35:56 +00:00
fi
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "Deleting pkgconfig file: $(bo)$(DESTDIR)$(datadir)/pkgconfig/fish.pc$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
-$v if test -f $(DESTDIR)$(datadir)/pkgconfig/fish.pc; then \
Makefile: add pkgconfig file to uninstall target
2014-11-23 06:41:22 +00:00
rm -f $(DESTDIR)$(datadir)/pkgconfig/fish.pc;\
fi
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "Deleting [ $(bo)"$(notdir $(MANUALS))"$(sgr0) ] in $(em)$(mandir)/man1$(sgr0)"
-$v for i in $(notdir $(MANUALS)); do \
rm -f "$(DESTDIR)$(mandir)/man1/$$i" ;\
done
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo
Makefile: unbreak uninstall target Closes #4401.
2017-09-13 13:39:01 +00:00
@echo "$(green)Fish (likely) uninstalled$(sgr0)"
Improve make install and make uninstall experience Show the gist of what is going on during uninstall. I had overlooked the uninstall target, with it mislabled as having to do translations. Give make uninstall the full treatment here. In addition to showing what is going on, give the user a 5^H7 second warning before we blast away /usr/local/share/fish/ - it's not unthinkable they might have a script or two in there.
2016-09-09 05:26:40 +00:00
@echo
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(bo)./configure --prefix=$(sgr0) to uninstall fish from a different prefix"
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: uninstall
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT
support the LINGUAS variable by `make install` Fixes 3863
2017-02-22 04:49:34 +00:00
ifeq ($(HAVE_GETTEXT), 1)
Make: improve readability for black-on-white terms
2016-08-09 13:06:09 +00:00
@echo "Installing translations..."
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v for i in $(TRANSLATIONS); do \
Makefile: check HAVE_GETTEXT in Makefile not shell Tidy up the handling of gettext/non-gettext builds a bit
2014-11-17 09:27:25 +00:00
$(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \
$(INSTALL) -m 644 $$i $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \
done
endif
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: install-translations
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
uninstall-translations: show-DESTDIR show-localedir
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/fish.mo
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: uninstall-translations
Extract doc install into a separate target install-doc This way people who install via Xcode can run `make install-doc` to get the documentation pages, as Xcode doesn't include them.
2017-05-23 23:57:26 +00:00
install-doc: $(user_doc)
@echo "Installing online user documentation";
$v $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
$v for i in user_doc/html/* CHANGELOG.md; do \
if test -f $$i; then \
$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
fi; \
done;
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
#
# The build rules for all the commands
#
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 12:51:02 +00:00
Migrate source files into src/ directory This change moves source files into a src/ directory, and puts object files into an obj/ directory. The Makefile and xcode project are updated accordingly. Fixes #1866
2015-07-24 07:50:58 +00:00
#
# How basic files get compiled
#
Delete trailing spaces
2017-01-15 22:51:10 +00:00
obj/%.o: src/%.cpp | show-CXX show-CXXFLAGS show-CPPFLAGS obj
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " CXX $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
Migrate source files into src/ directory This change moves source files into a src/ directory, and puts object files into an obj/ directory. The Makefile and xcode project are updated accordingly. Fixes #1866
2015-07-24 07:50:58 +00:00
#
# obj directory
#
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
obj: | show-MKDIR_P
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
@echo " MKDIR_P $(em)$@$(sgr0)"
$v $(MKDIR_P) obj
Migrate source files into src/ directory This change moves source files into a src/ directory, and puts object files into an obj/ directory. The Makefile and xcode project are updated accordingly. Fixes #1866
2015-07-24 07:50:58 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Build the fish program.
#
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
fish: obj/fish.o $(FISH_OBJS) $(EXTRA_PCRE2) ${EXTRA_MUPARSER}
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " CXX LD $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) obj/fish.o $(LIBS) -o $@
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
$(PCRE2_LIB): $(PCRE2_H)
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " MAKE $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(MAKE) V=$(V) -C $(PCRE2_DIR) libpcre2-$(PCRE2_WIDTH).la
Makefile: improve integration with pcre2 build Work on #2446
2015-10-02 07:29:08 +00:00
$(PCRE2_H):
Makefile.in: fix output alignment spacing
2016-11-20 22:38:02 +00:00
@echo " autoconf $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v (cd $(PCRE2_DIR) && ./config.status)
Makefile: improve integration with pcre2 build Work on #2446
2015-10-02 07:29:08 +00:00
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
$(MUPARSER_LIB): $(MUPARSER_H)
@echo " MAKE $(em)$@$(sgr0)"
$v $(MAKE) V=$(V) -C $(MUPARSER_DIR) CPPFLAGS=-D_UNICODE=1 lib/libmuparser.a
$(MUPARSER_H):
@echo " autoconf $(em)$@$(sgr0)"
$v (cd $(MUPARSER_DIR) && ./config.status)
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
# Build the fish_tests program.
#
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
fish_tests: $(FISH_TESTS_OBJS) $(EXTRA_PCRE2) ${EXTRA_MUPARSER}
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " CXX LD $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_TESTS_OBJS) $(LIBS) -o $@
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
Add source code prettyfier program called fish_indent darcs-hash:20070422100312-ac50b-a073999b7dc172259c8200f3e740c921647222a0.gz
2007-04-22 10:03:12 +00:00
#
# Build the fish_indent program.
#
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
fish_indent: $(FISH_INDENT_OBJS) $(EXTRA_PCRE2) ${EXTRA_MUPARSER}
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " CXX LD $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@
Add source code prettyfier program called fish_indent darcs-hash:20070422100312-ac50b-a073999b7dc172259c8200f3e740c921647222a0.gz
2007-04-22 10:03:12 +00:00
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Delete trailing spaces
2017-01-15 22:51:10 +00:00
# Build the fish_key_reader program to show input from the terminal.
Code beutification in build files darcs-hash:20061031020656-ac50b-2385bb51d7df624e5691b7659120596600fd1d5d.gz
2006-10-31 02:06:56 +00:00
#
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
fish_key_reader: $(FISH_KEYREAD_OBJS) $(EXTRA_PCRE2) ${EXTRA_MUPARSER}
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo " CXX LD $(em)$@$(sgr0)"
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $^ $(LIBS) -o $@
Exportable universal variables darcs-hash:20050922201652-ac50b-f70e7607b4ace24da4020f2d432718dc335e5bdd.gz
2005-09-22 20:16:52 +00:00
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
#
# Update dependencies
Update 'depend' target so make depend works again This is very ugly because makedepend has no native support for building outside the source tree. It always wants to prepend 'src/' to the object file path. So instead we have to cons up a new source tree, with the sources files at the root, and run makedepend on that.
2015-07-25 22:15:54 +00:00
# Unfortunately makedepend cannot handle source files in one directory
# and object files in another. So we have to cons up a fake directory
# tree and run it there. Note that some .cpp files do not result in
# objects because they are #include'd directly. In that case we need to
# leave them in the 'header' directory, so they get picked up by the
# dependencies. So we put everything in the header directory and move out
# exactly the files that result in objects, leaving the #include'd files
# behind.
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
#
Delete trailing spaces
2017-01-15 22:51:10 +00:00
depend: | show-MKDIR_P
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
@echo " CXX LD $(em)$@$(sgr0)"
$v $(MKDIR_P) /tmp/fish_make_depend/src
# This is ran only once in a blue moon - full verbosity so we are reminded what it does.
Autotools build: teach it clang, utility macros Teach autotools about clang++. - Use AC macros for these utilities in Makefile: LN_S, MKDIR_P, AWK, GREP, FGREP. This has the effect on OS X with prefixed coreutils installed from macports: > make show-LN_S show-MKDIR_P show-AWK show-GREP LN_S = 'ln -s' MKDIR_P = '/opt/local/bin/gmkdir -p' AWK = 'awk' GREP = '/opt/local/bin/grep' FGREP = '/opt/local/bin/grep -F' - Use GNU Make findstrings, wildcard,notdir, - SHELL = @SHELL@ per reccomended practice and in line with actual behavior. - Add output for string wrangling steps
2016-09-16 01:37:37 +00:00
cp $(wildcard src/*.cpp src/*.h) /tmp/fish_make_depend/src
cp config.h /tmp/fish_make_depend/
mv $(subst obj/,/tmp/fish_make_depend/src/,$(FISH_ALL_OBJS:.o=.cpp)) /tmp/fish_make_depend/
cd /tmp/fish_make_depend && makedepend -f$(CURDIR)/Makefile.in -pobj/ -Y -Isrc *.cpp
rm -Rf /tmp/fish_make_depend
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v ./config.status
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: depend
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Makefile bug fixes, tweaks Fix problem with Makefile not escaping 'echo' correctly Support systems where 'tput' only works with termcap names Adjust output. Shade out most run-of-the-mill output so you can't miss warnigns and our status signposts amonst the .o files created.
2016-09-01 13:58:51 +00:00
# Lint the code. This only deals with C++
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# TODO - why not have the Makefile run lint.fish on actual files itself (generate a report target?)
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
add make targets to lint the code Fixes #2818
2016-04-01 23:28:36 +00:00
lint:
Enable C++11 in 'make lint' autotools implements C++11 support by setting $CXX to "g++ -std=c++11", so we have to make sure to quote $CXX when passing it to the linter script
2016-11-20 09:42:03 +00:00
$v build_tools/lint.fish "$(CXX)" $(CXXFLAGS) $(CPPFLAGS)
add make targets to lint the code Fixes #2818
2016-04-01 23:28:36 +00:00
lint-all:
Enable C++11 in 'make lint' autotools implements C++11 support by setting $CXX to "g++ -std=c++11", so we have to make sure to quote $CXX when passing it to the linter script
2016-11-20 09:42:03 +00:00
$v build_tools/lint.fish "$(CXX)" --all $(CXXFLAGS) $(CPPFLAGS)
add make targets to lint the code Fixes #2818
2016-04-01 23:28:36 +00:00
.PHONY: lint lint-all
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
support making fish code match the style guide This changes implements two new make targets: `style` and `style-all`. These make it easy to ensure that a change conforms to the project style guides for C++ and fish code. Fixes #571
2016-04-02 03:48:11 +00:00
# Run the code through the style refomatter. This handles both C++ files and
# fish scripts (*.fish).
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
support making fish code match the style guide This changes implements two new make targets: `style` and `style-all`. These make it easy to ensure that a change conforms to the project style guides for C++ and fish code. Fixes #571
2016-04-02 03:48:11 +00:00
style:
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v build_tools/style.fish
support making fish code match the style guide This changes implements two new make targets: `style` and `style-all`. These make it easy to ensure that a change conforms to the project style guides for C++ and fish code. Fixes #571
2016-04-02 03:48:11 +00:00
style-all:
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v build_tools/style.fish --all
make style targets in Makefile phony
2016-06-13 13:33:27 +00:00
.PHONY: style style-all
support making fish code match the style guide This changes implements two new make targets: `style` and `style-all`. These make it easy to ensure that a change conforms to the project style guides for C++ and fish code. Fixes #571
2016-04-02 03:48:11 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# Restore the source tree to the state right after extracting a tarball.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Add a distclean target to Makefile.in darcs-hash:20051103170348-344c5-9e8f20f2363ac031c8eeb991d01c58fde86fd33b.gz
2005-11-03 17:03:48 +00:00
distclean: clean
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
-$v test ! -f $(PCRE2_DIR)/Makefile || \
more builtin style cleanup
2017-06-15 05:12:29 +00:00
$(MAKE) V=$(V) -C $(PCRE2_DIR) distclean
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
-$v test ! -f $(MUPARSER_DIR)/Makefile || \
$(MAKE) V=$(V) -C $(MUPARSER_DIR) distclean
Teach `make distclean` to delete autom4te.cache aclocal.m4
2016-11-26 22:58:31 +00:00
$v rm -rf config.status config.log config.h Makefile autom4te.cache aclocal.m4
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: distclean
Add a distclean target to Makefile.in darcs-hash:20051103170348-344c5-9e8f20f2363ac031c8eeb991d01c58fde86fd33b.gz
2005-11-03 17:03:48 +00:00
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# Remove everything built by the Makefile, but not things that are created by
# the configure script.
Add table of contents to begining of documentation. This involves some restructuring of the documentation files. darcs-hash:20061031153614-ac50b-7a6e97e30ae759591028227466e76c574b931fd5.gz
2006-10-31 15:36:14 +00:00
#
make testing on local servers hermetic I noticed while fixing issue #2702 that the fish program being tested was sourcing config.fish files outside of the current build. This also happens when Travis CI runs the tests but isn't an issue there because of how Travis is configured to execute the tests. I also noticed that running `make test` was polluting my personal fish history; which will become a bigger problem if and when the fishd universal var file is moved from $XDG_CONFIG_HOME to $XDG_DATA_HOME. This change makes it possible for an individual to run the tests on their local machine secure in the knowledge that only the config.fish and related files from their git repository will be used and doing so won't pollute their personal fish history. Resolves #469
2016-02-07 02:08:22 +00:00
# Don't delete the docs unless we have Doxygen installed We provide pre-built
# docs in the tarball, and if they get deleted we won't be able to regenerate
# them.
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
#
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
clean:
mass-rename T_BLAH to cause less visual raucus "em" is italics "bo" is bold sgr0 is sgr0 red is red .. and so on in an arbitrary manner.
2016-09-16 06:40:54 +00:00
@echo "$(bo)Removing everything built by the Makefile...$(sgr0)"
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# PCRE's make clean has a few slightly annoying exceptions to the V= rule. If V=0
# send all output to /dev/null - unless there's an error, in which case run it again not silenced.
ifeq ($(V), 0 )
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
-@test ! -f $(PCRE2_DIR)/Makefile || \
more builtin style cleanup
2017-06-15 05:12:29 +00:00
$(MAKE) -C $(PCRE2_DIR) clean
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
-@test ! -f $(MUPARSER_DIR)/Makefile || \
$(MAKE) -C $(MUPARSER_DIR) clean
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
else
Get rid of all the ||: stuff in the Makefile Make has a built-in way of ignoring errors.
2017-05-23 23:57:24 +00:00
-@test ! -f $(PCRE2_DIR)/Makefile || \
more builtin style cleanup
2017-06-15 05:12:29 +00:00
$(MAKE) -s -C $(PCRE2_DIR) clean > /dev/null || \
$(MAKE) -s -C $(PCRE2_DIR) clean
Check-in MuParser source First step in fixing issue #3157 is to check-in the source code and hook it into our build system. The inclusion of the MuParser source adds the MIT License to those that apply to fish. Update our documentation to reflect that fact. The MuParser documentation is at http://beltoforion.de/article.php?a=muparser. The source was downloaded from https://github.com/beltoforion/muparser/releases. It is also hosted on Github, https://github.com/beltoforion/muparser/. I did not download it from Github because that source contained just a couple of cleanup changes which don't affect its behavior.
2017-08-22 22:34:41 +00:00
-@test ! -f $(MUPARSER_DIR)/Makefile || \
$(MAKE) -s -C $(MUPARSER_DIR) clean > /dev/null || \
$(MAKE) -s -C $(MUPARSER_DIR) clean
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
endif
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v rm -f obj/*.o *.o doc.h doc.tmp
$v rm -f doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
$v rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
$v rm -f $(PROGRAMS) fish_tests fish_key_reader
$v rm -f command_list.txt command_list_toc.txt toc.txt
$v rm -f doc_src/index.hdr doc_src/commands.hdr
$v rm -f lexicon_filter lexicon.txt lexicon.log
$v rm -f compile_commands.json xcodebuild.log
$v rm -f FISH-BUILD-VERSION-FILE fish.pc share/__fish_build_paths.fish
$v if test "$(HAVE_DOXYGEN)" = 1; then \
Fix for https://github.com/fish-shell/fish-shell/issues/79 Release tarballs with the user docs already build, removing the doxygen dependency
2012-07-10 02:41:51 +00:00
rm -rf doc user_doc share/man; \
fi
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
$v rm -f po/*.gmo
$v rm -rf obj build test
Fixes to api documentation, added .PHONY to makefile actions, made a few private functions static darcs-hash:20060123204014-ac50b-b9d2a10c7f00945b5d9d244cb3b8c1489fe280de.gz
2006-01-23 20:40:14 +00:00
.PHONY: clean
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 13:26:39 +00:00
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# For silent build
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# These rules need to stay at the end - $v won't work after this.
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# if V=0:
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# $v cmd ⇒ @cmd
Control Makefile verbosity level with V=. Instead of using @ directly most of the time, use $(v) which can be '' or @ controlled by V. Defaults to 0. make V=1 for a verbose make.
2016-07-18 20:48:15 +00:00
V0 := @
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
# if V=1
$(v)echo foo -> $v echo foo for verbosity modifier Not sure why I crammed $(v) up like that with the parens. This is a little sed job after regretting the Makefile seeming harder to read. Certainly better. We want clang or gcc picked for both C++/C Few final cleanups - time to feed it to Travis.
2016-09-16 06:55:02 +00:00
# $v cmd ⇒ cmd
quiet make builds: part two * Use the Makefile mechanism to also detect old key_reader binaries Don't tell them to delete it - just that they might want fkr. You'd have to of installed it manually. Not unhelpful to point that out here. * Remind folks to start a new fish session after install * Add output for installation during silent builds * Suppress "Fish has been built, use make install..." if fish was actually built with a goal of `make install' from the command-line already and it's already working on that. It can be confusing. * Get rid of the $(call) stuff for color usage Fixes problem with gucked up output when doing parallel builds * Brighten up output with more colors and fancy attributes. Works fine with TERM=dumb * Introduce show-VAR targets - with VAR being a variable name, adding this to the target list wherever you like will cause the pretty-printed VAR='VAR' output. Can also use MAKE show-FOO to quickly diagnose problems. * Put the -D macros in CPPFLAGS (C preprocessor flags) as God intended instead of MACROS. CPPFLAGS was already defined but empty - and MACROS was getting added to CXXFLAGS and used on every CXX invocation. * Addresss a handful of missed bits from the initial silent make merge. Like msgfmt output. * Fix config.status output being completely silenced even when it's re-running ./configure. * Work around annoyance with PCRE being perfectly quiet except a minority of the rm's during make clean.
2016-08-09 02:31:02 +00:00
V1 :=
Control Makefile verbosity level with V=. Instead of using @ directly most of the time, use $(v) which can be '' or @ controlled by V. Defaults to 0. make V=1 for a verbose make.
2016-07-18 20:48:15 +00:00
v = $(V$(V))
split builtin block into its own module
2017-06-13 01:22:57 +00:00
# DO NOT DELETE THIS LINE -- `make depend` depends on it.
Updated dependencies in Makefile.in
2012-01-05 22:10:02 +00:00
Run make depend!
2016-07-03 12:04:19 +00:00
obj/autoload.o: config.h src/autoload.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/autoload.o: src/signal.h src/env.h src/lru.h src/exec.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin.o: src/signal.h src/builtin_argparse.h src/builtin_bg.h
obj/builtin.o: src/builtin_bind.h src/builtin_block.h src/builtin_builtin.h
obj/builtin.o: src/builtin_cd.h src/builtin_command.h
obj/builtin.o: src/builtin_commandline.h src/builtin_complete.h
obj/builtin.o: src/builtin_contains.h src/builtin_disown.h src/builtin_echo.h
obj/builtin.o: src/builtin_emit.h src/builtin_exit.h src/builtin_fg.h
obj/builtin.o: src/builtin_functions.h src/builtin_history.h
obj/builtin.o: src/builtin_jobs.h src/builtin_math.h src/builtin_printf.h
obj/builtin.o: src/builtin_pwd.h src/builtin_random.h src/builtin_read.h
obj/builtin.o: src/builtin_realpath.h src/builtin_return.h src/builtin_set.h
obj/builtin.o: src/builtin_set_color.h src/builtin_source.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin.o: src/builtin_status.h src/builtin_string.h src/builtin_test.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin.o: src/builtin_ulimit.h src/complete.h src/exec.h src/intern.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin.o: src/io.h src/env.h src/parse_constants.h src/parse_util.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin.o: src/tokenizer.h src/parser.h src/event.h src/expand.h
obj/builtin.o: src/parse_tree.h src/proc.h src/reader.h src/highlight.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin.o: src/color.h src/wgetopt.h src/wutil.h
obj/builtin_argparse.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_argparse.o: src/signal.h src/builtin_argparse.h src/env.h
obj/builtin_argparse.o: src/exec.h src/io.h src/wgetopt.h src/wutil.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_bg.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_bg.o: src/signal.h src/builtin_bg.h src/io.h src/env.h src/proc.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_bg.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/builtin_bg.o: src/wutil.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/builtin_bind.o: config.h src/builtin.h src/common.h src/fallback.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_bind.o: src/signal.h src/builtin_bind.h src/input.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_bind.o: src/env.h src/wgetopt.h src/wutil.h
split builtin emit into its own module
2017-06-13 01:40:58 +00:00
obj/builtin_block.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_block.o: src/signal.h src/builtin_block.h src/event.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_block.o: src/env.h src/parser.h src/expand.h
obj/builtin_block.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
obj/builtin_block.o: src/proc.h src/wgetopt.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_builtin.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_builtin.o: src/signal.h src/builtin_builtin.h src/io.h src/env.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_builtin.o: src/wgetopt.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_cd.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_cd.o: src/signal.h src/builtin_cd.h src/env.h src/io.h
obj/builtin_cd.o: src/parser.h src/event.h src/expand.h src/parse_constants.h
obj/builtin_cd.o: src/parse_tree.h src/tokenizer.h src/proc.h src/path.h
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/builtin_cd.o: src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_command.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_command.o: src/signal.h src/builtin_command.h src/io.h src/env.h
obj/builtin_command.o: src/path.h src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_commandline.o: config.h src/builtin.h src/common.h src/fallback.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/builtin_commandline.o: src/signal.h src/input.h src/builtin_bind.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_commandline.o: src/io.h src/env.h src/parse_util.h
obj/builtin_commandline.o: src/parse_constants.h src/tokenizer.h src/proc.h
obj/builtin_commandline.o: src/parse_tree.h src/reader.h src/complete.h
obj/builtin_commandline.o: src/highlight.h src/color.h src/util.h
obj/builtin_commandline.o: src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_complete.o: config.h src/builtin.h src/common.h src/fallback.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/builtin_complete.o: src/signal.h src/complete.h src/env.h src/io.h
obj/builtin_complete.o: src/parse_constants.h src/parse_util.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_complete.o: src/tokenizer.h src/parser.h src/event.h src/expand.h
obj/builtin_complete.o: src/parse_tree.h src/proc.h src/reader.h
obj/builtin_complete.o: src/highlight.h src/color.h src/wgetopt.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_contains.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_contains.o: src/signal.h src/builtin_contains.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_contains.o: src/env.h src/wgetopt.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_disown.o: config.h src/signal.h src/builtin.h src/common.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_disown.o: src/fallback.h src/builtin_disown.h src/io.h src/env.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_disown.o: src/parser.h src/event.h src/expand.h
obj/builtin_disown.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/builtin_disown.o: src/proc.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_echo.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_echo.o: src/signal.h src/builtin_echo.h src/io.h src/env.h
obj/builtin_echo.o: src/wgetopt.h src/wutil.h
split builtin emit into its own module
2017-06-13 01:40:58 +00:00
obj/builtin_emit.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_emit.o: src/signal.h src/builtin_emit.h src/event.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_emit.o: src/env.h src/wutil.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_exit.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_exit.o: src/signal.h src/builtin_exit.h src/io.h src/env.h
obj/builtin_exit.o: src/proc.h src/parse_tree.h src/parse_constants.h
obj/builtin_exit.o: src/tokenizer.h src/reader.h src/complete.h
obj/builtin_exit.o: src/highlight.h src/color.h src/wgetopt.h src/wutil.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_fg.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_fg.o: src/signal.h src/builtin_fg.h src/env.h src/io.h src/proc.h
obj/builtin_fg.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/builtin_fg.o: src/reader.h src/complete.h src/highlight.h src/color.h
obj/builtin_fg.o: src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_function.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_function.o: src/signal.h src/builtin_function.h src/complete.h
obj/builtin_function.o: src/event.h src/function.h src/env.h src/io.h
obj/builtin_function.o: src/parser.h src/expand.h src/parse_constants.h
obj/builtin_function.o: src/parse_tree.h src/tokenizer.h src/proc.h
obj/builtin_function.o: src/parser_keywords.h src/wgetopt.h src/wutil.h
split builtin random into its own module
2017-06-13 05:26:24 +00:00
obj/builtin_functions.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_functions.o: src/signal.h src/builtin_functions.h src/env.h
obj/builtin_functions.o: src/event.h src/function.h src/io.h
obj/builtin_functions.o: src/parser_keywords.h src/proc.h src/parse_tree.h
obj/builtin_functions.o: src/parse_constants.h src/tokenizer.h src/wgetopt.h
obj/builtin_functions.o: src/wutil.h
obj/builtin_history.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_history.o: src/signal.h src/builtin_history.h src/history.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_history.o: src/wutil.h src/io.h src/env.h src/reader.h
obj/builtin_history.o: src/complete.h src/highlight.h src/color.h
split builtin random into its own module
2017-06-13 05:26:24 +00:00
obj/builtin_history.o: src/parse_constants.h src/wgetopt.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/builtin_jobs.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_jobs.o: src/signal.h src/io.h src/env.h src/proc.h
obj/builtin_jobs.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/builtin_jobs.o: src/wgetopt.h src/wutil.h
obj/builtin_math.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_math.o: src/signal.h src/builtin_math.h src/io.h src/env.h
obj/builtin_math.o: src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_printf.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_printf.o: src/signal.h src/io.h src/env.h src/wutil.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_pwd.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_pwd.o: src/signal.h src/builtin_pwd.h src/io.h src/env.h
obj/builtin_pwd.o: src/wutil.h
split builtin random into its own module
2017-06-13 05:26:24 +00:00
obj/builtin_random.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_random.o: src/signal.h src/builtin_random.h src/io.h src/env.h
obj/builtin_random.o: src/wutil.h
split builtin random into its own module
2017-06-13 05:26:24 +00:00
obj/builtin_read.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_read.o: src/signal.h src/builtin_read.h src/complete.h src/env.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_read.o: src/event.h src/highlight.h src/color.h src/history.h
obj/builtin_read.o: src/wutil.h src/io.h src/proc.h src/parse_tree.h
obj/builtin_read.o: src/parse_constants.h src/tokenizer.h src/reader.h
obj/builtin_read.o: src/wcstringutil.h src/wgetopt.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_realpath.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_realpath.o: src/signal.h src/builtin_realpath.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_realpath.o: src/env.h src/wutil.h
more builtin style cleanup
2017-06-15 05:12:29 +00:00
obj/builtin_return.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_return.o: src/signal.h src/builtin_return.h src/io.h src/env.h
obj/builtin_return.o: src/parser.h src/event.h src/expand.h
obj/builtin_return.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
obj/builtin_return.o: src/proc.h src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_set.o: config.h src/builtin.h src/common.h src/fallback.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/builtin_set.o: src/signal.h src/env.h src/expand.h src/parse_constants.h
obj/builtin_set.o: src/io.h src/proc.h src/parse_tree.h src/tokenizer.h
obj/builtin_set.o: src/wgetopt.h src/wutil.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/builtin_set_color.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_set_color.o: src/signal.h src/color.h src/env.h src/io.h
obj/builtin_set_color.o: src/output.h src/wgetopt.h src/wutil.h
run `make depend`
2017-06-14 05:20:58 +00:00
obj/builtin_source.o: config.h src/builtin.h src/common.h src/fallback.h
obj/builtin_source.o: src/signal.h src/builtin_source.h src/env.h
obj/builtin_source.o: src/intern.h src/io.h src/parser.h src/event.h
obj/builtin_source.o: src/expand.h src/parse_constants.h src/parse_tree.h
obj/builtin_source.o: src/tokenizer.h src/proc.h src/reader.h src/complete.h
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/builtin_source.o: src/highlight.h src/color.h src/wutil.h
split builtin random into its own module
2017-06-13 05:26:24 +00:00
obj/builtin_status.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_status.o: src/signal.h src/builtin_status.h src/io.h src/env.h
obj/builtin_status.o: src/parser.h src/event.h src/expand.h
obj/builtin_status.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
obj/builtin_status.o: src/proc.h src/wgetopt.h src/wutil.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/builtin_string.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_string.o: src/signal.h src/io.h src/env.h src/parse_util.h
obj/builtin_string.o: src/parse_constants.h src/tokenizer.h
obj/builtin_string.o: src/wcstringutil.h src/wgetopt.h src/wildcard.h
obj/builtin_string.o: src/complete.h src/expand.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_test.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_test.o: src/signal.h src/io.h src/env.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/builtin_ulimit.o: config.h src/builtin.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/builtin_ulimit.o: src/signal.h src/io.h src/env.h src/util.h
obj/builtin_ulimit.o: src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/color.o: config.h src/color.h src/common.h src/fallback.h src/signal.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/common.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
obj/common.o: src/expand.h src/parse_constants.h src/proc.h src/io.h
obj/common.o: src/parse_tree.h src/tokenizer.h src/wildcard.h src/complete.h
obj/common.o: src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/complete.o: config.h src/autoload.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/complete.o: src/signal.h src/env.h src/lru.h src/builtin.h src/complete.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/complete.o: src/exec.h src/expand.h src/parse_constants.h src/function.h
obj/complete.o: src/event.h src/iothread.h src/parse_tree.h src/tokenizer.h
obj/complete.o: src/parse_util.h src/parser.h src/proc.h src/io.h src/path.h
obj/complete.o: src/util.h src/wildcard.h src/wutil.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/env.o: config.h src/builtin_bind.h src/common.h src/fallback.h
obj/env.o: src/signal.h src/env.h src/env_universal_common.h src/wutil.h
obj/env.o: src/event.h src/expand.h src/parse_constants.h src/fish_version.h
obj/env.o: src/history.h src/input.h src/input_common.h src/output.h
obj/env.o: src/color.h src/path.h src/proc.h src/io.h src/parse_tree.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/env.o: src/tokenizer.h src/reader.h src/complete.h src/highlight.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/env.o: src/sanity.h src/screen.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/env_universal_common.o: config.h src/common.h src/fallback.h src/signal.h
obj/env_universal_common.o: src/env.h src/env_universal_common.h src/wutil.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/env_universal_common.o: src/path.h src/utf8.h src/util.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/event.o: config.h src/signal.h src/common.h src/fallback.h src/event.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/event.o: src/input_common.h src/io.h src/env.h src/parser.h src/expand.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/event.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
obj/event.o: src/proc.h src/wutil.h
obj/exec.o: config.h src/signal.h src/builtin.h src/common.h src/fallback.h
obj/exec.o: src/env.h src/exec.h src/function.h src/event.h src/io.h
obj/exec.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/exec.o: src/parser.h src/expand.h src/proc.h src/postfork.h src/reader.h
obj/exec.o: src/complete.h src/highlight.h src/color.h src/wutil.h
obj/expand.o: config.h src/common.h src/fallback.h src/signal.h
obj/expand.o: src/complete.h src/env.h src/exec.h src/expand.h
obj/expand.o: src/parse_constants.h src/iothread.h src/parse_util.h
obj/expand.o: src/tokenizer.h src/path.h src/proc.h src/io.h src/parse_tree.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/expand.o: src/wildcard.h src/wutil.h
Run make depend Some object file dependencies have changed.
2016-11-21 04:38:52 +00:00
obj/fallback.o: config.h src/signal.h src/common.h src/fallback.h src/util.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/fish.o: config.h src/builtin.h src/common.h src/fallback.h src/signal.h
obj/fish.o: src/env.h src/event.h src/expand.h src/parse_constants.h
obj/fish.o: src/fish_version.h src/function.h src/history.h src/wutil.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/fish.o: src/io.h src/parser.h src/parse_tree.h src/tokenizer.h src/proc.h
obj/fish.o: src/path.h src/reader.h src/complete.h src/highlight.h
obj/fish.o: src/color.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/fish_indent.o: config.h src/color.h src/common.h src/fallback.h
obj/fish_indent.o: src/signal.h src/env.h src/fish_version.h src/highlight.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/fish_indent.o: src/output.h src/parse_constants.h src/parse_tree.h
obj/fish_indent.o: src/tokenizer.h src/print_help.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/fish_key_reader.o: config.h src/signal.h src/common.h src/fallback.h
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/fish_key_reader.o: src/env.h src/fish_version.h src/input.h
obj/fish_key_reader.o: src/builtin_bind.h src/input_common.h src/print_help.h
obj/fish_key_reader.o: src/proc.h src/io.h src/parse_tree.h
obj/fish_key_reader.o: src/parse_constants.h src/tokenizer.h src/reader.h
obj/fish_key_reader.o: src/complete.h src/highlight.h src/color.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/fish_tests.o: config.h src/signal.h src/builtin.h src/common.h
obj/fish_tests.o: src/fallback.h src/color.h src/complete.h src/env.h
obj/fish_tests.o: src/env_universal_common.h src/wutil.h src/event.h
obj/fish_tests.o: src/expand.h src/parse_constants.h src/function.h
obj/fish_tests.o: src/highlight.h src/history.h src/input.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/fish_tests.o: src/builtin_bind.h src/input_common.h src/io.h
obj/fish_tests.o: src/iothread.h src/lru.h src/pager.h src/reader.h
obj/fish_tests.o: src/screen.h src/parse_tree.h src/tokenizer.h
obj/fish_tests.o: src/parse_util.h src/parser.h src/proc.h src/path.h
obj/fish_tests.o: src/utf8.h src/util.h src/wcstringutil.h src/wildcard.h
Manually update Makefile depends Temporary fix until the 'make depend' target can be sorted out
2015-07-25 20:23:18 +00:00
obj/fish_version.o: src/fish_version.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/function.o: config.h src/autoload.h src/common.h src/fallback.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/function.o: src/signal.h src/env.h src/lru.h src/event.h src/function.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/function.o: src/intern.h src/parser_keywords.h src/reader.h
obj/function.o: src/complete.h src/highlight.h src/color.h
obj/function.o: src/parse_constants.h src/wutil.h
obj/highlight.o: config.h src/builtin.h src/common.h src/fallback.h
obj/highlight.o: src/signal.h src/color.h src/env.h src/expand.h
obj/highlight.o: src/parse_constants.h src/function.h src/event.h
obj/highlight.o: src/highlight.h src/history.h src/wutil.h src/output.h
obj/highlight.o: src/parse_tree.h src/tokenizer.h src/parse_util.h src/path.h
obj/highlight.o: src/wildcard.h src/complete.h
obj/history.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
Don't use colors over 8 during builds T_DIM to only highlight the "important" CXX lines seems distracting. Use it only for the pages of output from re-running configure
2016-09-05 09:04:25 +00:00
obj/history.o: src/history.h src/wutil.h src/io.h src/iothread.h src/lru.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/history.o: src/parse_constants.h src/parse_tree.h src/tokenizer.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/history.o: src/parse_util.h src/path.h src/reader.h src/complete.h
obj/history.o: src/highlight.h src/color.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/input.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/input.o: src/event.h src/input.h src/builtin_bind.h src/input_common.h
obj/input.o: src/io.h src/parser.h src/expand.h src/parse_constants.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/input.o: src/parse_tree.h src/tokenizer.h src/proc.h src/reader.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/input.o: src/complete.h src/highlight.h src/color.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/input_common.o: config.h src/common.h src/fallback.h src/signal.h
obj/input_common.o: src/env.h src/env_universal_common.h src/wutil.h
obj/input_common.o: src/input_common.h src/iothread.h src/util.h
obj/intern.o: config.h src/common.h src/fallback.h src/signal.h src/intern.h
obj/io.o: config.h src/common.h src/fallback.h src/signal.h src/exec.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/io.o: src/io.h src/env.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/iothread.o: config.h src/signal.h src/common.h src/fallback.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/iothread.o: src/iothread.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/kill.o: config.h src/common.h src/fallback.h src/signal.h
obj/output.o: config.h src/color.h src/common.h src/fallback.h src/signal.h
obj/output.o: src/env.h src/output.h src/wutil.h
obj/pager.o: config.h src/common.h src/fallback.h src/signal.h src/complete.h
obj/pager.o: src/highlight.h src/color.h src/env.h src/pager.h src/reader.h
obj/pager.o: src/parse_constants.h src/screen.h src/util.h src/wutil.h
obj/parse_execution.o: config.h src/builtin.h src/common.h src/fallback.h
implement `argparse` builtin We've needed a fishy way to parse flags and arguments given to scripts and functions for a very long time. In particular a manner that provides the same behavior implemented by builtin commands. The long term goal is to support DocOpt. But since it is unclear when that will happen so this implements a `argparse` command. So named as homage to the excellent Python module of the same name. Fixes #4190
2017-07-07 21:32:41 +00:00
obj/parse_execution.o: src/signal.h src/builtin_function.h src/complete.h
obj/parse_execution.o: src/env.h src/event.h src/exec.h src/expand.h
obj/parse_execution.o: src/parse_constants.h src/function.h src/io.h
obj/parse_execution.o: src/parse_execution.h src/parse_tree.h src/tokenizer.h
obj/parse_execution.o: src/proc.h src/parse_util.h src/parser.h src/path.h
obj/parse_execution.o: src/reader.h src/highlight.h src/color.h src/util.h
obj/parse_execution.o: src/wildcard.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/parse_productions.o: config.h src/common.h src/fallback.h src/signal.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/parse_productions.o: src/parse_constants.h src/parse_productions.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/parse_productions.o: src/parse_tree.h src/tokenizer.h
obj/parse_tree.o: config.h src/common.h src/fallback.h src/signal.h
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-12 19:59:40 +00:00
obj/parse_tree.o: src/parse_constants.h src/parse_productions.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/parse_tree.o: src/parse_tree.h src/tokenizer.h src/proc.h src/io.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/parse_tree.o: src/env.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/parse_util.o: config.h src/builtin.h src/common.h src/fallback.h
obj/parse_util.o: src/signal.h src/expand.h src/parse_constants.h
obj/parse_util.o: src/parse_tree.h src/tokenizer.h src/parse_util.h
obj/parse_util.o: src/util.h src/wildcard.h src/complete.h src/wutil.h
obj/parser.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
obj/parser.o: src/event.h src/expand.h src/parse_constants.h src/function.h
obj/parser.o: src/intern.h src/parse_execution.h src/io.h src/parse_tree.h
obj/parser.o: src/tokenizer.h src/proc.h src/parse_util.h src/parser.h
obj/parser.o: src/reader.h src/complete.h src/highlight.h src/color.h
obj/parser.o: src/sanity.h src/wutil.h
obj/parser_keywords.o: config.h src/common.h src/fallback.h src/signal.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/parser_keywords.o: src/parser_keywords.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/path.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
obj/path.o: src/expand.h src/parse_constants.h src/path.h src/wutil.h
obj/postfork.o: config.h src/signal.h src/common.h src/fallback.h src/exec.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/postfork.o: src/io.h src/env.h src/iothread.h src/postfork.h src/proc.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/postfork.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/postfork.o: src/wutil.h
obj/print_help.o: config.h src/common.h src/fallback.h src/signal.h
Manually update Makefile depends Temporary fix until the 'make depend' target can be sorted out
2015-07-25 20:23:18 +00:00
obj/print_help.o: src/print_help.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/proc.o: config.h src/signal.h src/common.h src/fallback.h src/event.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/proc.o: src/io.h src/env.h src/output.h src/color.h src/parse_tree.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/proc.o: src/parse_constants.h src/tokenizer.h src/parser.h src/expand.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/proc.o: src/proc.h src/reader.h src/complete.h src/highlight.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/proc.o: src/sanity.h src/util.h src/wutil.h
obj/reader.o: config.h src/signal.h src/color.h src/common.h src/fallback.h
obj/reader.o: src/complete.h src/env.h src/event.h src/exec.h src/expand.h
obj/reader.o: src/parse_constants.h src/function.h src/highlight.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/reader.o: src/history.h src/wutil.h src/input.h src/builtin_bind.h
obj/reader.o: src/input_common.h src/intern.h src/io.h src/iothread.h
obj/reader.o: src/kill.h src/output.h src/pager.h src/reader.h src/screen.h
obj/reader.o: src/parse_tree.h src/tokenizer.h src/parse_util.h src/parser.h
obj/reader.o: src/proc.h src/sanity.h src/util.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/sanity.o: config.h src/common.h src/fallback.h src/signal.h src/history.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/sanity.o: src/wutil.h src/kill.h src/proc.h src/io.h src/env.h
obj/sanity.o: src/parse_tree.h src/parse_constants.h src/tokenizer.h
obj/sanity.o: src/reader.h src/complete.h src/highlight.h src/color.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/sanity.o: src/sanity.h
split builtin bind into its own module As part of putting the `bind` command code into its own module refactor how it parses its flags.
2017-06-13 00:19:13 +00:00
obj/screen.o: config.h src/common.h src/fallback.h src/signal.h src/env.h
obj/screen.o: src/highlight.h src/color.h src/output.h src/pager.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/screen.o: src/complete.h src/reader.h src/parse_constants.h src/screen.h
obj/screen.o: src/util.h
obj/signal.o: config.h src/signal.h src/common.h src/fallback.h src/event.h
Implement support for multiple math expressions The MuParser supports the concept of multiple expressions separated by commas. This implements support for that so that you can do things like this: set results (math '1+1, 4*2, 9^2')
2017-08-24 00:14:54 +00:00
obj/signal.o: src/proc.h src/io.h src/env.h src/parse_tree.h
obj/signal.o: src/parse_constants.h src/tokenizer.h src/reader.h
obj/signal.o: src/complete.h src/highlight.h src/color.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/tokenizer.o: config.h src/common.h src/fallback.h src/signal.h
obj/tokenizer.o: src/tokenizer.h src/wutil.h
Run make depend Some object file dependencies have changed.
2016-11-21 04:38:52 +00:00
obj/utf8.o: config.h src/common.h src/fallback.h src/signal.h src/utf8.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/util.o: config.h src/common.h src/fallback.h src/signal.h src/util.h
compile fallback.cpp and util.cpp seperately Don't `#include "*.cpp"` modules in other cpp modules. I already took care of all the builtin_*.cpp modules in my previous change where I restyled the builtin code. This change fixes the two remaining instances of this anti-pattern.
2016-04-27 21:56:46 +00:00
obj/util.o: src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/wcstringutil.o: config.h src/common.h src/fallback.h src/signal.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/wcstringutil.o: src/wcstringutil.h
Merge branch 'master' into iwyu
2015-07-26 02:20:13 +00:00
obj/wgetopt.o: config.h src/common.h src/fallback.h src/signal.h
obj/wgetopt.o: src/wgetopt.h src/wutil.h
Run make depend!
2016-07-03 12:04:19 +00:00
obj/wildcard.o: config.h src/common.h src/fallback.h src/signal.h
obj/wildcard.o: src/complete.h src/expand.h src/parse_constants.h
obj/wildcard.o: src/reader.h src/highlight.h src/color.h src/env.h
obj/wildcard.o: src/wildcard.h src/wutil.h
restyle builtin modules to match project style Now that the IWYU cleanup has been merged compile all, not just a couple, of the builtin modules independent of builtin.cpp. That is, no longer `#include builtin_NAME.cpp` in builtin.cpp. This is more consistent, more in line with what developers expect, and is likely to reduce mistakes. Reduces lint errors from 384 to 336 (-13%). Line count from 6307 to 4988 (-21%). Another step in resolving issue #2902.
2016-04-20 02:49:15 +00:00
obj/wutil.o: config.h src/common.h src/fallback.h src/signal.h src/wutil.h
Reference in a new issue Copy permalink