2005-12-01 20:26:41 +00:00
|
|
|
# The default target of this Makefile is...
|
2007-01-10 20:24:54 +00:00
|
|
|
all::
|
2005-12-01 20:26:41 +00:00
|
|
|
|
2007-03-06 07:09:14 +00:00
|
|
|
# Define V=1 to have a more verbose compile.
|
2007-03-06 06:35:01 +00:00
|
|
|
#
|
2008-03-05 15:46:13 +00:00
|
|
|
# Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf()
|
|
|
|
# or vsnprintf() return -1 instead of number of characters which would
|
|
|
|
# have been written to the final string if enough space had been available.
|
|
|
|
#
|
2008-02-09 02:32:47 +00:00
|
|
|
# Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
|
|
|
|
# when attempting to read from an fopen'ed directory.
|
|
|
|
#
|
2006-02-28 23:07:20 +00:00
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
|
|
|
# This also implies MOZILLA_SHA1.
|
2005-05-22 22:08:15 +00:00
|
|
|
#
|
2008-06-15 10:14:12 +00:00
|
|
|
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
|
2005-11-02 19:19:24 +00:00
|
|
|
# git-http-push are not built, and you cannot use http:// and https://
|
|
|
|
# transports.
|
2005-07-31 00:14:23 +00:00
|
|
|
#
|
2005-09-19 14:11:19 +00:00
|
|
|
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
#
|
2005-11-02 19:19:24 +00:00
|
|
|
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
|
|
|
# not built, and you cannot push using http:// and https:// transports.
|
|
|
|
#
|
2009-01-28 20:43:57 +00:00
|
|
|
# Define EXPATDIR=/foo/bar if your expat header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
#
|
2006-01-20 01:13:51 +00:00
|
|
|
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
|
|
|
|
#
|
2006-01-20 01:13:57 +00:00
|
|
|
# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
|
|
|
|
# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
|
|
|
|
#
|
2006-07-30 15:38:28 +00:00
|
|
|
# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
|
|
|
|
# do not support the 'size specifiers' introduced by C99, namely ll, hh,
|
|
|
|
# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
|
2006-08-04 15:55:58 +00:00
|
|
|
# some C compilers supported these specifiers prior to C99 as an extension.
|
2006-07-30 15:38:28 +00:00
|
|
|
#
|
2005-09-19 01:30:50 +00:00
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
|
|
|
#
|
2007-09-06 22:32:54 +00:00
|
|
|
# Define NO_MEMMEM if you don't have memmem.
|
|
|
|
#
|
2006-06-24 14:01:25 +00:00
|
|
|
# Define NO_STRLCPY if you don't have strlcpy.
|
|
|
|
#
|
2007-02-20 00:22:56 +00:00
|
|
|
# Define NO_STRTOUMAX if you don't have strtoumax in the C library.
|
|
|
|
# If your compiler also does not support long long or does not have
|
|
|
|
# strtoull, define NO_STRTOULL.
|
|
|
|
#
|
2005-12-02 23:08:28 +00:00
|
|
|
# Define NO_SETENV if you don't have setenv in the C library.
|
|
|
|
#
|
2008-01-18 01:03:51 +00:00
|
|
|
# Define NO_UNSETENV if you don't have unsetenv in the C library.
|
|
|
|
#
|
2007-10-20 20:03:49 +00:00
|
|
|
# Define NO_MKDTEMP if you don't have mkdtemp in the C library.
|
|
|
|
#
|
2008-01-24 18:34:46 +00:00
|
|
|
# Define NO_SYS_SELECT_H if you don't have sys/select.h.
|
|
|
|
#
|
2006-05-02 07:40:24 +00:00
|
|
|
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
|
|
|
# Enable it on Windows. By default, symrefs are still used.
|
2005-11-15 05:59:50 +00:00
|
|
|
#
|
2006-07-09 09:44:58 +00:00
|
|
|
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
|
2006-07-06 07:14:16 +00:00
|
|
|
# tests. These tests take up a significant amount of the total test time
|
|
|
|
# but are not needed unless you plan to talk to SVN repos.
|
|
|
|
#
|
2006-07-24 04:28:28 +00:00
|
|
|
# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
|
|
|
|
# installed in /sw, but don't want GIT to link against any libraries
|
|
|
|
# installed there. If defined you may specify your own (or Fink's)
|
|
|
|
# include directories and library directories by defining CFLAGS
|
|
|
|
# and LDFLAGS appropriately.
|
|
|
|
#
|
|
|
|
# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
|
|
|
|
# have DarwinPorts installed in /opt/local, but don't want GIT to
|
|
|
|
# link against any libraries installed there. If defined you may
|
|
|
|
# specify your own (or DarwinPort's) include directories and
|
|
|
|
# library directories by defining CFLAGS and LDFLAGS appropriately.
|
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
2005-09-07 19:22:56 +00:00
|
|
|
#
|
2005-09-20 16:27:13 +00:00
|
|
|
# Define ARM_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine optimized for ARM.
|
|
|
|
#
|
2006-06-24 00:57:48 +00:00
|
|
|
# Define MOZILLA_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
|
|
|
|
# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
|
|
|
|
# choice) has very fast version optimized for i586.
|
|
|
|
#
|
2005-09-07 19:22:56 +00:00
|
|
|
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
2005-09-05 23:24:03 +00:00
|
|
|
#
|
2005-09-07 19:22:56 +00:00
|
|
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
2005-09-05 23:24:03 +00:00
|
|
|
#
|
|
|
|
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
|
|
|
# Patrick Mauritz).
|
|
|
|
#
|
2005-10-08 22:54:36 +00:00
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
#
|
2008-11-15 12:08:14 +00:00
|
|
|
# Define NO_PTHREADS if you do not have or do not want to use Pthreads.
|
|
|
|
#
|
2007-01-09 21:04:12 +00:00
|
|
|
# Define NO_PREAD if you have a problem with pread() system call (e.g.
|
|
|
|
# cygwin.dll before v1.5.22).
|
|
|
|
#
|
2006-12-14 11:15:57 +00:00
|
|
|
# Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
|
|
|
|
# generally faster on your platform than accessing the working directory.
|
|
|
|
#
|
2006-12-31 04:53:55 +00:00
|
|
|
# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
|
|
|
|
# the executable mode bit, but doesn't really do so.
|
|
|
|
#
|
2005-09-28 23:52:21 +00:00
|
|
|
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
|
|
|
#
|
2006-01-20 01:13:32 +00:00
|
|
|
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
|
|
|
# sockaddr_storage.
|
|
|
|
#
|
2006-02-16 08:38:01 +00:00
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
#
|
2007-03-03 18:29:03 +00:00
|
|
|
# Define OLD_ICONV if your library has an old iconv(), where the second
|
|
|
|
# (input buffer pointer) parameter is declared with type (const char **).
|
|
|
|
#
|
2007-11-07 03:24:28 +00:00
|
|
|
# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
|
|
|
|
#
|
2007-06-30 17:05:03 +00:00
|
|
|
# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
|
|
|
|
# that tells runtime paths to dynamic libraries;
|
|
|
|
# "-Wl,-rpath=/path/lib" is used instead.
|
2006-12-27 22:17:35 +00:00
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define USE_NSEC below if you want git to care about sub-second file mtimes
|
|
|
|
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
|
|
|
|
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
|
|
|
|
# randomly break unless your underlying filesystem supports those sub-second
|
|
|
|
# times (my ext3 doesn't).
|
2006-06-24 00:57:48 +00:00
|
|
|
#
|
2009-03-08 20:04:28 +00:00
|
|
|
# Define USE_ST_TIMESPEC if your "struct stat" uses "st_ctimespec" instead of
|
|
|
|
# "st_ctim"
|
|
|
|
#
|
2009-03-04 17:47:40 +00:00
|
|
|
# Define NO_NSEC if your "struct stat" does not have "st_ctim.tv_nsec"
|
|
|
|
# available. This automatically turns USE_NSEC off.
|
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define USE_STDEV below if you want git to care about the underlying device
|
2007-11-30 11:35:23 +00:00
|
|
|
# change being considered an inode change from the update-index perspective.
|
2006-12-04 09:50:04 +00:00
|
|
|
#
|
2008-08-18 19:57:16 +00:00
|
|
|
# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
|
|
|
|
# field that counts the on-disk footprint in 512-byte blocks.
|
|
|
|
#
|
2007-06-15 05:20:16 +00:00
|
|
|
# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
|
|
|
|
#
|
2007-11-14 09:38:46 +00:00
|
|
|
# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
|
|
|
|
#
|
2006-12-04 09:50:04 +00:00
|
|
|
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
|
|
|
|
# MakeMaker (e.g. using ActiveState under Cygwin).
|
|
|
|
#
|
2009-04-03 19:32:20 +00:00
|
|
|
# Define NO_PERL if you do not want Perl scripts or libraries at all.
|
|
|
|
#
|
2007-03-28 11:00:23 +00:00
|
|
|
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
|
|
|
|
#
|
2007-05-08 03:36:31 +00:00
|
|
|
# The TCL_PATH variable governs the location of the Tcl interpreter
|
|
|
|
# used to optimize git-gui for your system. Only used if NO_TCLTK
|
|
|
|
# is not set. Defaults to the bare 'tclsh'.
|
|
|
|
#
|
|
|
|
# The TCLTK_PATH variable governs the location of the Tcl/Tk interpreter.
|
2007-03-28 11:12:07 +00:00
|
|
|
# If not set it defaults to the bare 'wish'. If it is set to the empty
|
|
|
|
# string then NO_TCLTK will be forced (this is used by configure script).
|
|
|
|
#
|
2007-09-06 06:13:11 +00:00
|
|
|
# Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit
|
|
|
|
# parallel delta searching when packing objects.
|
|
|
|
#
|
2008-02-05 21:10:44 +00:00
|
|
|
# Define INTERNAL_QSORT to use Git's implementation of qsort(), which
|
|
|
|
# is a simplified version of the merge sort used in glibc. This is
|
|
|
|
# recommended if Git triggers O(n^2) behavior in your platform's qsort().
|
|
|
|
#
|
2008-03-12 21:39:16 +00:00
|
|
|
# Define NO_EXTERNAL_GREP if you don't want "git grep" to ever call
|
|
|
|
# your external grep (e.g., if your system lacks grep, if its grep is
|
|
|
|
# broken, or spawning external process is slower than built-in grep git has).
|
2009-04-20 08:17:00 +00:00
|
|
|
#
|
|
|
|
# Define UNRELIABLE_FSTAT if your system's fstat does not return the same
|
|
|
|
# information on a not yet closed file that lstat would return for the same
|
|
|
|
# file after it was closed.
|
2009-04-25 09:57:14 +00:00
|
|
|
#
|
2009-04-27 22:32:25 +00:00
|
|
|
# Define OBJECT_CREATION_USES_RENAMES if your operating systems has problems
|
|
|
|
# when hardlinking a file to another name and unlinking the original file right
|
2009-04-25 09:57:14 +00:00
|
|
|
# away (some NTFS drivers seem to zero the contents in that scenario).
|
2009-05-23 08:43:08 +00:00
|
|
|
#
|
2009-05-11 11:02:18 +00:00
|
|
|
# Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
|
|
|
|
# programs as a tar, where bin/ and libexec/ might be on different file systems.
|
2005-07-29 15:48:26 +00:00
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
|
2006-02-13 23:15:14 +00:00
|
|
|
@$(SHELL_PATH) ./GIT-VERSION-GEN
|
2005-12-27 22:40:17 +00:00
|
|
|
-include GIT-VERSION-FILE
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2006-02-20 23:36:28 +00:00
|
|
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
|
|
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
|
|
|
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
|
|
|
|
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
|
|
|
|
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
|
2008-11-15 12:08:14 +00:00
|
|
|
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
|
2006-02-20 23:36:28 +00:00
|
|
|
|
2005-11-13 09:46:13 +00:00
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
2005-11-05 07:50:09 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CFLAGS = -g -O2 -Wall
|
2005-11-13 09:46:13 +00:00
|
|
|
LDFLAGS =
|
2005-11-05 07:50:09 +00:00
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
2005-11-13 09:46:13 +00:00
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
2006-01-13 05:42:25 +00:00
|
|
|
STRIP ?= strip
|
2005-05-07 08:41:54 +00:00
|
|
|
|
2008-07-23 19:12:18 +00:00
|
|
|
# Among the variables below, these:
|
|
|
|
# gitexecdir
|
|
|
|
# template_dir
|
2009-01-18 12:00:09 +00:00
|
|
|
# mandir
|
|
|
|
# infodir
|
2008-07-23 19:12:18 +00:00
|
|
|
# htmldir
|
|
|
|
# ETC_GITCONFIG (but not sysconfdir)
|
2009-01-18 12:00:09 +00:00
|
|
|
# can be specified as a relative path some/where/else;
|
|
|
|
# this is interpreted as relative to $(prefix) and "git" at
|
2008-07-23 19:12:18 +00:00
|
|
|
# runtime figures out where they are based on the path to the executable.
|
|
|
|
# This can help installing the suite in a relocatable way.
|
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
prefix = $(HOME)
|
2009-01-18 12:00:09 +00:00
|
|
|
bindir_relative = bin
|
|
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
|
|
mandir = share/man
|
|
|
|
infodir = share/info
|
|
|
|
gitexecdir = libexec/git-core
|
2007-06-11 08:02:17 +00:00
|
|
|
sharedir = $(prefix)/share
|
2009-01-18 12:00:09 +00:00
|
|
|
template_dir = share/git-core/templates
|
|
|
|
htmldir = share/doc/git-doc
|
2007-04-24 07:51:35 +00:00
|
|
|
ifeq ($(prefix),/usr)
|
|
|
|
sysconfdir = /etc
|
2009-01-18 12:00:09 +00:00
|
|
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
2007-04-24 07:51:35 +00:00
|
|
|
else
|
|
|
|
sysconfdir = $(prefix)/etc
|
2009-01-18 12:00:09 +00:00
|
|
|
ETC_GITCONFIG = etc/gitconfig
|
2007-04-24 07:51:35 +00:00
|
|
|
endif
|
2007-08-01 04:30:35 +00:00
|
|
|
lib = lib
|
2005-08-04 23:56:38 +00:00
|
|
|
# DESTDIR=
|
2005-04-13 09:14:06 +00:00
|
|
|
|
2006-08-01 19:34:08 +00:00
|
|
|
# default configuration for gitweb
|
2006-08-02 19:23:34 +00:00
|
|
|
GITWEB_CONFIG = gitweb_config.perl
|
2008-03-26 18:11:19 +00:00
|
|
|
GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
|
2006-08-14 22:50:49 +00:00
|
|
|
GITWEB_HOME_LINK_STR = projects
|
2006-08-01 19:34:08 +00:00
|
|
|
GITWEB_SITENAME =
|
|
|
|
GITWEB_PROJECTROOT = /pub/git
|
2007-10-17 03:45:25 +00:00
|
|
|
GITWEB_PROJECT_MAXDEPTH = 2007
|
2006-09-16 22:31:01 +00:00
|
|
|
GITWEB_EXPORT_OK =
|
|
|
|
GITWEB_STRICT_EXPORT =
|
2006-08-15 21:03:17 +00:00
|
|
|
GITWEB_BASE_URL =
|
2006-08-01 19:34:08 +00:00
|
|
|
GITWEB_LIST =
|
|
|
|
GITWEB_HOMETEXT = indextext.html
|
|
|
|
GITWEB_CSS = gitweb.css
|
2006-07-30 22:38:39 +00:00
|
|
|
GITWEB_LOGO = git-logo.png
|
2006-09-04 18:32:13 +00:00
|
|
|
GITWEB_FAVICON = git-favicon.png
|
2006-10-03 12:49:03 +00:00
|
|
|
GITWEB_SITE_HEADER =
|
|
|
|
GITWEB_SITE_FOOTER =
|
2006-08-01 19:34:08 +00:00
|
|
|
|
2009-02-10 15:14:13 +00:00
|
|
|
export prefix bindir sharedir sysconfdir
|
2006-06-29 20:11:25 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CC = gcc
|
|
|
|
AR = ar
|
2007-07-14 17:51:44 +00:00
|
|
|
RM = rm -f
|
2005-09-23 17:41:40 +00:00
|
|
|
TAR = tar
|
2007-07-29 22:23:28 +00:00
|
|
|
FIND = find
|
2005-08-06 05:36:15 +00:00
|
|
|
INSTALL = install
|
|
|
|
RPMBUILD = rpmbuild
|
2007-05-08 03:36:31 +00:00
|
|
|
TCL_PATH = tclsh
|
2007-03-28 11:12:07 +00:00
|
|
|
TCLTK_PATH = wish
|
2008-11-02 23:43:20 +00:00
|
|
|
PTHREAD_LIBS = -lpthread
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2007-05-08 03:36:31 +00:00
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
|
2005-07-03 17:02:35 +00:00
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
2005-08-06 05:36:15 +00:00
|
|
|
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
|
2005-07-03 17:02:35 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
### --- END CONFIGURATION SECTION ---
|
|
|
|
|
2006-06-25 01:47:03 +00:00
|
|
|
# Those must not be GNU-specific; they are shared with perl/ which may
|
2006-09-23 18:20:47 +00:00
|
|
|
# be built by a different compiler. (Note that this is an artifact now
|
|
|
|
# but it still might be nice to keep that distinction.)
|
|
|
|
BASIC_CFLAGS =
|
|
|
|
BASIC_LDFLAGS =
|
2006-06-25 01:47:03 +00:00
|
|
|
|
2009-03-25 16:27:28 +00:00
|
|
|
# Guard against environment variables
|
|
|
|
BUILTIN_OBJS =
|
|
|
|
BUILT_INS =
|
|
|
|
COMPAT_CFLAGS =
|
|
|
|
COMPAT_OBJS =
|
|
|
|
LIB_H =
|
|
|
|
LIB_OBJS =
|
|
|
|
PROGRAMS =
|
|
|
|
SCRIPT_PERL =
|
|
|
|
SCRIPT_SH =
|
|
|
|
TEST_PROGRAMS =
|
|
|
|
|
2008-03-12 08:46:26 +00:00
|
|
|
SCRIPT_SH += git-am.sh
|
|
|
|
SCRIPT_SH += git-bisect.sh
|
2009-04-07 08:21:20 +00:00
|
|
|
SCRIPT_SH += git-difftool--helper.sh
|
2008-03-12 08:46:26 +00:00
|
|
|
SCRIPT_SH += git-filter-branch.sh
|
|
|
|
SCRIPT_SH += git-lost-found.sh
|
|
|
|
SCRIPT_SH += git-merge-octopus.sh
|
|
|
|
SCRIPT_SH += git-merge-one-file.sh
|
|
|
|
SCRIPT_SH += git-merge-resolve.sh
|
|
|
|
SCRIPT_SH += git-mergetool.sh
|
2009-04-08 07:17:20 +00:00
|
|
|
SCRIPT_SH += git-mergetool--lib.sh
|
2008-03-12 08:46:26 +00:00
|
|
|
SCRIPT_SH += git-parse-remote.sh
|
|
|
|
SCRIPT_SH += git-pull.sh
|
|
|
|
SCRIPT_SH += git-quiltimport.sh
|
|
|
|
SCRIPT_SH += git-rebase--interactive.sh
|
|
|
|
SCRIPT_SH += git-rebase.sh
|
|
|
|
SCRIPT_SH += git-repack.sh
|
|
|
|
SCRIPT_SH += git-request-pull.sh
|
|
|
|
SCRIPT_SH += git-sh-setup.sh
|
|
|
|
SCRIPT_SH += git-stash.sh
|
|
|
|
SCRIPT_SH += git-submodule.sh
|
|
|
|
SCRIPT_SH += git-web--browse.sh
|
|
|
|
|
|
|
|
SCRIPT_PERL += git-add--interactive.perl
|
2009-04-07 08:21:20 +00:00
|
|
|
SCRIPT_PERL += git-difftool.perl
|
2008-03-12 08:46:26 +00:00
|
|
|
SCRIPT_PERL += git-archimport.perl
|
|
|
|
SCRIPT_PERL += git-cvsexportcommit.perl
|
|
|
|
SCRIPT_PERL += git-cvsimport.perl
|
|
|
|
SCRIPT_PERL += git-cvsserver.perl
|
|
|
|
SCRIPT_PERL += git-relink.perl
|
|
|
|
SCRIPT_PERL += git-send-email.perl
|
|
|
|
SCRIPT_PERL += git-svn.perl
|
2005-07-31 00:31:47 +00:00
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
2007-11-23 20:35:08 +00:00
|
|
|
git-instaweb
|
2005-11-21 23:44:15 +00:00
|
|
|
|
2006-08-16 04:38:07 +00:00
|
|
|
# Empty...
|
|
|
|
EXTRA_PROGRAMS =
|
2005-11-21 23:44:15 +00:00
|
|
|
|
2008-03-12 08:46:26 +00:00
|
|
|
# ... and all the rest that could be moved out of bindir to gitexecdir
|
|
|
|
PROGRAMS += $(EXTRA_PROGRAMS)
|
|
|
|
PROGRAMS += git-fast-import$X
|
|
|
|
PROGRAMS += git-hash-object$X
|
|
|
|
PROGRAMS += git-index-pack$X
|
|
|
|
PROGRAMS += git-merge-index$X
|
|
|
|
PROGRAMS += git-merge-tree$X
|
|
|
|
PROGRAMS += git-mktag$X
|
|
|
|
PROGRAMS += git-mktree$X
|
|
|
|
PROGRAMS += git-pack-redundant$X
|
|
|
|
PROGRAMS += git-patch-id$X
|
2008-09-08 10:46:55 +00:00
|
|
|
PROGRAMS += git-shell$X
|
2008-03-12 08:46:26 +00:00
|
|
|
PROGRAMS += git-show-index$X
|
|
|
|
PROGRAMS += git-unpack-file$X
|
|
|
|
PROGRAMS += git-update-server-info$X
|
|
|
|
PROGRAMS += git-upload-pack$X
|
|
|
|
PROGRAMS += git-var$X
|
|
|
|
|
2008-02-23 19:08:25 +00:00
|
|
|
# List built-in command $C whose implementation cmd_$C() is not in
|
|
|
|
# builtin-$C.o but is linked in as part of some other command.
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILT_INS += $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
|
|
|
|
|
|
|
|
BUILT_INS += git-cherry$X
|
2009-02-09 22:00:45 +00:00
|
|
|
BUILT_INS += git-cherry-pick$X
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILT_INS += git-format-patch$X
|
|
|
|
BUILT_INS += git-fsck-objects$X
|
|
|
|
BUILT_INS += git-get-tar-commit-id$X
|
|
|
|
BUILT_INS += git-init$X
|
|
|
|
BUILT_INS += git-merge-subtree$X
|
|
|
|
BUILT_INS += git-peek-remote$X
|
|
|
|
BUILT_INS += git-repo-config$X
|
|
|
|
BUILT_INS += git-show$X
|
2008-12-03 08:30:34 +00:00
|
|
|
BUILT_INS += git-stage$X
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILT_INS += git-status$X
|
|
|
|
BUILT_INS += git-whatchanged$X
|
2006-04-11 00:37:58 +00:00
|
|
|
|
2006-01-13 05:37:17 +00:00
|
|
|
# what 'all' will build and 'install' will install, in gitexecdir
|
2007-02-07 05:27:09 +00:00
|
|
|
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2007-03-28 11:00:23 +00:00
|
|
|
# what 'all' will build but not install in gitexecdir
|
2009-04-03 19:32:20 +00:00
|
|
|
OTHER_PROGRAMS = git$X
|
2007-03-28 11:00:23 +00:00
|
|
|
|
2005-11-21 05:11:22 +00:00
|
|
|
# Set paths to tools early so that they can be used for version tests.
|
|
|
|
ifndef SHELL_PATH
|
|
|
|
SHELL_PATH = /bin/sh
|
|
|
|
endif
|
|
|
|
ifndef PERL_PATH
|
|
|
|
PERL_PATH = /usr/bin/perl
|
|
|
|
endif
|
2005-09-11 00:46:27 +00:00
|
|
|
|
2006-12-15 07:03:03 +00:00
|
|
|
export PERL_PATH
|
|
|
|
|
2005-04-18 19:49:39 +00:00
|
|
|
LIB_FILE=libgit.a
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
XDIFF_LIB=xdiff/lib.a
|
[PATCH] Add update-server-info.
The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols. Currently, the
following files are produced.
- The $repo/info/refs file lists the name of heads and tags
available in the $repo/refs/ directory, along with their
SHA1. This can be used by git-ls-remote command running on
the client side.
- The $repo/info/rev-cache file describes the commit ancestry
reachable from references in the $repo/refs/ directory. This
file is in an append-only binary format to make the server
side friendly to rsync mirroring scheme, and can be read by
git-show-rev-cache command.
- The $repo/objects/info/pack file lists the name of the packs
available, the interdependencies among them, and the head
commits and tags contained in them. Along with the other two
files, this is designed to help clients to make smart pull
decisions.
The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.
In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24 00:54:41 +00:00
|
|
|
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += archive.h
|
|
|
|
LIB_H += attr.h
|
|
|
|
LIB_H += blob.h
|
|
|
|
LIB_H += builtin.h
|
|
|
|
LIB_H += cache.h
|
|
|
|
LIB_H += cache-tree.h
|
|
|
|
LIB_H += commit.h
|
2008-09-30 13:53:47 +00:00
|
|
|
LIB_H += compat/cygwin.h
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_H += compat/mingw.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += csum-file.h
|
|
|
|
LIB_H += decorate.h
|
|
|
|
LIB_H += delta.h
|
|
|
|
LIB_H += diffcore.h
|
|
|
|
LIB_H += diff.h
|
|
|
|
LIB_H += dir.h
|
|
|
|
LIB_H += fsck.h
|
|
|
|
LIB_H += git-compat-util.h
|
2008-05-04 10:36:53 +00:00
|
|
|
LIB_H += graph.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += grep.h
|
|
|
|
LIB_H += hash.h
|
2008-07-29 23:16:58 +00:00
|
|
|
LIB_H += help.h
|
2008-08-31 13:50:23 +00:00
|
|
|
LIB_H += levenshtein.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += list-objects.h
|
|
|
|
LIB_H += ll-merge.h
|
|
|
|
LIB_H += log-tree.h
|
|
|
|
LIB_H += mailmap.h
|
2008-09-02 23:49:05 +00:00
|
|
|
LIB_H += merge-recursive.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += object.h
|
|
|
|
LIB_H += pack.h
|
2008-06-15 14:05:06 +00:00
|
|
|
LIB_H += pack-refs.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += pack-revindex.h
|
|
|
|
LIB_H += parse-options.h
|
|
|
|
LIB_H += patch-ids.h
|
|
|
|
LIB_H += pkt-line.h
|
|
|
|
LIB_H += progress.h
|
|
|
|
LIB_H += quote.h
|
|
|
|
LIB_H += reflog-walk.h
|
|
|
|
LIB_H += refs.h
|
|
|
|
LIB_H += remote.h
|
2008-07-09 12:58:57 +00:00
|
|
|
LIB_H += rerere.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += revision.h
|
|
|
|
LIB_H += run-command.h
|
sha1-lookup: more memory efficient search in sorted list of SHA-1
Currently, when looking for a packed object from the pack idx, a
simple binary search is used.
A conventional binary search loop looks like this:
unsigned lo, hi;
do {
unsigned mi = (lo + hi) / 2;
int cmp = "entry pointed at by mi" minus "target";
if (!cmp)
return mi; "mi is the wanted one"
if (cmp > 0)
hi = mi; "mi is larger than target"
else
lo = mi+1; "mi is smaller than target"
} while (lo < hi);
"did not find what we wanted"
The invariants are:
- When entering the loop, 'lo' points at a slot that is never
above the target (it could be at the target), 'hi' points at
a slot that is guaranteed to be above the target (it can
never be at the target).
- We find a point 'mi' between 'lo' and 'hi' ('mi' could be
the same as 'lo', but never can be as high as 'hi'), and
check if 'mi' hits the target. There are three cases:
- if it is a hit, we have found what we are looking for;
- if it is strictly higher than the target, we set it to
'hi', and repeat the search.
- if it is strictly lower than the target, we update 'lo'
to one slot after it, because we allow 'lo' to be at the
target and 'mi' is known to be below the target.
If the loop exits, there is no matching entry.
When choosing 'mi', we do not have to take the "middle" but
anywhere in between 'lo' and 'hi', as long as lo <= mi < hi is
satisfied. When we somehow know that the distance between the
target and 'lo' is much shorter than the target and 'hi', we
could pick 'mi' that is much closer to 'lo' than (hi+lo)/2,
which a conventional binary search would pick.
This patch takes advantage of the fact that the SHA-1 is a good
hash function, and as long as there are enough entries in the
table, we can expect uniform distribution. An entry that begins
with for example "deadbeef..." is much likely to appear much
later than in the midway of a reasonably populated table. In
fact, it can be expected to be near 87% (222/256) from the top
of the table.
This is a work-in-progress and has switches to allow easier
experiments and debugging. Exporting GIT_USE_LOOKUP environment
variable enables this code.
On my admittedly memory starved machine, with a partial KDE
repository (3.0G pack with 95M idx):
$ GIT_USE_LOOKUP=t git log -800 --stat HEAD >/dev/null
3.93user 0.16system 0:04.09elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+55588minor)pagefaults 0swaps
Without the patch, the numbers are:
$ git log -800 --stat HEAD >/dev/null
4.00user 0.15system 0:04.17elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+60258minor)pagefaults 0swaps
In the same repository:
$ GIT_USE_LOOKUP=t git log -2000 HEAD >/dev/null
0.12user 0.00system 0:00.12elapsed 97%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+4241minor)pagefaults 0swaps
Without the patch, the numbers are:
$ git log -2000 HEAD >/dev/null
0.05user 0.01system 0:00.07elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+8506minor)pagefaults 0swaps
There isn't much time difference, but the number of minor faults
seems to show that we are touching much smaller number of pages,
which is expected.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-29 10:05:47 +00:00
|
|
|
LIB_H += sha1-lookup.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += sideband.h
|
chain kill signals for cleanup functions
If a piece of code wanted to do some cleanup before exiting
(e.g., cleaning up a lockfile or a tempfile), our usual
strategy was to install a signal handler that did something
like this:
do_cleanup(); /* actual work */
signal(signo, SIG_DFL); /* restore previous behavior */
raise(signo); /* deliver signal, killing ourselves */
For a single handler, this works fine. However, if we want
to clean up two _different_ things, we run into a problem.
The most recently installed handler will run, but when it
removes itself as a handler, it doesn't put back the first
handler.
This patch introduces sigchain, a tiny library for handling
a stack of signal handlers. You sigchain_push each handler,
and use sigchain_pop to restore whoever was before you in
the stack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-22 06:02:35 +00:00
|
|
|
LIB_H += sigchain.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += strbuf.h
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_H += string-list.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += tag.h
|
|
|
|
LIB_H += transport.h
|
|
|
|
LIB_H += tree.h
|
|
|
|
LIB_H += tree-walk.h
|
|
|
|
LIB_H += unpack-trees.h
|
2008-10-05 21:43:21 +00:00
|
|
|
LIB_H += userdiff.h
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_H += utf8.h
|
2008-05-26 21:56:19 +00:00
|
|
|
LIB_H += wt-status.h
|
2008-03-12 08:46:26 +00:00
|
|
|
|
2008-06-27 20:46:42 +00:00
|
|
|
LIB_OBJS += abspath.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += alias.o
|
|
|
|
LIB_OBJS += alloc.o
|
|
|
|
LIB_OBJS += archive.o
|
|
|
|
LIB_OBJS += archive-tar.o
|
|
|
|
LIB_OBJS += archive-zip.o
|
|
|
|
LIB_OBJS += attr.o
|
|
|
|
LIB_OBJS += base85.o
|
2009-03-26 04:55:24 +00:00
|
|
|
LIB_OBJS += bisect.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += blob.o
|
|
|
|
LIB_OBJS += branch.o
|
|
|
|
LIB_OBJS += bundle.o
|
|
|
|
LIB_OBJS += cache-tree.o
|
|
|
|
LIB_OBJS += color.o
|
|
|
|
LIB_OBJS += combine-diff.o
|
|
|
|
LIB_OBJS += commit.o
|
|
|
|
LIB_OBJS += config.o
|
|
|
|
LIB_OBJS += connect.o
|
|
|
|
LIB_OBJS += convert.o
|
|
|
|
LIB_OBJS += copy.o
|
|
|
|
LIB_OBJS += csum-file.o
|
|
|
|
LIB_OBJS += ctype.o
|
|
|
|
LIB_OBJS += date.o
|
|
|
|
LIB_OBJS += decorate.o
|
|
|
|
LIB_OBJS += diffcore-break.o
|
|
|
|
LIB_OBJS += diffcore-delta.o
|
|
|
|
LIB_OBJS += diffcore-order.o
|
|
|
|
LIB_OBJS += diffcore-pickaxe.o
|
|
|
|
LIB_OBJS += diffcore-rename.o
|
|
|
|
LIB_OBJS += diff-delta.o
|
|
|
|
LIB_OBJS += diff-lib.o
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_OBJS += diff-no-index.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += diff.o
|
|
|
|
LIB_OBJS += dir.o
|
2008-07-25 16:28:41 +00:00
|
|
|
LIB_OBJS += editor.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += entry.o
|
|
|
|
LIB_OBJS += environment.o
|
|
|
|
LIB_OBJS += exec_cmd.o
|
|
|
|
LIB_OBJS += fsck.o
|
2008-05-04 10:36:53 +00:00
|
|
|
LIB_OBJS += graph.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += grep.o
|
|
|
|
LIB_OBJS += hash.o
|
|
|
|
LIB_OBJS += help.o
|
|
|
|
LIB_OBJS += ident.o
|
2008-08-31 13:50:23 +00:00
|
|
|
LIB_OBJS += levenshtein.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += list-objects.o
|
|
|
|
LIB_OBJS += ll-merge.o
|
|
|
|
LIB_OBJS += lockfile.o
|
|
|
|
LIB_OBJS += log-tree.o
|
|
|
|
LIB_OBJS += mailmap.o
|
|
|
|
LIB_OBJS += match-trees.o
|
|
|
|
LIB_OBJS += merge-file.o
|
2008-08-12 16:45:14 +00:00
|
|
|
LIB_OBJS += merge-recursive.o
|
2008-03-21 20:16:24 +00:00
|
|
|
LIB_OBJS += name-hash.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += object.o
|
|
|
|
LIB_OBJS += pack-check.o
|
2008-06-15 14:05:06 +00:00
|
|
|
LIB_OBJS += pack-refs.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += pack-revindex.o
|
|
|
|
LIB_OBJS += pack-write.o
|
|
|
|
LIB_OBJS += pager.o
|
|
|
|
LIB_OBJS += parse-options.o
|
|
|
|
LIB_OBJS += patch-delta.o
|
|
|
|
LIB_OBJS += patch-ids.o
|
|
|
|
LIB_OBJS += path.o
|
|
|
|
LIB_OBJS += pkt-line.o
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_OBJS += preload-index.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += pretty.o
|
|
|
|
LIB_OBJS += progress.o
|
|
|
|
LIB_OBJS += quote.o
|
|
|
|
LIB_OBJS += reachable.o
|
|
|
|
LIB_OBJS += read-cache.o
|
|
|
|
LIB_OBJS += reflog-walk.o
|
|
|
|
LIB_OBJS += refs.o
|
|
|
|
LIB_OBJS += remote.o
|
2008-07-09 12:58:57 +00:00
|
|
|
LIB_OBJS += rerere.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += revision.o
|
|
|
|
LIB_OBJS += run-command.o
|
|
|
|
LIB_OBJS += server-info.o
|
|
|
|
LIB_OBJS += setup.o
|
sha1-lookup: more memory efficient search in sorted list of SHA-1
Currently, when looking for a packed object from the pack idx, a
simple binary search is used.
A conventional binary search loop looks like this:
unsigned lo, hi;
do {
unsigned mi = (lo + hi) / 2;
int cmp = "entry pointed at by mi" minus "target";
if (!cmp)
return mi; "mi is the wanted one"
if (cmp > 0)
hi = mi; "mi is larger than target"
else
lo = mi+1; "mi is smaller than target"
} while (lo < hi);
"did not find what we wanted"
The invariants are:
- When entering the loop, 'lo' points at a slot that is never
above the target (it could be at the target), 'hi' points at
a slot that is guaranteed to be above the target (it can
never be at the target).
- We find a point 'mi' between 'lo' and 'hi' ('mi' could be
the same as 'lo', but never can be as high as 'hi'), and
check if 'mi' hits the target. There are three cases:
- if it is a hit, we have found what we are looking for;
- if it is strictly higher than the target, we set it to
'hi', and repeat the search.
- if it is strictly lower than the target, we update 'lo'
to one slot after it, because we allow 'lo' to be at the
target and 'mi' is known to be below the target.
If the loop exits, there is no matching entry.
When choosing 'mi', we do not have to take the "middle" but
anywhere in between 'lo' and 'hi', as long as lo <= mi < hi is
satisfied. When we somehow know that the distance between the
target and 'lo' is much shorter than the target and 'hi', we
could pick 'mi' that is much closer to 'lo' than (hi+lo)/2,
which a conventional binary search would pick.
This patch takes advantage of the fact that the SHA-1 is a good
hash function, and as long as there are enough entries in the
table, we can expect uniform distribution. An entry that begins
with for example "deadbeef..." is much likely to appear much
later than in the midway of a reasonably populated table. In
fact, it can be expected to be near 87% (222/256) from the top
of the table.
This is a work-in-progress and has switches to allow easier
experiments and debugging. Exporting GIT_USE_LOOKUP environment
variable enables this code.
On my admittedly memory starved machine, with a partial KDE
repository (3.0G pack with 95M idx):
$ GIT_USE_LOOKUP=t git log -800 --stat HEAD >/dev/null
3.93user 0.16system 0:04.09elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+55588minor)pagefaults 0swaps
Without the patch, the numbers are:
$ git log -800 --stat HEAD >/dev/null
4.00user 0.15system 0:04.17elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+60258minor)pagefaults 0swaps
In the same repository:
$ GIT_USE_LOOKUP=t git log -2000 HEAD >/dev/null
0.12user 0.00system 0:00.12elapsed 97%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+4241minor)pagefaults 0swaps
Without the patch, the numbers are:
$ git log -2000 HEAD >/dev/null
0.05user 0.01system 0:00.07elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+8506minor)pagefaults 0swaps
There isn't much time difference, but the number of minor faults
seems to show that we are touching much smaller number of pages,
which is expected.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-29 10:05:47 +00:00
|
|
|
LIB_OBJS += sha1-lookup.o
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_OBJS += sha1_file.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += sha1_name.o
|
|
|
|
LIB_OBJS += shallow.o
|
|
|
|
LIB_OBJS += sideband.o
|
chain kill signals for cleanup functions
If a piece of code wanted to do some cleanup before exiting
(e.g., cleaning up a lockfile or a tempfile), our usual
strategy was to install a signal handler that did something
like this:
do_cleanup(); /* actual work */
signal(signo, SIG_DFL); /* restore previous behavior */
raise(signo); /* deliver signal, killing ourselves */
For a single handler, this works fine. However, if we want
to clean up two _different_ things, we run into a problem.
The most recently installed handler will run, but when it
removes itself as a handler, it doesn't put back the first
handler.
This patch introduces sigchain, a tiny library for handling
a stack of signal handlers. You sigchain_push each handler,
and use sigchain_pop to restore whoever was before you in
the stack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-22 06:02:35 +00:00
|
|
|
LIB_OBJS += sigchain.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += strbuf.o
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_OBJS += string-list.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += symlinks.o
|
|
|
|
LIB_OBJS += tag.o
|
|
|
|
LIB_OBJS += trace.o
|
|
|
|
LIB_OBJS += transport.o
|
|
|
|
LIB_OBJS += tree-diff.o
|
|
|
|
LIB_OBJS += tree.o
|
|
|
|
LIB_OBJS += tree-walk.o
|
|
|
|
LIB_OBJS += unpack-trees.o
|
|
|
|
LIB_OBJS += usage.o
|
2009-02-09 22:00:45 +00:00
|
|
|
LIB_OBJS += userdiff.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += utf8.o
|
|
|
|
LIB_OBJS += walker.o
|
Shrink the git binary a bit by avoiding unnecessary inline functions
So I was looking at the disgusting size of the git binary, and even with
the debugging removed, and using -Os instead of -O2, the size of the text
section was pretty high. In this day and age I guess almost a megabyte of
text isn't really all that surprising, but it still doesn't exactly make
me think "lean and mean".
With -Os, a surprising amount of text space is wasted on inline functions
that end up just being replicated multiple times, and where performance
really isn't a valid reason to inline them. In particular, the trivial
wrapper functions like "xmalloc()" are used _everywhere_, and making them
inline just duplicates the text (and the string we use to 'die()' on
failure) unnecessarily.
So this just moves them into a "wrapper.c" file, getting rid of a tiny bit
of unnecessary bloat. The following numbers are both with "CFLAGS=-Os":
Before:
[torvalds@woody git]$ size git
text data bss dec hex filename
700460 15160 292184 1007804 f60bc git
After:
[torvalds@woody git]$ size git
text data bss dec hex filename
670540 15160 292184 977884 eebdc git
so it saves almost 30k of text-space (it actually saves more than that
with the default -O2, but I don't think that's necessarily a very relevant
number from a "try to shrink git" standpoint).
It might conceivably have a performance impact, but none of this should be
_that_ performance critical. The real cost is not generally in the wrapper
anyway, but in the code it wraps (ie the cost of "xread()" is all in the
read itself, not in the trivial wrapping of it).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-22 19:19:25 +00:00
|
|
|
LIB_OBJS += wrapper.o
|
2008-03-12 08:46:26 +00:00
|
|
|
LIB_OBJS += write_or_die.o
|
|
|
|
LIB_OBJS += ws.o
|
|
|
|
LIB_OBJS += wt-status.o
|
|
|
|
LIB_OBJS += xdiff-interface.o
|
|
|
|
|
|
|
|
BUILTIN_OBJS += builtin-add.o
|
|
|
|
BUILTIN_OBJS += builtin-annotate.o
|
|
|
|
BUILTIN_OBJS += builtin-apply.o
|
|
|
|
BUILTIN_OBJS += builtin-archive.o
|
2009-03-26 04:55:54 +00:00
|
|
|
BUILTIN_OBJS += builtin-bisect--helper.o
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILTIN_OBJS += builtin-blame.o
|
|
|
|
BUILTIN_OBJS += builtin-branch.o
|
|
|
|
BUILTIN_OBJS += builtin-bundle.o
|
|
|
|
BUILTIN_OBJS += builtin-cat-file.o
|
|
|
|
BUILTIN_OBJS += builtin-check-attr.o
|
|
|
|
BUILTIN_OBJS += builtin-check-ref-format.o
|
|
|
|
BUILTIN_OBJS += builtin-checkout-index.o
|
|
|
|
BUILTIN_OBJS += builtin-checkout.o
|
|
|
|
BUILTIN_OBJS += builtin-clean.o
|
2008-04-27 17:39:30 +00:00
|
|
|
BUILTIN_OBJS += builtin-clone.o
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILTIN_OBJS += builtin-commit-tree.o
|
|
|
|
BUILTIN_OBJS += builtin-commit.o
|
|
|
|
BUILTIN_OBJS += builtin-config.o
|
|
|
|
BUILTIN_OBJS += builtin-count-objects.o
|
|
|
|
BUILTIN_OBJS += builtin-describe.o
|
|
|
|
BUILTIN_OBJS += builtin-diff-files.o
|
|
|
|
BUILTIN_OBJS += builtin-diff-index.o
|
|
|
|
BUILTIN_OBJS += builtin-diff-tree.o
|
|
|
|
BUILTIN_OBJS += builtin-diff.o
|
|
|
|
BUILTIN_OBJS += builtin-fast-export.o
|
|
|
|
BUILTIN_OBJS += builtin-fetch--tool.o
|
|
|
|
BUILTIN_OBJS += builtin-fetch-pack.o
|
|
|
|
BUILTIN_OBJS += builtin-fetch.o
|
|
|
|
BUILTIN_OBJS += builtin-fmt-merge-msg.o
|
|
|
|
BUILTIN_OBJS += builtin-for-each-ref.o
|
|
|
|
BUILTIN_OBJS += builtin-fsck.o
|
|
|
|
BUILTIN_OBJS += builtin-gc.o
|
|
|
|
BUILTIN_OBJS += builtin-grep.o
|
2008-08-02 08:08:38 +00:00
|
|
|
BUILTIN_OBJS += builtin-help.o
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILTIN_OBJS += builtin-init-db.o
|
|
|
|
BUILTIN_OBJS += builtin-log.o
|
|
|
|
BUILTIN_OBJS += builtin-ls-files.o
|
|
|
|
BUILTIN_OBJS += builtin-ls-remote.o
|
|
|
|
BUILTIN_OBJS += builtin-ls-tree.o
|
|
|
|
BUILTIN_OBJS += builtin-mailinfo.o
|
|
|
|
BUILTIN_OBJS += builtin-mailsplit.o
|
2008-07-07 17:24:20 +00:00
|
|
|
BUILTIN_OBJS += builtin-merge.o
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILTIN_OBJS += builtin-merge-base.o
|
|
|
|
BUILTIN_OBJS += builtin-merge-file.o
|
|
|
|
BUILTIN_OBJS += builtin-merge-ours.o
|
|
|
|
BUILTIN_OBJS += builtin-merge-recursive.o
|
|
|
|
BUILTIN_OBJS += builtin-mv.o
|
|
|
|
BUILTIN_OBJS += builtin-name-rev.o
|
|
|
|
BUILTIN_OBJS += builtin-pack-objects.o
|
|
|
|
BUILTIN_OBJS += builtin-pack-refs.o
|
|
|
|
BUILTIN_OBJS += builtin-prune-packed.o
|
|
|
|
BUILTIN_OBJS += builtin-prune.o
|
|
|
|
BUILTIN_OBJS += builtin-push.o
|
|
|
|
BUILTIN_OBJS += builtin-read-tree.o
|
2008-09-09 08:27:08 +00:00
|
|
|
BUILTIN_OBJS += builtin-receive-pack.o
|
2008-03-12 08:46:26 +00:00
|
|
|
BUILTIN_OBJS += builtin-reflog.o
|
|
|
|
BUILTIN_OBJS += builtin-remote.o
|
|
|
|
BUILTIN_OBJS += builtin-rerere.o
|
|
|
|
BUILTIN_OBJS += builtin-reset.o
|
|
|
|
BUILTIN_OBJS += builtin-rev-list.o
|
|
|
|
BUILTIN_OBJS += builtin-rev-parse.o
|
|
|
|
BUILTIN_OBJS += builtin-revert.o
|
|
|
|
BUILTIN_OBJS += builtin-rm.o
|
|
|
|
BUILTIN_OBJS += builtin-send-pack.o
|
|
|
|
BUILTIN_OBJS += builtin-shortlog.o
|
|
|
|
BUILTIN_OBJS += builtin-show-branch.o
|
|
|
|
BUILTIN_OBJS += builtin-show-ref.o
|
|
|
|
BUILTIN_OBJS += builtin-stripspace.o
|
|
|
|
BUILTIN_OBJS += builtin-symbolic-ref.o
|
|
|
|
BUILTIN_OBJS += builtin-tag.o
|
|
|
|
BUILTIN_OBJS += builtin-tar-tree.o
|
|
|
|
BUILTIN_OBJS += builtin-unpack-objects.o
|
|
|
|
BUILTIN_OBJS += builtin-update-index.o
|
|
|
|
BUILTIN_OBJS += builtin-update-ref.o
|
|
|
|
BUILTIN_OBJS += builtin-upload-archive.o
|
|
|
|
BUILTIN_OBJS += builtin-verify-pack.o
|
|
|
|
BUILTIN_OBJS += builtin-verify-tag.o
|
|
|
|
BUILTIN_OBJS += builtin-write-tree.o
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2006-03-26 23:14:52 +00:00
|
|
|
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
|
2007-07-29 18:35:45 +00:00
|
|
|
EXTLIBS =
|
2005-04-21 19:33:22 +00:00
|
|
|
|
2005-09-23 17:41:40 +00:00
|
|
|
#
|
|
|
|
# Platform specific tweaks
|
|
|
|
#
|
2005-10-09 19:52:35 +00:00
|
|
|
|
|
|
|
# We choose to avoid "if .. else if .. else .. endif endif"
|
|
|
|
# because maintaining the nesting to match is a pain. If
|
|
|
|
# we had "elif" things would have been much nicer...
|
|
|
|
|
2006-06-24 14:01:25 +00:00
|
|
|
ifeq ($(uname_S),Linux)
|
|
|
|
NO_STRLCPY = YesPlease
|
2008-07-21 09:23:43 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2006-06-24 14:01:25 +00:00
|
|
|
endif
|
2006-07-29 16:26:18 +00:00
|
|
|
ifeq ($(uname_S),GNU/kFreeBSD)
|
|
|
|
NO_STRLCPY = YesPlease
|
2008-07-21 09:23:43 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2006-07-29 16:26:18 +00:00
|
|
|
endif
|
Port to 12 other Platforms.
This patch adds support to compile and run git on 12 additional platforms.
The platforms are based on UNIX Systems Labs (USL)/Novell/SYS V code base.
The most common are Novell UnixWare 2.X.X, SCO UnixWare 7.X.X,
OpenServer 5.0.X, OpenServer 6.0.X, and SCO pre OSR 5 platforms.
Looking at the the various platform headers, I find:
#if defined(_KERNEL) || !defined(_POSIX_SOURCE) \
&& !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
which hides u_short and other typedefs that other header files on these
platforms depend on. WIth _XOPEN_SOURCE defined, sources that include
system header files that depend on the typedefs such as u_short cannot be
compiled on these platforms.
__USLC__ indicates UNIX System Labs Corperation (USLC), or a Novell-derived
compiler and/or some SysV based OS's.
__M_UNIX indicates XENIX/SCO UNIX/OpenServer 5.0.7 and prior releases
of the SCO OS's. It is used just like Apple and BSD, both of these
shouldn't have _XOPEN_SOURCE defined.
This is with suggestions and modifications from
Daniel Barkalow, Junio C Hamano, Thomas Harning, and Jeremy Maitin-Shepard.
Signed-off-by: Boyd Lynn Gerber <gerberb@zenez.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-08 20:47:54 +00:00
|
|
|
ifeq ($(uname_S),UnixWare)
|
|
|
|
CC = cc
|
|
|
|
NEEDS_SOCKET = YesPlease
|
|
|
|
NEEDS_NSL = YesPlease
|
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
SHELL_PATH = /usr/local/bin/bash
|
|
|
|
NO_IPV6 = YesPlease
|
|
|
|
NO_HSTRERROR = YesPlease
|
|
|
|
BASIC_CFLAGS += -Kthread
|
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
|
|
INSTALL = ginstall
|
|
|
|
TAR = gtar
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
NO_MEMMEM = YesPlease
|
|
|
|
endif
|
|
|
|
ifeq ($(uname_S),SCO_SV)
|
|
|
|
ifeq ($(uname_R),3.2)
|
|
|
|
CFLAGS = -O2
|
|
|
|
endif
|
|
|
|
ifeq ($(uname_R),5)
|
|
|
|
CC = cc
|
|
|
|
BASIC_CFLAGS += -Kthread
|
|
|
|
endif
|
|
|
|
NEEDS_SOCKET = YesPlease
|
|
|
|
NEEDS_NSL = YesPlease
|
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
SHELL_PATH = /usr/bin/bash
|
|
|
|
NO_IPV6 = YesPlease
|
|
|
|
NO_HSTRERROR = YesPlease
|
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
NO_MEMMEM = YesPlease
|
|
|
|
INSTALL = ginstall
|
|
|
|
TAR = gtar
|
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),Darwin)
|
2005-09-07 19:22:56 +00:00
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2009-02-05 06:09:08 +00:00
|
|
|
ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
|
2007-12-06 19:07:03 +00:00
|
|
|
OLD_ICONV = UnfortunatelyYes
|
|
|
|
endif
|
2009-02-05 06:09:08 +00:00
|
|
|
ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
endif
|
2007-09-09 05:09:17 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2008-12-17 08:20:25 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2009-03-08 20:04:28 +00:00
|
|
|
USE_ST_TIMESPEC = YesPlease
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),SunOS)
|
2005-09-05 23:24:03 +00:00
|
|
|
NEEDS_SOCKET = YesPlease
|
2005-09-12 05:25:49 +00:00
|
|
|
NEEDS_NSL = YesPlease
|
2005-09-23 17:41:40 +00:00
|
|
|
SHELL_PATH = /bin/bash
|
|
|
|
NO_STRCASESTR = YesPlease
|
2007-09-06 22:32:54 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2007-06-13 18:54:32 +00:00
|
|
|
NO_HSTRERROR = YesPlease
|
2007-11-16 18:59:58 +00:00
|
|
|
NO_MKDTEMP = YesPlease
|
2008-10-02 00:08:47 +00:00
|
|
|
OLD_ICONV = UnfortunatelyYes
|
2005-12-02 23:08:28 +00:00
|
|
|
ifeq ($(uname_R),5.8)
|
2006-01-25 20:38:36 +00:00
|
|
|
NO_UNSETENV = YesPlease
|
2005-12-02 23:08:28 +00:00
|
|
|
NO_SETENV = YesPlease
|
2006-08-15 09:01:22 +00:00
|
|
|
NO_C99_FORMAT = YesPlease
|
2007-02-20 00:22:56 +00:00
|
|
|
NO_STRTOUMAX = YesPlease
|
2005-12-02 23:08:28 +00:00
|
|
|
endif
|
2006-04-11 18:42:26 +00:00
|
|
|
ifeq ($(uname_R),5.9)
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
NO_SETENV = YesPlease
|
2006-08-15 09:01:22 +00:00
|
|
|
NO_C99_FORMAT = YesPlease
|
2007-02-20 00:22:56 +00:00
|
|
|
NO_STRTOUMAX = YesPlease
|
2006-04-11 18:42:26 +00:00
|
|
|
endif
|
2005-09-23 17:41:40 +00:00
|
|
|
INSTALL = ginstall
|
|
|
|
TAR = gtar
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -D__EXTENSIONS__
|
2005-09-05 23:24:03 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_O),Cygwin)
|
2006-01-20 01:13:57 +00:00
|
|
|
NO_D_TYPE_IN_DIRENT = YesPlease
|
2006-01-20 01:13:51 +00:00
|
|
|
NO_D_INO_IN_DIRENT = YesPlease
|
2005-09-28 23:37:37 +00:00
|
|
|
NO_STRCASESTR = YesPlease
|
2007-09-06 22:32:54 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2006-05-02 07:40:24 +00:00
|
|
|
NO_SYMLINK_HEAD = YesPlease
|
2005-09-28 23:37:37 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-12-14 11:15:57 +00:00
|
|
|
NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
|
2006-12-31 04:53:55 +00:00
|
|
|
NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
|
2007-12-01 09:49:22 +00:00
|
|
|
OLD_ICONV = UnfortunatelyYes
|
2005-11-17 19:29:47 +00:00
|
|
|
# There are conflicting reports about this.
|
|
|
|
# On some boxes NO_MMAP is needed, and not so elsewhere.
|
2006-12-27 23:12:31 +00:00
|
|
|
# Try commenting this out if you suspect MMAP is more efficient
|
|
|
|
NO_MMAP = YesPlease
|
2005-09-28 23:52:21 +00:00
|
|
|
NO_IPV6 = YesPlease
|
2005-09-29 02:08:37 +00:00
|
|
|
X = .exe
|
2005-09-20 16:27:13 +00:00
|
|
|
endif
|
2006-01-26 18:04:30 +00:00
|
|
|
ifeq ($(uname_S),FreeBSD)
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2007-09-10 16:43:35 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
2008-03-04 23:15:39 +00:00
|
|
|
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
|
2009-03-22 08:08:48 +00:00
|
|
|
USE_ST_TIMESPEC = YesPlease
|
2008-07-21 09:23:43 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2008-10-26 11:52:47 +00:00
|
|
|
ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
|
2008-11-02 23:43:20 +00:00
|
|
|
PTHREAD_LIBS = -pthread
|
2008-10-26 11:52:47 +00:00
|
|
|
NO_UINTMAX_T = YesPlease
|
|
|
|
NO_STRTOUMAX = YesPlease
|
|
|
|
endif
|
2006-01-26 18:04:30 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),OpenBSD)
|
2005-10-10 18:51:11 +00:00
|
|
|
NO_STRCASESTR = YesPlease
|
2007-09-06 22:32:54 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2009-05-14 06:47:41 +00:00
|
|
|
USE_ST_TIMESPEC = YesPlease
|
2005-10-01 06:23:26 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
2008-07-21 09:23:43 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2005-11-13 09:46:13 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(uname_S),NetBSD)
|
2006-05-11 17:35:31 +00:00
|
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
endif
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/pkg/include
|
2008-08-17 04:56:24 +00:00
|
|
|
BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
|
2008-07-21 09:23:43 +00:00
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
2009-04-26 13:49:00 +00:00
|
|
|
USE_ST_TIMESPEC = YesPlease
|
2005-10-01 06:23:26 +00:00
|
|
|
endif
|
2005-12-06 22:20:16 +00:00
|
|
|
ifeq ($(uname_S),AIX)
|
|
|
|
NO_STRCASESTR=YesPlease
|
2007-09-06 22:32:54 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2008-05-07 08:35:55 +00:00
|
|
|
NO_MKDTEMP = YesPlease
|
2006-06-24 14:01:25 +00:00
|
|
|
NO_STRLCPY = YesPlease
|
2009-03-04 17:47:40 +00:00
|
|
|
NO_NSEC = YesPlease
|
2008-05-07 08:35:55 +00:00
|
|
|
FREAD_READS_DIRECTORIES = UnfortunatelyYes
|
|
|
|
INTERNAL_QSORT = UnfortunatelyYes
|
2005-12-06 22:20:16 +00:00
|
|
|
NEEDS_LIBICONV=YesPlease
|
2008-05-07 08:35:55 +00:00
|
|
|
BASIC_CFLAGS += -D_LARGE_FILES
|
2008-11-15 12:08:14 +00:00
|
|
|
ifneq ($(shell expr "$(uname_V)" : '[1234]'),1)
|
|
|
|
THREADED_DELTA_SEARCH = YesPlease
|
|
|
|
else
|
|
|
|
NO_PTHREADS = YesPlease
|
|
|
|
endif
|
2005-12-06 22:20:16 +00:00
|
|
|
endif
|
2007-08-02 08:56:42 +00:00
|
|
|
ifeq ($(uname_S),GNU)
|
|
|
|
# GNU/Hurd
|
|
|
|
NO_STRLCPY=YesPlease
|
|
|
|
endif
|
2006-02-17 14:23:41 +00:00
|
|
|
ifeq ($(uname_S),IRIX64)
|
|
|
|
NO_IPV6=YesPlease
|
|
|
|
NO_SETENV=YesPlease
|
|
|
|
NO_STRCASESTR=YesPlease
|
2007-09-06 22:32:54 +00:00
|
|
|
NO_MEMMEM = YesPlease
|
2006-06-24 14:01:25 +00:00
|
|
|
NO_STRLCPY = YesPlease
|
2006-02-17 14:23:41 +00:00
|
|
|
NO_SOCKADDR_STORAGE=YesPlease
|
|
|
|
SHELL_PATH=/usr/gnu/bin/bash
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DPATH_MAX=1024
|
2006-02-17 14:23:41 +00:00
|
|
|
# for now, build 32-bit version
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_LDFLAGS += -L/usr/lib32
|
2006-02-17 14:23:41 +00:00
|
|
|
endif
|
2008-01-24 18:35:20 +00:00
|
|
|
ifeq ($(uname_S),HP-UX)
|
|
|
|
NO_IPV6=YesPlease
|
|
|
|
NO_SETENV=YesPlease
|
|
|
|
NO_STRCASESTR=YesPlease
|
|
|
|
NO_MEMMEM = YesPlease
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
NO_MKDTEMP = YesPlease
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
NO_HSTRERROR = YesPlease
|
|
|
|
NO_SYS_SELECT_H = YesPlease
|
2008-08-23 22:07:55 +00:00
|
|
|
SNPRINTF_RETURNS_BOGUS = YesPlease
|
2008-01-24 18:35:20 +00:00
|
|
|
endif
|
2008-09-30 13:53:47 +00:00
|
|
|
ifneq (,$(findstring CYGWIN,$(uname_S)))
|
|
|
|
COMPAT_OBJS += compat/cygwin.o
|
2009-04-20 08:17:00 +00:00
|
|
|
UNRELIABLE_FSTAT = UnfortunatelyYes
|
2008-09-30 13:53:47 +00:00
|
|
|
endif
|
2007-12-01 20:24:59 +00:00
|
|
|
ifneq (,$(findstring MINGW,$(uname_S)))
|
|
|
|
NO_PREAD = YesPlease
|
|
|
|
NO_OPENSSL = YesPlease
|
|
|
|
NO_CURL = YesPlease
|
|
|
|
NO_SYMLINK_HEAD = YesPlease
|
|
|
|
NO_IPV6 = YesPlease
|
|
|
|
NO_SETENV = YesPlease
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
NO_MEMMEM = YesPlease
|
2008-11-15 12:08:14 +00:00
|
|
|
NO_PTHREADS = YesPlease
|
2007-12-01 20:24:59 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
OLD_ICONV = YesPlease
|
|
|
|
NO_C99_FORMAT = YesPlease
|
|
|
|
NO_STRTOUMAX = YesPlease
|
|
|
|
NO_MKDTEMP = YesPlease
|
|
|
|
SNPRINTF_RETURNS_BOGUS = YesPlease
|
|
|
|
NO_SVN_TESTS = YesPlease
|
|
|
|
NO_PERL_MAKEMAKER = YesPlease
|
2009-01-18 12:00:15 +00:00
|
|
|
RUNTIME_PREFIX = YesPlease
|
2007-12-01 20:24:59 +00:00
|
|
|
NO_POSIX_ONLY_PROGRAMS = YesPlease
|
2008-08-18 19:57:16 +00:00
|
|
|
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
|
2009-03-04 17:47:40 +00:00
|
|
|
NO_NSEC = YesPlease
|
2009-03-13 15:50:45 +00:00
|
|
|
USE_WIN32_MMAP = YesPlease
|
2009-04-20 08:17:00 +00:00
|
|
|
UNRELIABLE_FSTAT = UnfortunatelyYes
|
2009-04-27 22:32:25 +00:00
|
|
|
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
|
2008-09-07 18:45:37 +00:00
|
|
|
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
|
2007-12-01 20:24:59 +00:00
|
|
|
COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
|
2007-12-08 19:57:25 +00:00
|
|
|
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
|
2008-09-07 18:45:37 +00:00
|
|
|
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
|
2007-12-01 20:24:59 +00:00
|
|
|
EXTLIBS += -lws2_32
|
|
|
|
X = .exe
|
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifneq (,$(findstring arm,$(uname_M)))
|
|
|
|
ARM_SHA1 = YesPlease
|
|
|
|
endif
|
2005-09-07 19:22:56 +00:00
|
|
|
|
2006-07-02 23:56:48 +00:00
|
|
|
-include config.mak.autogen
|
2005-10-11 22:22:47 +00:00
|
|
|
-include config.mak
|
2005-09-07 19:22:56 +00:00
|
|
|
|
2006-12-12 17:01:47 +00:00
|
|
|
ifeq ($(uname_S),Darwin)
|
|
|
|
ifndef NO_FINK
|
|
|
|
ifeq ($(shell test -d /sw/lib && echo y),y)
|
|
|
|
BASIC_CFLAGS += -I/sw/include
|
|
|
|
BASIC_LDFLAGS += -L/sw/lib
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifndef NO_DARWIN_PORTS
|
|
|
|
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
|
|
|
BASIC_CFLAGS += -I/opt/local/include
|
|
|
|
BASIC_LDFLAGS += -L/opt/local/lib
|
|
|
|
endif
|
|
|
|
endif
|
2009-01-26 19:03:59 +00:00
|
|
|
PTHREAD_LIBS =
|
2006-12-12 17:01:47 +00:00
|
|
|
endif
|
|
|
|
|
2008-08-17 04:56:24 +00:00
|
|
|
ifndef CC_LD_DYNPATH
|
|
|
|
ifdef NO_R_TO_GCC_LINKER
|
|
|
|
# Some gcc does not accept and pass -R to the linker to specify
|
|
|
|
# the runtime dynamic library path.
|
|
|
|
CC_LD_DYNPATH = -Wl,-rpath,
|
|
|
|
else
|
|
|
|
CC_LD_DYNPATH = -R
|
|
|
|
endif
|
2006-12-27 22:17:35 +00:00
|
|
|
endif
|
|
|
|
|
2007-09-11 03:02:45 +00:00
|
|
|
ifdef NO_CURL
|
|
|
|
BASIC_CFLAGS += -DNO_CURL
|
|
|
|
else
|
2005-09-23 17:41:40 +00:00
|
|
|
ifdef CURLDIR
|
2007-08-01 04:30:35 +00:00
|
|
|
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(CURLDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
|
2005-09-23 17:41:40 +00:00
|
|
|
else
|
|
|
|
CURL_LIBCURL = -lcurl
|
|
|
|
endif
|
2007-09-11 03:02:45 +00:00
|
|
|
BUILTIN_OBJS += builtin-http-fetch.o
|
|
|
|
EXTLIBS += $(CURL_LIBCURL)
|
2007-10-15 13:52:25 +00:00
|
|
|
LIB_OBJS += http.o http-walker.o
|
2005-11-19 01:08:36 +00:00
|
|
|
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
|
|
|
|
ifeq "$(curl_check)" "070908"
|
|
|
|
ifndef NO_EXPAT
|
|
|
|
PROGRAMS += git-http-push$X
|
|
|
|
endif
|
2005-11-02 19:19:24 +00:00
|
|
|
endif
|
2006-04-05 14:22:40 +00:00
|
|
|
ifndef NO_EXPAT
|
2009-01-28 20:43:57 +00:00
|
|
|
ifdef EXPATDIR
|
|
|
|
BASIC_CFLAGS += -I$(EXPATDIR)/include
|
|
|
|
EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib) $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat
|
|
|
|
else
|
|
|
|
EXPAT_LIBEXPAT = -lexpat
|
|
|
|
endif
|
2006-04-05 14:22:40 +00:00
|
|
|
endif
|
2005-09-23 17:41:40 +00:00
|
|
|
endif
|
|
|
|
|
2007-07-29 18:35:45 +00:00
|
|
|
ifdef ZLIB_PATH
|
|
|
|
BASIC_CFLAGS += -I$(ZLIB_PATH)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
|
2007-07-29 18:35:45 +00:00
|
|
|
endif
|
|
|
|
EXTLIBS += -lz
|
|
|
|
|
2007-12-01 10:10:54 +00:00
|
|
|
ifndef NO_POSIX_ONLY_PROGRAMS
|
|
|
|
PROGRAMS += git-daemon$X
|
|
|
|
PROGRAMS += git-imap-send$X
|
|
|
|
endif
|
2005-07-29 15:50:51 +00:00
|
|
|
ifndef NO_OPENSSL
|
2005-09-08 00:26:23 +00:00
|
|
|
OPENSSL_LIBSSL = -lssl
|
2005-09-30 20:31:16 +00:00
|
|
|
ifdef OPENSSLDIR
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
|
2005-09-30 20:31:16 +00:00
|
|
|
else
|
|
|
|
OPENSSL_LINK =
|
|
|
|
endif
|
2005-07-29 15:50:51 +00:00
|
|
|
else
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_OPENSSL
|
2005-09-08 00:26:23 +00:00
|
|
|
MOZILLA_SHA1 = 1
|
|
|
|
OPENSSL_LIBSSL =
|
2005-07-29 15:50:51 +00:00
|
|
|
endif
|
2005-09-07 19:22:56 +00:00
|
|
|
ifdef NEEDS_SSL_WITH_CRYPTO
|
2005-09-30 20:31:16 +00:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
|
2005-09-07 19:22:56 +00:00
|
|
|
else
|
2005-09-30 20:31:16 +00:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
|
|
|
ifdef NEEDS_LIBICONV
|
2005-09-30 20:31:16 +00:00
|
|
|
ifdef ICONVDIR
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(ICONVDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
|
2005-09-30 20:31:16 +00:00
|
|
|
else
|
|
|
|
ICONV_LINK =
|
|
|
|
endif
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += $(ICONV_LINK) -liconv
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
2005-09-05 23:24:03 +00:00
|
|
|
ifdef NEEDS_SOCKET
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += -lsocket
|
2005-09-05 23:24:03 +00:00
|
|
|
endif
|
2005-09-12 05:25:49 +00:00
|
|
|
ifdef NEEDS_NSL
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += -lnsl
|
2005-09-12 05:25:49 +00:00
|
|
|
endif
|
2006-01-20 01:13:57 +00:00
|
|
|
ifdef NO_D_TYPE_IN_DIRENT
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
|
2006-01-20 01:13:57 +00:00
|
|
|
endif
|
2006-01-20 01:13:51 +00:00
|
|
|
ifdef NO_D_INO_IN_DIRENT
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
|
2006-01-20 01:13:51 +00:00
|
|
|
endif
|
2008-08-18 19:57:16 +00:00
|
|
|
ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
|
|
|
|
BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
|
|
|
|
endif
|
2009-03-08 21:22:51 +00:00
|
|
|
ifdef USE_NSEC
|
|
|
|
BASIC_CFLAGS += -DUSE_NSEC
|
|
|
|
endif
|
2009-03-08 20:04:28 +00:00
|
|
|
ifdef USE_ST_TIMESPEC
|
|
|
|
BASIC_CFLAGS += -DUSE_ST_TIMESPEC
|
|
|
|
endif
|
2009-03-04 17:47:40 +00:00
|
|
|
ifdef NO_NSEC
|
|
|
|
BASIC_CFLAGS += -DNO_NSEC
|
|
|
|
endif
|
2006-07-30 15:38:28 +00:00
|
|
|
ifdef NO_C99_FORMAT
|
2007-02-06 00:53:12 +00:00
|
|
|
BASIC_CFLAGS += -DNO_C99_FORMAT
|
2006-07-30 15:38:28 +00:00
|
|
|
endif
|
2008-03-05 15:46:13 +00:00
|
|
|
ifdef SNPRINTF_RETURNS_BOGUS
|
|
|
|
COMPAT_CFLAGS += -DSNPRINTF_RETURNS_BOGUS
|
|
|
|
COMPAT_OBJS += compat/snprintf.o
|
|
|
|
endif
|
2008-02-09 02:32:47 +00:00
|
|
|
ifdef FREAD_READS_DIRECTORIES
|
|
|
|
COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
|
|
|
|
COMPAT_OBJS += compat/fopen.o
|
|
|
|
endif
|
2006-05-02 07:40:24 +00:00
|
|
|
ifdef NO_SYMLINK_HEAD
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
|
2006-05-02 07:40:24 +00:00
|
|
|
endif
|
2005-09-19 01:30:50 +00:00
|
|
|
ifdef NO_STRCASESTR
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_STRCASESTR
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/strcasestr.o
|
|
|
|
endif
|
2006-06-24 14:01:25 +00:00
|
|
|
ifdef NO_STRLCPY
|
|
|
|
COMPAT_CFLAGS += -DNO_STRLCPY
|
|
|
|
COMPAT_OBJS += compat/strlcpy.o
|
|
|
|
endif
|
2007-02-20 00:22:56 +00:00
|
|
|
ifdef NO_STRTOUMAX
|
|
|
|
COMPAT_CFLAGS += -DNO_STRTOUMAX
|
|
|
|
COMPAT_OBJS += compat/strtoumax.o
|
|
|
|
endif
|
|
|
|
ifdef NO_STRTOULL
|
|
|
|
COMPAT_CFLAGS += -DNO_STRTOULL
|
|
|
|
endif
|
2005-12-02 23:08:28 +00:00
|
|
|
ifdef NO_SETENV
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_SETENV
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/setenv.o
|
2005-09-19 01:30:50 +00:00
|
|
|
endif
|
2007-10-20 20:03:49 +00:00
|
|
|
ifdef NO_MKDTEMP
|
|
|
|
COMPAT_CFLAGS += -DNO_MKDTEMP
|
|
|
|
COMPAT_OBJS += compat/mkdtemp.o
|
|
|
|
endif
|
2006-08-29 10:51:14 +00:00
|
|
|
ifdef NO_UNSETENV
|
2006-01-25 20:38:36 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_UNSETENV
|
|
|
|
COMPAT_OBJS += compat/unsetenv.o
|
|
|
|
endif
|
2008-01-24 18:34:46 +00:00
|
|
|
ifdef NO_SYS_SELECT_H
|
|
|
|
BASIC_CFLAGS += -DNO_SYS_SELECT_H
|
|
|
|
endif
|
2005-10-08 22:54:36 +00:00
|
|
|
ifdef NO_MMAP
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_MMAP
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/mmap.o
|
2009-03-13 15:50:45 +00:00
|
|
|
else
|
|
|
|
ifdef USE_WIN32_MMAP
|
|
|
|
COMPAT_CFLAGS += -DUSE_WIN32_MMAP
|
|
|
|
COMPAT_OBJS += compat/win32mmap.o
|
|
|
|
endif
|
2005-10-08 22:54:36 +00:00
|
|
|
endif
|
2009-04-27 22:32:25 +00:00
|
|
|
ifdef OBJECT_CREATION_USES_RENAMES
|
|
|
|
COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
|
2009-04-25 09:57:14 +00:00
|
|
|
endif
|
2007-01-09 21:04:12 +00:00
|
|
|
ifdef NO_PREAD
|
|
|
|
COMPAT_CFLAGS += -DNO_PREAD
|
|
|
|
COMPAT_OBJS += compat/pread.o
|
|
|
|
endif
|
2006-12-14 11:15:57 +00:00
|
|
|
ifdef NO_FAST_WORKING_DIRECTORY
|
|
|
|
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
|
|
|
|
endif
|
2006-12-31 04:53:55 +00:00
|
|
|
ifdef NO_TRUSTABLE_FILEMODE
|
|
|
|
BASIC_CFLAGS += -DNO_TRUSTABLE_FILEMODE
|
|
|
|
endif
|
2005-09-28 23:52:21 +00:00
|
|
|
ifdef NO_IPV6
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_IPV6
|
2006-01-20 01:13:32 +00:00
|
|
|
endif
|
2008-10-26 11:52:37 +00:00
|
|
|
ifdef NO_UINTMAX_T
|
|
|
|
BASIC_CFLAGS += -Duintmax_t=uint32_t
|
|
|
|
endif
|
2006-01-20 01:13:32 +00:00
|
|
|
ifdef NO_SOCKADDR_STORAGE
|
|
|
|
ifdef NO_IPV6
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in
|
2006-01-20 01:13:32 +00:00
|
|
|
else
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in6
|
2006-01-20 01:13:32 +00:00
|
|
|
endif
|
2005-09-28 23:52:21 +00:00
|
|
|
endif
|
2006-05-21 21:37:00 +00:00
|
|
|
ifdef NO_INET_NTOP
|
|
|
|
LIB_OBJS += compat/inet_ntop.o
|
|
|
|
endif
|
2006-09-26 14:47:43 +00:00
|
|
|
ifdef NO_INET_PTON
|
|
|
|
LIB_OBJS += compat/inet_pton.o
|
|
|
|
endif
|
2005-04-21 19:33:22 +00:00
|
|
|
|
2006-02-16 08:38:01 +00:00
|
|
|
ifdef NO_ICONV
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_ICONV
|
2006-02-16 08:38:01 +00:00
|
|
|
endif
|
|
|
|
|
2007-03-03 18:29:03 +00:00
|
|
|
ifdef OLD_ICONV
|
|
|
|
BASIC_CFLAGS += -DOLD_ICONV
|
|
|
|
endif
|
|
|
|
|
2007-11-07 03:24:28 +00:00
|
|
|
ifdef NO_DEFLATE_BOUND
|
|
|
|
BASIC_CFLAGS += -DNO_DEFLATE_BOUND
|
|
|
|
endif
|
|
|
|
|
2005-09-20 16:27:13 +00:00
|
|
|
ifdef PPC_SHA1
|
|
|
|
SHA1_HEADER = "ppc/sha1.h"
|
|
|
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
|
|
|
else
|
|
|
|
ifdef ARM_SHA1
|
|
|
|
SHA1_HEADER = "arm/sha1.h"
|
|
|
|
LIB_OBJS += arm/sha1.o arm/sha1_arm.o
|
|
|
|
else
|
|
|
|
ifdef MOZILLA_SHA1
|
|
|
|
SHA1_HEADER = "mozilla-sha1/sha1.h"
|
|
|
|
LIB_OBJS += mozilla-sha1/sha1.o
|
|
|
|
else
|
|
|
|
SHA1_HEADER = <openssl/sha.h>
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += $(LIB_4_CRYPTO)
|
2005-09-20 16:27:13 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
2006-12-04 09:50:04 +00:00
|
|
|
ifdef NO_PERL_MAKEMAKER
|
|
|
|
export NO_PERL_MAKEMAKER
|
|
|
|
endif
|
2007-06-13 18:54:32 +00:00
|
|
|
ifdef NO_HSTRERROR
|
|
|
|
COMPAT_CFLAGS += -DNO_HSTRERROR
|
|
|
|
COMPAT_OBJS += compat/hstrerror.o
|
|
|
|
endif
|
2007-09-06 22:32:54 +00:00
|
|
|
ifdef NO_MEMMEM
|
|
|
|
COMPAT_CFLAGS += -DNO_MEMMEM
|
|
|
|
COMPAT_OBJS += compat/memmem.o
|
|
|
|
endif
|
2008-02-05 21:10:44 +00:00
|
|
|
ifdef INTERNAL_QSORT
|
|
|
|
COMPAT_CFLAGS += -DINTERNAL_QSORT
|
|
|
|
COMPAT_OBJS += compat/qsort.o
|
|
|
|
endif
|
Compute prefix at runtime if RUNTIME_PREFIX is set
This commit adds support for relocatable binaries (called
RUNTIME_PREFIX). Such binaries can be moved together with the
system configuration files to a different directory, as long as the
relative paths from the binary to the configuration files is
preserved. This functionality is essential on Windows where we
deliver git binaries with an installer that allows to freely choose
the installation location.
If RUNTIME_PREFIX is unset we use the static prefix. This will be
the default on Unix. Thus, the behavior on Unix will remain
identical to the old implementation, which used to add the prefix
in the Makefile.
If RUNTIME_PREFIX is set the prefix is computed from the location
of the executable. In this case, system_path() tries to strip
known directories that executables can be located in from the path
of the executable. If the path is successfully stripped it is used
as the prefix. For example, if the executable is
"/msysgit/bin/git" and BINDIR is "bin", then the prefix computed is
"/msysgit".
If the runtime prefix computation fails, we fall back to the static
prefix specified in the makefile. This can be the case if the
executable is not installed at a known location. Note that our
test system sets GIT_CONFIG_NOSYSTEM to tell git to ignore global
configuration files during testing. Hence testing does not trigger
the fall back.
Note that RUNTIME_PREFIX only works on Windows, though adding
support on Unix should not be too hard. The implementation
requires argv0_path to be set to an absolute path. argv0_path must
point to the directory of the executable. We use assert() to
verify this in debug builds. On Windows, the wrapper for main()
(see compat/mingw.h) guarantees that argv0_path is correctly
initialized. On Unix, further work is required before
RUNTIME_PREFIX can be enabled.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-18 12:00:14 +00:00
|
|
|
ifdef RUNTIME_PREFIX
|
|
|
|
COMPAT_CFLAGS += -DRUNTIME_PREFIX
|
|
|
|
endif
|
2007-03-06 23:44:49 +00:00
|
|
|
|
2008-11-15 12:08:14 +00:00
|
|
|
ifdef NO_PTHREADS
|
|
|
|
THREADED_DELTA_SEARCH =
|
|
|
|
BASIC_CFLAGS += -DNO_PTHREADS
|
|
|
|
else
|
|
|
|
EXTLIBS += $(PTHREAD_LIBS)
|
|
|
|
endif
|
|
|
|
|
2007-09-06 06:13:11 +00:00
|
|
|
ifdef THREADED_DELTA_SEARCH
|
|
|
|
BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
|
2008-02-23 02:11:56 +00:00
|
|
|
LIB_OBJS += thread-utils.o
|
2007-09-06 06:13:11 +00:00
|
|
|
endif
|
2008-03-04 23:15:39 +00:00
|
|
|
ifdef DIR_HAS_BSD_GROUP_SEMANTICS
|
|
|
|
COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
|
|
|
|
endif
|
2008-03-12 21:39:16 +00:00
|
|
|
ifdef NO_EXTERNAL_GREP
|
|
|
|
BASIC_CFLAGS += -DNO_EXTERNAL_GREP
|
|
|
|
endif
|
2009-04-20 08:17:00 +00:00
|
|
|
ifdef UNRELIABLE_FSTAT
|
|
|
|
BASIC_CFLAGS += -DUNRELIABLE_FSTAT
|
|
|
|
endif
|
2007-09-06 06:13:11 +00:00
|
|
|
|
2007-03-28 11:12:07 +00:00
|
|
|
ifeq ($(TCLTK_PATH),)
|
|
|
|
NO_TCLTK=NoThanks
|
|
|
|
endif
|
|
|
|
|
2009-04-03 19:32:20 +00:00
|
|
|
ifeq ($(PERL_PATH),)
|
|
|
|
NO_PERL=NoThanks
|
|
|
|
endif
|
|
|
|
|
2007-04-04 20:42:33 +00:00
|
|
|
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
|
2007-03-06 23:44:49 +00:00
|
|
|
QUIET_SUBDIR1 =
|
|
|
|
|
2007-03-06 23:05:34 +00:00
|
|
|
ifneq ($(findstring $(MAKEFLAGS),w),w)
|
|
|
|
PRINT_DIR = --no-print-directory
|
|
|
|
else # "make -w"
|
|
|
|
NO_SUBDIR = :
|
|
|
|
endif
|
|
|
|
|
2007-03-06 23:44:49 +00:00
|
|
|
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
2007-03-06 07:09:14 +00:00
|
|
|
ifndef V
|
2007-03-06 22:37:18 +00:00
|
|
|
QUIET_CC = @echo ' ' CC $@;
|
2007-03-06 06:35:01 +00:00
|
|
|
QUIET_AR = @echo ' ' AR $@;
|
|
|
|
QUIET_LINK = @echo ' ' LINK $@;
|
|
|
|
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
|
|
|
QUIET_GEN = @echo ' ' GEN $@;
|
2007-04-04 20:42:33 +00:00
|
|
|
QUIET_SUBDIR0 = +@subdir=
|
2007-03-06 23:05:34 +00:00
|
|
|
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
|
|
|
$(MAKE) $(PRINT_DIR) -C $$subdir
|
2007-03-06 07:09:14 +00:00
|
|
|
export V
|
2007-03-06 22:37:18 +00:00
|
|
|
export QUIET_GEN
|
2007-03-06 23:44:49 +00:00
|
|
|
export QUIET_BUILT_IN
|
|
|
|
endif
|
2007-03-06 06:35:01 +00:00
|
|
|
endif
|
2005-09-20 16:27:13 +00:00
|
|
|
|
2007-06-15 05:20:16 +00:00
|
|
|
ifdef ASCIIDOC8
|
|
|
|
export ASCIIDOC8
|
|
|
|
endif
|
|
|
|
|
2006-07-09 07:44:30 +00:00
|
|
|
# Shell quote (do not use $(call) to accommodate ancient setups);
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
|
2007-02-14 11:48:14 +00:00
|
|
|
ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
|
|
|
bindir_SQ = $(subst ','\'',$(bindir))
|
2009-01-18 12:00:09 +00:00
|
|
|
bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
|
2007-12-06 18:33:01 +00:00
|
|
|
mandir_SQ = $(subst ','\'',$(mandir))
|
2007-12-10 09:35:29 +00:00
|
|
|
infodir_SQ = $(subst ','\'',$(infodir))
|
2006-02-18 11:40:22 +00:00
|
|
|
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
|
|
|
|
template_dir_SQ = $(subst ','\'',$(template_dir))
|
2007-12-02 05:07:55 +00:00
|
|
|
htmldir_SQ = $(subst ','\'',$(htmldir))
|
2006-06-14 22:36:00 +00:00
|
|
|
prefix_SQ = $(subst ','\'',$(prefix))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|
|
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
2007-03-28 11:12:07 +00:00
|
|
|
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
2006-06-25 01:35:12 +00:00
|
|
|
LIBS = $(GITLIBS) $(EXTLIBS)
|
|
|
|
|
2007-02-14 11:48:14 +00:00
|
|
|
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
|
2007-11-13 20:05:05 +00:00
|
|
|
$(COMPAT_CFLAGS)
|
2005-12-02 23:08:28 +00:00
|
|
|
LIB_OBJS += $(COMPAT_OBJS)
|
2006-06-25 01:47:03 +00:00
|
|
|
|
|
|
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
|
|
|
ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
|
|
|
|
2007-05-08 03:53:06 +00:00
|
|
|
export TAR INSTALL DESTDIR SHELL_PATH
|
2006-06-25 01:35:12 +00:00
|
|
|
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Build rules
|
|
|
|
|
2008-08-07 19:03:42 +00:00
|
|
|
SHELL = $(SHELL_PATH)
|
|
|
|
|
2008-08-07 19:06:26 +00:00
|
|
|
all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
|
2007-01-10 20:24:54 +00:00
|
|
|
ifneq (,$X)
|
2008-08-15 15:01:03 +00:00
|
|
|
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
|
2007-01-10 20:24:54 +00:00
|
|
|
endif
|
2005-04-30 20:19:56 +00:00
|
|
|
|
2007-01-10 20:24:54 +00:00
|
|
|
all::
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2008-07-28 07:02:48 +00:00
|
|
|
$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all
|
2007-11-17 18:51:16 +00:00
|
|
|
$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
|
2007-03-28 11:00:23 +00:00
|
|
|
endif
|
2009-04-03 19:32:20 +00:00
|
|
|
ifndef NO_PERL
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
|
2009-04-03 19:32:20 +00:00
|
|
|
endif
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
|
2005-08-06 05:36:15 +00:00
|
|
|
|
2008-08-07 19:06:26 +00:00
|
|
|
please_set_SHELL_PATH_to_a_more_modern_shell:
|
|
|
|
@$$(:)
|
|
|
|
|
|
|
|
shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
|
|
|
|
|
2006-01-13 05:42:25 +00:00
|
|
|
strip: $(PROGRAMS) git$X
|
|
|
|
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
|
|
|
|
|
2007-06-13 08:28:21 +00:00
|
|
|
git.o: git.c common-cmds.h GIT-CFLAGS
|
|
|
|
$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
|
2009-04-05 02:15:16 +00:00
|
|
|
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
|
2007-06-13 08:28:21 +00:00
|
|
|
$(ALL_CFLAGS) -c $(filter %.c,$^)
|
|
|
|
|
|
|
|
git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
|
2007-07-10 01:30:39 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
|
2006-04-21 17:27:34 +00:00
|
|
|
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
|
2005-09-08 04:26:52 +00:00
|
|
|
|
2008-08-02 08:08:38 +00:00
|
|
|
builtin-help.o: builtin-help.c common-cmds.h GIT-CFLAGS
|
2007-12-10 09:35:29 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
|
2008-02-02 06:32:33 +00:00
|
|
|
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
|
2007-12-10 09:35:29 +00:00
|
|
|
'-DGIT_MAN_PATH="$(mandir_SQ)"' \
|
|
|
|
'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
|
2006-04-22 04:56:13 +00:00
|
|
|
|
2006-04-11 00:37:58 +00:00
|
|
|
$(BUILT_INS): git$X
|
2008-08-25 15:33:03 +00:00
|
|
|
$(QUIET_BUILT_IN)$(RM) $@ && \
|
|
|
|
ln git$X $@ 2>/dev/null || \
|
|
|
|
ln -s git$X $@ 2>/dev/null || \
|
|
|
|
cp git$X $@
|
2006-04-11 00:37:58 +00:00
|
|
|
|
2007-12-02 07:39:19 +00:00
|
|
|
common-cmds.h: ./generate-cmdlist.sh command-list.txt
|
2007-06-13 09:00:01 +00:00
|
|
|
|
2007-04-05 22:03:48 +00:00
|
|
|
common-cmds.h: $(wildcard Documentation/git-*.txt)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
|
2006-03-09 16:24:19 +00:00
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-02-18 11:40:22 +00:00
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
2008-03-12 21:41:39 +00:00
|
|
|
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
|
2005-10-04 19:41:35 +00:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2006-02-15 11:37:30 +00:00
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.sh >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
mv $@+ $@
|
2005-09-09 01:50:33 +00:00
|
|
|
|
2009-04-03 19:32:20 +00:00
|
|
|
ifndef NO_PERL
|
2006-12-04 09:50:04 +00:00
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
|
|
|
|
2007-10-25 20:17:24 +00:00
|
|
|
perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
|
2007-03-06 22:37:18 +00:00
|
|
|
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
|
2006-12-04 09:50:04 +00:00
|
|
|
|
2006-06-25 02:41:03 +00:00
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2007-09-25 06:42:16 +00:00
|
|
|
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
2006-07-07 20:04:35 +00:00
|
|
|
sed -e '1{' \
|
|
|
|
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
|
|
|
-e ' h' \
|
|
|
|
-e ' s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
|
|
|
|
-e ' H' \
|
|
|
|
-e ' x' \
|
|
|
|
-e '}' \
|
2006-06-25 02:41:03 +00:00
|
|
|
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
|
2005-10-04 19:41:35 +00:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.perl >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
mv $@+ $@
|
2005-09-09 01:50:33 +00:00
|
|
|
|
2009-04-28 03:34:24 +00:00
|
|
|
OTHER_PROGRAMS += gitweb/gitweb.cgi
|
2006-08-01 19:34:08 +00:00
|
|
|
gitweb/gitweb.cgi: gitweb/gitweb.perl
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-08-01 19:34:08 +00:00
|
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
|
|
|
|
-e 's|++GIT_BINDIR++|$(bindir)|g' \
|
|
|
|
-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
|
2008-04-05 16:37:18 +00:00
|
|
|
-e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
|
2006-08-14 22:50:49 +00:00
|
|
|
-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
|
|
|
|
-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
|
2007-10-17 03:45:25 +00:00
|
|
|
-e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
|
2006-09-16 22:31:01 +00:00
|
|
|
-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
|
|
|
|
-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
|
2006-08-15 21:03:17 +00:00
|
|
|
-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
|
|
|
|
-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
|
|
|
|
-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
|
|
|
|
-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
|
2006-09-04 18:32:13 +00:00
|
|
|
-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
|
2006-10-03 12:49:03 +00:00
|
|
|
-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
|
|
|
|
-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$< >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
2006-08-01 19:34:08 +00:00
|
|
|
mv $@+ $@
|
|
|
|
|
2006-07-01 22:14:14 +00:00
|
|
|
git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-07-01 22:14:14 +00:00
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
2006-07-08 15:27:10 +00:00
|
|
|
-e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
|
2006-07-02 09:31:30 +00:00
|
|
|
-e '/@@GITWEB_CGI@@/d' \
|
2006-07-08 15:27:10 +00:00
|
|
|
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
|
2006-07-02 09:31:30 +00:00
|
|
|
-e '/@@GITWEB_CSS@@/d' \
|
2007-12-19 12:25:27 +00:00
|
|
|
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.sh > $@+ && \
|
|
|
|
chmod +x $@+ && \
|
2006-07-01 22:14:14 +00:00
|
|
|
mv $@+ $@
|
2009-04-03 19:32:20 +00:00
|
|
|
else # NO_PERL
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
|
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
|
|
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
|
|
|
|
unimplemented.sh >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
|
|
|
mv $@+ $@
|
|
|
|
endif # NO_PERL
|
2006-07-01 22:14:14 +00:00
|
|
|
|
2006-08-08 16:35:23 +00:00
|
|
|
configure: configure.ac
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $<+ && \
|
2006-08-08 16:35:23 +00:00
|
|
|
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$< > $<+ && \
|
|
|
|
autoconf -o $@ $<+ && \
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) $<+
|
2006-08-08 16:35:23 +00:00
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
# These can record GIT_VERSION
|
2007-07-10 01:30:39 +00:00
|
|
|
git.o git.spec \
|
2005-12-27 22:40:17 +00:00
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
: GIT-VERSION-FILE
|
2005-12-22 19:38:23 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
%.o: %.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2007-05-30 17:42:41 +00:00
|
|
|
%.s: %.c GIT-CFLAGS
|
|
|
|
$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
|
2005-08-06 05:36:15 +00:00
|
|
|
%.o: %.S
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2005-05-19 14:27:14 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
exec_cmd.o: exec_cmd.c GIT-CFLAGS
|
2009-01-18 12:00:09 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
|
|
|
|
'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
|
|
|
|
'-DBINDIR="$(bindir_relative_SQ)"' \
|
|
|
|
'-DPREFIX="$(prefix_SQ)"' \
|
|
|
|
$<
|
|
|
|
|
2006-06-22 01:47:00 +00:00
|
|
|
builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2007-11-13 20:05:05 +00:00
|
|
|
config.o: config.c GIT-CFLAGS
|
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $<
|
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
http.o: http.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
|
2006-04-04 17:11:29 +00:00
|
|
|
|
2006-04-04 12:33:18 +00:00
|
|
|
ifdef NO_EXPAT
|
2007-09-11 03:02:45 +00:00
|
|
|
http-walker.o: http-walker.c http.h GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
|
2006-04-04 12:33:18 +00:00
|
|
|
endif
|
|
|
|
|
2006-04-01 00:23:46 +00:00
|
|
|
git-%$X: %.o $(GITLIBS)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
2005-07-29 17:21:53 +00:00
|
|
|
|
2008-07-09 21:29:00 +00:00
|
|
|
git-imap-send$X: imap-send.o $(GITLIBS)
|
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
|
2006-03-10 05:32:50 +00:00
|
|
|
|
2008-01-26 12:19:02 +00:00
|
|
|
http.o http-walker.o http-push.o transport.o: http.h
|
2006-02-18 11:40:22 +00:00
|
|
|
|
2006-07-03 07:53:13 +00:00
|
|
|
git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
2006-02-18 11:40:22 +00:00
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
|
2007-10-15 13:52:25 +00:00
|
|
|
$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
|
2006-06-22 22:43:47 +00:00
|
|
|
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
|
2007-12-15 06:08:25 +00:00
|
|
|
builtin-revert.o wt-status.o: wt-status.h
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
|
2005-07-29 15:50:24 +00:00
|
|
|
|
xdiff: add xdl_merge()
This new function implements the functionality of RCS merge, but
in-memory. It returns < 0 on error, otherwise the number of conflicts.
Finding the conflicting lines can be a very expensive task. You can
control the eagerness of this algorithm:
- a level value of 0 means that all overlapping changes are treated
as conflicts,
- a value of 1 means that if the overlapping changes are identical,
it is not treated as a conflict.
- If you set level to 2, overlapping changes will be analyzed, so that
almost identical changes will not result in huge conflicts. Rather,
only the conflicting lines will be shown inside conflict markers.
With each increasing level, the algorithm gets slower, but more accurate.
Note that the code for level 2 depends on the simple definition of
mmfile_t specific to git, and therefore it will be harder to port that
to LibXDiff.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-21 22:24:34 +00:00
|
|
|
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
|
2009-01-01 16:39:17 +00:00
|
|
|
xdiff/xmerge.o xdiff/xpatience.o
|
2006-10-17 18:08:08 +00:00
|
|
|
$(XDIFF_OBJS): xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
|
|
|
|
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
|
|
|
|
$(XDIFF_LIB): $(XDIFF_OBJS)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
doc:
|
|
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
2008-09-10 08:19:34 +00:00
|
|
|
man:
|
|
|
|
$(MAKE) -C Documentation man
|
|
|
|
|
|
|
|
html:
|
|
|
|
$(MAKE) -C Documentation html
|
|
|
|
|
2007-08-06 10:22:57 +00:00
|
|
|
info:
|
|
|
|
$(MAKE) -C Documentation info
|
|
|
|
|
2008-12-10 22:44:50 +00:00
|
|
|
pdf:
|
|
|
|
$(MAKE) -C Documentation pdf
|
|
|
|
|
2006-03-18 10:07:12 +00:00
|
|
|
TAGS:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) TAGS
|
2007-07-29 22:23:28 +00:00
|
|
|
$(FIND) . -name '*.[hcS]' -print | xargs etags -a
|
2006-03-18 10:07:12 +00:00
|
|
|
|
|
|
|
tags:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) tags
|
2007-07-29 22:23:28 +00:00
|
|
|
$(FIND) . -name '*.[hcS]' -print | xargs ctags -a
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2007-10-06 14:24:42 +00:00
|
|
|
cscope:
|
|
|
|
$(RM) cscope*
|
|
|
|
$(FIND) . -name '*.[hcS]' -print | xargs cscope -b
|
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
### Detect prefix changes
|
2006-11-20 08:49:31 +00:00
|
|
|
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
|
2006-06-14 22:36:00 +00:00
|
|
|
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
|
|
|
|
|
|
|
|
GIT-CFLAGS: .FORCE-GIT-CFLAGS
|
|
|
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
|
|
|
if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
|
|
|
|
echo 1>&2 " * new build flags or prefix"; \
|
|
|
|
echo "$$FLAGS" >GIT-CFLAGS; \
|
|
|
|
fi
|
|
|
|
|
2008-07-25 19:35:10 +00:00
|
|
|
# We need to apply sq twice, once to protect from the shell
|
|
|
|
# that runs GIT-BUILD-OPTIONS, and then again to protect it
|
|
|
|
# and the first level quoting from the shell that runs "echo".
|
2008-02-24 19:40:45 +00:00
|
|
|
GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
|
2008-07-25 19:35:10 +00:00
|
|
|
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
|
|
|
|
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
|
2009-02-25 08:32:09 +00:00
|
|
|
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
|
2009-04-03 19:33:59 +00:00
|
|
|
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
|
2008-02-24 19:40:45 +00:00
|
|
|
|
2007-03-28 11:22:02 +00:00
|
|
|
### Detect Tck/Tk interpreter path changes
|
|
|
|
ifndef NO_TCLTK
|
|
|
|
TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
|
|
|
|
|
|
|
|
GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
|
|
|
|
@VARS='$(TRACK_VARS)'; \
|
|
|
|
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
|
|
|
|
echo 1>&2 " * new Tcl/Tk interpreter location"; \
|
|
|
|
echo "$$VARS" >$@; \
|
|
|
|
fi
|
|
|
|
|
|
|
|
.PHONY: .FORCE-GIT-GUI-VARS
|
|
|
|
endif
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Testing rules
|
|
|
|
|
2009-01-11 11:25:06 +00:00
|
|
|
TEST_PROGRAMS += test-chmtime$X
|
2009-01-17 15:50:13 +00:00
|
|
|
TEST_PROGRAMS += test-ctype$X
|
2009-01-11 11:25:06 +00:00
|
|
|
TEST_PROGRAMS += test-date$X
|
|
|
|
TEST_PROGRAMS += test-delta$X
|
2009-02-04 08:12:19 +00:00
|
|
|
TEST_PROGRAMS += test-dump-cache-tree$X
|
2009-01-11 11:25:06 +00:00
|
|
|
TEST_PROGRAMS += test-genrandom$X
|
|
|
|
TEST_PROGRAMS += test-match-trees$X
|
|
|
|
TEST_PROGRAMS += test-parse-options$X
|
|
|
|
TEST_PROGRAMS += test-path-utils$X
|
|
|
|
TEST_PROGRAMS += test-sha1$X
|
chain kill signals for cleanup functions
If a piece of code wanted to do some cleanup before exiting
(e.g., cleaning up a lockfile or a tempfile), our usual
strategy was to install a signal handler that did something
like this:
do_cleanup(); /* actual work */
signal(signo, SIG_DFL); /* restore previous behavior */
raise(signo); /* deliver signal, killing ourselves */
For a single handler, this works fine. However, if we want
to clean up two _different_ things, we run into a problem.
The most recently installed handler will run, but when it
removes itself as a handler, it doesn't put back the first
handler.
This patch introduces sigchain, a tiny library for handling
a stack of signal handlers. You sigchain_push each handler,
and use sigchain_pop to restore whoever was before you in
the stack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-22 06:02:35 +00:00
|
|
|
TEST_PROGRAMS += test-sigchain$X
|
2007-04-28 22:32:49 +00:00
|
|
|
|
|
|
|
all:: $(TEST_PROGRAMS)
|
|
|
|
|
2006-02-18 12:01:18 +00:00
|
|
|
# GNU make supports exporting all variables by "export" without parameters.
|
|
|
|
# However, the environment gets quite big, and some programs have problems
|
|
|
|
# with that.
|
|
|
|
|
2006-07-07 11:26:31 +00:00
|
|
|
export NO_SVN_TESTS
|
2006-02-18 12:01:18 +00:00
|
|
|
|
2007-04-28 22:32:49 +00:00
|
|
|
test: all
|
2005-07-29 15:50:24 +00:00
|
|
|
$(MAKE) -C t/ all
|
|
|
|
|
2009-01-17 15:50:13 +00:00
|
|
|
test-ctype$X: ctype.o
|
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-date$X: date.o ctype.o
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-delta$X: diff-delta.o patch-delta.o
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2007-11-13 23:16:36 +00:00
|
|
|
test-parse-options$X: parse-options.o
|
|
|
|
|
2007-08-31 02:14:31 +00:00
|
|
|
.PRECIOUS: $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
|
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-%$X: test-%.o $(GITLIBS)
|
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
2007-04-11 17:59:51 +00:00
|
|
|
|
2006-06-24 07:59:49 +00:00
|
|
|
check-sha1:: test-sha1$X
|
|
|
|
./test-sha1.sh
|
|
|
|
|
2007-01-04 18:33:48 +00:00
|
|
|
check: common-cmds.h
|
2008-11-11 21:12:17 +00:00
|
|
|
if sparse; \
|
|
|
|
then \
|
|
|
|
for i in *.c; \
|
|
|
|
do \
|
|
|
|
sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \
|
|
|
|
done; \
|
|
|
|
else \
|
|
|
|
echo 2>&1 "Did you mean 'make test'?"; \
|
|
|
|
exit 1; \
|
|
|
|
fi
|
2005-07-29 15:50:24 +00:00
|
|
|
|
Start deprecating "git-command" in favor of "git command"
I realize that a lot of people use the "git-xyzzy" format, and we have
various historical reasons for it, but I also think that most people have
long since started thinking of the git command as a single command with
various subcommands, and we've long had the documentation talk about it
that way.
Slowly migrating away from the git-xyzzy format would allow us to
eventually no longer install hundreds of binaries (even if most of them
are symlinks or hardlinks) in users $PATH, and the _original_ reasons for
it (implementation issues and bash completion) are really long long gone.
Using "git xyzzy" also has some fundamental advantages, like the ability
to specify things like paging ("git -p xyzzy") and making the whole notion
of aliases act like other git commands (which they already do, but they do
*not* have a "git-xyzzy" form!)
Anyway, while actually removing the "git-xyzzy" things is not practical
right now, we can certainly start slowly to deprecate it internally inside
git itself - in the shell scripts we use, and the test vectors.
This patch adds a "remove-dashes" makefile target, which does that. It
isn't particularly efficient or smart, but it *does* successfully rewrite
a lot of our shell scripts to use the "git xyzzy" form for all built-in
commands.
(For non-builtins, the "git xyzzy" format implies an extra execve(), so
this script leaves those alone).
So apply this patch, and then run
make remove-dashes
make test
git commit -a
to generate a much larger patch that actually starts this transformation.
(The only half-way subtle thing about this is that it also fixes up
git-filter-branch.sh for the new world order by adding quoting around
the use of "git-commit-tree" as an argument. It doesn't need it in that
format, but when changed into "git commit-tree" it is no longer a single
word, and the quoting maintains the old behaviour).
NOTE! This does not yet mean that you can actually stop installing the
"git-xyzzy" binaries for the builtins. There are some remaining places
that want to use the old form, this just removes the most obvious ones
that can easily be done automatically.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-30 18:49:17 +00:00
|
|
|
remove-dashes:
|
2008-07-11 00:12:06 +00:00
|
|
|
./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
|
2009-02-05 08:04:17 +00:00
|
|
|
ifneq ($(filter /%,$(firstword $(template_dir))),)
|
2008-01-01 21:15:21 +00:00
|
|
|
template_instdir = $(template_dir)
|
2009-01-18 12:00:09 +00:00
|
|
|
else
|
|
|
|
template_instdir = $(prefix)/$(template_dir)
|
2008-01-01 21:15:21 +00:00
|
|
|
endif
|
|
|
|
export template_instdir
|
|
|
|
|
2009-02-05 08:04:17 +00:00
|
|
|
ifneq ($(filter /%,$(firstword $(gitexecdir))),)
|
2008-07-23 19:12:18 +00:00
|
|
|
gitexec_instdir = $(gitexecdir)
|
2009-01-18 12:00:09 +00:00
|
|
|
else
|
|
|
|
gitexec_instdir = $(prefix)/$(gitexecdir)
|
2008-07-23 19:12:18 +00:00
|
|
|
endif
|
|
|
|
gitexec_instdir_SQ = $(subst ','\'',$(gitexec_instdir))
|
|
|
|
export gitexec_instdir
|
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
install: all
|
2007-12-01 17:05:40 +00:00
|
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
2008-07-23 19:12:18 +00:00
|
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
|
|
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
2008-09-10 11:03:18 +00:00
|
|
|
$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
|
2006-07-29 16:25:03 +00:00
|
|
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
2009-04-23 05:42:28 +00:00
|
|
|
ifndef NO_PERL
|
2007-12-10 09:31:02 +00:00
|
|
|
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
|
2009-04-23 05:42:28 +00:00
|
|
|
endif
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2007-11-17 18:51:16 +00:00
|
|
|
$(MAKE) -C gitk-git install
|
2008-07-23 19:12:18 +00:00
|
|
|
$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
|
2007-03-28 11:00:23 +00:00
|
|
|
endif
|
2007-01-10 20:24:54 +00:00
|
|
|
ifneq (,$X)
|
2009-04-28 12:28:31 +00:00
|
|
|
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
|
2007-01-10 20:24:54 +00:00
|
|
|
endif
|
2008-07-21 19:19:51 +00:00
|
|
|
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
|
2008-07-23 19:12:18 +00:00
|
|
|
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
|
2008-08-25 15:33:03 +00:00
|
|
|
{ $(RM) "$$execdir/git-add$X" && \
|
2009-05-11 11:02:18 +00:00
|
|
|
test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
|
2009-02-24 08:58:16 +00:00
|
|
|
ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
|
|
|
|
cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
|
2009-01-20 01:44:03 +00:00
|
|
|
{ for p in $(filter-out git-add$X,$(BUILT_INS)); do \
|
|
|
|
$(RM) "$$execdir/$$p" && \
|
|
|
|
ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
|
|
|
|
ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
|
|
|
|
cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
|
2009-04-27 02:36:48 +00:00
|
|
|
done; } && \
|
2008-07-21 19:19:58 +00:00
|
|
|
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
install-doc:
|
|
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
2008-11-02 17:53:03 +00:00
|
|
|
install-man:
|
|
|
|
$(MAKE) -C Documentation install-man
|
|
|
|
|
2008-06-10 08:34:25 +00:00
|
|
|
install-html:
|
|
|
|
$(MAKE) -C Documentation install-html
|
|
|
|
|
2007-08-06 10:22:57 +00:00
|
|
|
install-info:
|
|
|
|
$(MAKE) -C Documentation install-info
|
|
|
|
|
2008-12-10 22:44:50 +00:00
|
|
|
install-pdf:
|
|
|
|
$(MAKE) -C Documentation install-pdf
|
|
|
|
|
2006-12-23 16:26:09 +00:00
|
|
|
quick-install-doc:
|
|
|
|
$(MAKE) -C Documentation quick-install
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2008-11-02 17:53:03 +00:00
|
|
|
quick-install-man:
|
|
|
|
$(MAKE) -C Documentation quick-install-man
|
|
|
|
|
2008-09-09 20:44:17 +00:00
|
|
|
quick-install-html:
|
|
|
|
$(MAKE) -C Documentation quick-install-html
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
git.spec: git.spec.in
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
|
|
|
|
mv $@+ $@
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2005-11-17 05:32:44 +00:00
|
|
|
GIT_TARNAME=git-$(GIT_VERSION)
|
2008-02-24 05:38:04 +00:00
|
|
|
dist: git.spec git-archive$(X) configure
|
2006-10-05 09:26:12 +00:00
|
|
|
./git-archive --format=tar \
|
|
|
|
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
2005-07-07 20:09:50 +00:00
|
|
|
@mkdir -p $(GIT_TARNAME)
|
2007-06-18 21:30:36 +00:00
|
|
|
@cp git.spec configure $(GIT_TARNAME)
|
2006-01-10 02:07:01 +00:00
|
|
|
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
2007-02-12 23:20:34 +00:00
|
|
|
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
|
2006-01-10 02:07:01 +00:00
|
|
|
$(TAR) rf $(GIT_TARNAME).tar \
|
2007-02-12 23:20:34 +00:00
|
|
|
$(GIT_TARNAME)/git.spec \
|
2007-06-18 21:30:36 +00:00
|
|
|
$(GIT_TARNAME)/configure \
|
2007-02-12 23:20:34 +00:00
|
|
|
$(GIT_TARNAME)/version \
|
2007-03-12 17:40:31 +00:00
|
|
|
$(GIT_TARNAME)/git-gui/version
|
2007-07-14 17:51:44 +00:00
|
|
|
@$(RM) -r $(GIT_TARNAME)
|
2005-07-15 01:20:50 +00:00
|
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
2005-07-07 20:09:50 +00:00
|
|
|
|
|
|
|
rpm: dist
|
2005-11-17 05:32:44 +00:00
|
|
|
$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2006-05-18 10:57:04 +00:00
|
|
|
htmldocs = git-htmldocs-$(GIT_VERSION)
|
|
|
|
manpages = git-manpages-$(GIT_VERSION)
|
|
|
|
dist-doc:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2006-05-18 10:57:04 +00:00
|
|
|
mkdir .doc-tmp-dir
|
|
|
|
$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
|
|
|
|
cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
|
|
|
|
gzip -n -9 -f $(htmldocs).tar
|
|
|
|
:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2007-04-20 03:47:04 +00:00
|
|
|
mkdir -p .doc-tmp-dir/man1 .doc-tmp-dir/man5 .doc-tmp-dir/man7
|
2006-05-25 12:37:46 +00:00
|
|
|
$(MAKE) -C Documentation DESTDIR=./ \
|
2006-06-29 21:26:54 +00:00
|
|
|
man1dir=../.doc-tmp-dir/man1 \
|
2007-04-20 03:47:04 +00:00
|
|
|
man5dir=../.doc-tmp-dir/man5 \
|
2006-06-29 21:26:54 +00:00
|
|
|
man7dir=../.doc-tmp-dir/man7 \
|
2006-05-18 10:57:04 +00:00
|
|
|
install
|
|
|
|
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
|
|
|
|
gzip -n -9 -f $(manpages).tar
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2006-05-18 10:57:04 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Cleaning rules
|
2005-07-15 01:21:57 +00:00
|
|
|
|
2007-10-04 21:49:19 +00:00
|
|
|
distclean: clean
|
|
|
|
$(RM) configure
|
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
clean:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
|
2008-08-20 01:05:39 +00:00
|
|
|
$(LIB_FILE) $(XDIFF_LIB)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
|
|
|
|
$(RM) $(TEST_PROGRAMS)
|
2007-10-06 14:24:42 +00:00
|
|
|
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r autom4te.cache
|
2007-10-04 21:49:19 +00:00
|
|
|
$(RM) config.log config.mak.autogen config.mak.append config.status config.cache
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
|
|
|
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
|
|
|
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
2005-05-22 18:27:28 +00:00
|
|
|
$(MAKE) -C Documentation/ clean
|
2009-04-03 19:32:20 +00:00
|
|
|
ifndef NO_PERL
|
|
|
|
$(RM) gitweb/gitweb.cgi
|
2006-12-04 09:50:04 +00:00
|
|
|
$(MAKE) -C perl clean
|
2009-04-03 19:32:20 +00:00
|
|
|
endif
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 02:34:29 +00:00
|
|
|
$(MAKE) -C templates/ clean
|
2005-08-03 00:24:11 +00:00
|
|
|
$(MAKE) -C t/ clean
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2007-11-17 18:51:16 +00:00
|
|
|
$(MAKE) -C gitk-git clean
|
2007-03-28 11:00:23 +00:00
|
|
|
$(MAKE) -C git-gui clean
|
|
|
|
endif
|
2008-02-24 19:40:45 +00:00
|
|
|
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
|
2005-12-27 22:40:17 +00:00
|
|
|
|
2006-01-13 05:42:25 +00:00
|
|
|
.PHONY: all install clean strip
|
2008-08-07 19:06:26 +00:00
|
|
|
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
|
2007-10-06 14:24:42 +00:00
|
|
|
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
|
2008-02-24 19:40:45 +00:00
|
|
|
.PHONY: .FORCE-GIT-BUILD-OPTIONS
|
2005-12-20 01:59:58 +00:00
|
|
|
|
2006-04-13 07:17:19 +00:00
|
|
|
### Check documentation
|
|
|
|
#
|
|
|
|
check-docs::
|
2007-11-09 02:38:27 +00:00
|
|
|
@(for v in $(ALL_PROGRAMS) $(BUILT_INS) git gitk; \
|
2006-04-13 07:17:19 +00:00
|
|
|
do \
|
|
|
|
case "$$v" in \
|
|
|
|
git-merge-octopus | git-merge-ours | git-merge-recursive | \
|
2008-07-05 14:43:51 +00:00
|
|
|
git-merge-resolve | git-merge-subtree | \
|
2008-01-18 06:52:40 +00:00
|
|
|
git-fsck-objects | git-init-db | \
|
2007-12-15 06:02:57 +00:00
|
|
|
git-?*--?* ) continue ;; \
|
2006-04-13 07:17:19 +00:00
|
|
|
esac ; \
|
|
|
|
test -f "Documentation/$$v.txt" || \
|
|
|
|
echo "no doc: $$v"; \
|
2007-12-02 07:39:19 +00:00
|
|
|
sed -e '/^#/d' command-list.txt | \
|
2007-02-14 06:45:22 +00:00
|
|
|
grep -q "^$$v[ ]" || \
|
2006-04-13 07:17:19 +00:00
|
|
|
case "$$v" in \
|
|
|
|
git) ;; \
|
|
|
|
*) echo "no link: $$v";; \
|
|
|
|
esac ; \
|
2007-11-09 02:38:27 +00:00
|
|
|
done; \
|
|
|
|
( \
|
2007-12-02 07:39:19 +00:00
|
|
|
sed -e '/^#/d' \
|
2007-11-09 02:38:27 +00:00
|
|
|
-e 's/[ ].*//' \
|
2007-12-02 07:39:19 +00:00
|
|
|
-e 's/^/listed /' command-list.txt; \
|
2007-11-09 02:38:27 +00:00
|
|
|
ls -1 Documentation/git*txt | \
|
|
|
|
sed -e 's|Documentation/|documented |' \
|
|
|
|
-e 's/\.txt//'; \
|
|
|
|
) | while read how cmd; \
|
|
|
|
do \
|
|
|
|
case "$$how,$$cmd" in \
|
|
|
|
*,git-citool | \
|
|
|
|
*,git-gui | \
|
2007-12-04 05:44:29 +00:00
|
|
|
*,git-help | \
|
2007-11-09 02:38:27 +00:00
|
|
|
documented,gitattributes | \
|
|
|
|
documented,gitignore | \
|
|
|
|
documented,gitmodules | \
|
2007-12-13 10:20:01 +00:00
|
|
|
documented,gitcli | \
|
2007-11-09 02:38:27 +00:00
|
|
|
documented,git-tools | \
|
2008-06-15 20:43:32 +00:00
|
|
|
documented,gitcore-tutorial | \
|
|
|
|
documented,gitcvs-migration | \
|
|
|
|
documented,gitdiffcore | \
|
|
|
|
documented,gitglossary | \
|
|
|
|
documented,githooks | \
|
|
|
|
documented,gitrepository-layout | \
|
|
|
|
documented,gittutorial | \
|
|
|
|
documented,gittutorial-2 | \
|
2007-11-09 02:38:27 +00:00
|
|
|
sentinel,not,matching,is,ok ) continue ;; \
|
|
|
|
esac; \
|
|
|
|
case " $(ALL_PROGRAMS) $(BUILT_INS) git gitk " in \
|
|
|
|
*" $$cmd "*) ;; \
|
|
|
|
*) echo "removed but $$how: $$cmd" ;; \
|
|
|
|
esac; \
|
|
|
|
done ) | sort
|
2006-11-05 19:26:21 +00:00
|
|
|
|
|
|
|
### Make sure built-ins do not have dups and listed in git.c
|
|
|
|
#
|
|
|
|
check-builtins::
|
|
|
|
./check-builtins.sh
|
2008-01-14 23:10:38 +00:00
|
|
|
|
2009-02-19 11:13:35 +00:00
|
|
|
### Test suite coverage testing
|
|
|
|
#
|
|
|
|
.PHONY: coverage coverage-clean coverage-build coverage-report
|
|
|
|
|
|
|
|
coverage:
|
|
|
|
$(MAKE) coverage-build
|
|
|
|
$(MAKE) coverage-report
|
|
|
|
|
|
|
|
coverage-clean:
|
|
|
|
rm -f *.gcda *.gcno
|
|
|
|
|
|
|
|
COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
|
|
|
|
COVERAGE_LDFLAGS = $(CFLAGS) -O0 -lgcov
|
|
|
|
|
|
|
|
coverage-build: coverage-clean
|
|
|
|
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
|
|
|
|
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
|
|
|
|
-j1 test
|
|
|
|
|
|
|
|
coverage-report:
|
|
|
|
gcov -b *.c
|
|
|
|
grep '^function.*called 0 ' *.c.gcov \
|
|
|
|
| sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
|
|
|
|
| tee coverage-untested-functions
|