|
|
|
|
# The default target of this Makefile is...
|
|
|
|
|
all:
|
|
|
|
|
|
|
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
|
|
|
|
# This also implies MOZILLA_SHA1.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
|
|
|
|
# git-http-push are not built, and you cannot use http:// and https://
|
|
|
|
|
# transports.
|
|
|
|
|
#
|
|
|
|
|
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
|
|
|
|
|
#
|
|
|
|
|
# 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).
|
|
|
|
|
#
|
|
|
|
|
# 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).
|
|
|
|
|
# some C compilers supported these specifiers prior to C99 as an extension.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_STRLCPY if you don't have strlcpy.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_SETENV if you don't have setenv in the C library.
|
|
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
|
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
|
|
|
|
#
|
|
|
|
|
# Define ARM_SHA1 environment variable when running make to make use of
|
|
|
|
|
# a bundled SHA1 routine optimized for ARM.
|
|
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
|
|
|
|
#
|
|
|
|
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
|
|
|
|
#
|
|
|
|
|
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
|
|
|
|
# Patrick Mauritz).
|
|
|
|
|
#
|
|
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
|
|
|
|
|
# generally faster on your platform than accessing the working directory.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
|
|
|
|
#
|
|
|
|
|
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
|
|
|
|
# sockaddr_storage.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
|
|
|
|
|
# a missing newline at the end of the file.
|
|
|
|
|
#
|
|
|
|
|
# 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).
|
|
|
|
|
#
|
|
|
|
|
# Define USE_STDEV below if you want git to care about the underlying device
|
|
|
|
|
# change being considered an inode change from the update-cache perspective.
|
|
|
|
|
#
|
|
|
|
|
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
|
|
|
|
|
# MakeMaker (e.g. using ActiveState under Cygwin).
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
|
|
|
|
|
@$(SHELL_PATH) ./GIT-VERSION-GEN
|
|
|
|
|
-include GIT-VERSION-FILE
|
|
|
|
|
|
|
|
|
|
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')
|
|
|
|
|
|
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
|
|
|
|
|
|
|
|
CFLAGS = -g -O2 -Wall
|
|
|
|
|
LDFLAGS =
|
|
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
|
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
|
|
|
STRIP ?= strip
|
|
|
|
|
|
|
|
|
|
prefix = $(HOME)
|
|
|
|
|
bindir = $(prefix)/bin
|
|
|
|
|
gitexecdir = $(bindir)
|
|
|
|
|
template_dir = $(prefix)/share/git-core/templates/
|
|
|
|
|
# DESTDIR=
|
|
|
|
|
|
|
|
|
|
# default configuration for gitweb
|
|
|
|
|
GITWEB_CONFIG = gitweb_config.perl
|
|
|
|
|
GITWEB_HOME_LINK_STR = projects
|
|
|
|
|
GITWEB_SITENAME =
|
|
|
|
|
GITWEB_PROJECTROOT = /pub/git
|
|
|
|
|
GITWEB_EXPORT_OK =
|
|
|
|
|
GITWEB_STRICT_EXPORT =
|
|
|
|
|
GITWEB_BASE_URL =
|
|
|
|
|
GITWEB_LIST =
|
|
|
|
|
GITWEB_HOMETEXT = indextext.html
|
|
|
|
|
GITWEB_CSS = gitweb.css
|
|
|
|
|
GITWEB_LOGO = git-logo.png
|
|
|
|
|
GITWEB_FAVICON = git-favicon.png
|
|
|
|
|
GITWEB_SITE_HEADER =
|
|
|
|
|
GITWEB_SITE_FOOTER =
|
|
|
|
|
|
|
|
|
|
export prefix bindir gitexecdir template_dir
|
|
|
|
|
|
|
|
|
|
CC = gcc
|
|
|
|
|
AR = ar
|
|
|
|
|
TAR = tar
|
|
|
|
|
INSTALL = install
|
|
|
|
|
RPMBUILD = rpmbuild
|
|
|
|
|
|
|
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
|
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
|
|
|
|
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### --- END CONFIGURATION SECTION ---
|
|
|
|
|
|
|
|
|
|
# Those must not be GNU-specific; they are shared with perl/ which may
|
|
|
|
|
# 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 =
|
|
|
|
|
|
|
|
|
|
SCRIPT_SH = \
|
|
|
|
|
git-bisect.sh git-checkout.sh \
|
|
|
|
|
git-clean.sh git-clone.sh git-commit.sh \
|
|
|
|
|
git-fetch.sh \
|
|
|
|
|
git-ls-remote.sh \
|
|
|
|
|
git-merge-one-file.sh git-parse-remote.sh \
|
|
|
|
|
git-pull.sh git-rebase.sh \
|
|
|
|
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
git-resolve.sh git-revert.sh git-sh-setup.sh \
|
|
|
|
|
git-tag.sh git-verify-tag.sh \
|
|
|
|
|
git-applymbox.sh git-applypatch.sh git-am.sh \
|
|
|
|
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
|
|
|
|
git-merge-resolve.sh git-merge-ours.sh \
|
|
|
|
|
git-lost-found.sh git-quiltimport.sh
|
|
|
|
|
|
|
|
|
|
SCRIPT_PERL = \
|
|
|
|
|
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
|
|
|
|
git-rerere.perl \
|
|
|
|
|
git-cvsserver.perl \
|
|
|
|
|
git-svnimport.perl git-cvsexportcommit.perl \
|
|
|
|
|
git-send-email.perl git-svn.perl
|
|
|
|
|
|
|
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
|
git-cherry-pick git-status git-instaweb
|
|
|
|
|
|
|
|
|
|
# ... and all the rest that could be moved out of bindir to gitexecdir
|
|
|
|
|
PROGRAMS = \
|
|
|
|
|
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
|
|
|
|
|
git-hash-object$X git-index-pack$X git-local-fetch$X \
|
|
|
|
|
git-merge-base$X \
|
|
|
|
|
git-daemon$X \
|
|
|
|
|
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
|
|
|
|
|
git-peek-remote$X git-receive-pack$X \
|
|
|
|
|
git-send-pack$X git-shell$X \
|
|
|
|
|
git-show-index$X git-ssh-fetch$X \
|
|
|
|
|
git-ssh-upload$X git-unpack-file$X \
|
|
|
|
|
git-update-server-info$X \
|
|
|
|
|
git-upload-pack$X git-verify-pack$X \
|
|
|
|
|
git-pack-redundant$X git-var$X \
|
|
|
|
|
git-describe$X git-merge-tree$X git-imap-send$X \
|
|
|
|
|
git-merge-recursive$X \
|
|
|
|
|
$(EXTRA_PROGRAMS)
|
|
|
|
|
|
|
|
|
|
# Empty...
|
|
|
|
|
EXTRA_PROGRAMS =
|
|
|
|
|
|
|
|
|
|
BUILT_INS = \
|
|
|
|
|
git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
|
|
|
|
|
git-get-tar-commit-id$X \
|
|
|
|
|
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
|
|
|
|
|
|
|
|
|
|
# what 'all' will build and 'install' will install, in gitexecdir
|
|
|
|
|
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
|
|
|
|
|
git-merge-recur$X
|
|
|
|
|
|
|
|
|
|
# Backward compatibility -- to be removed after 1.0
|
|
|
|
|
PROGRAMS += git-ssh-pull$X git-ssh-push$X
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
export PERL_PATH
|
|
|
|
|
|
|
|
|
|
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>
19 years ago
|
|
|
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>
20 years ago
|
|
|
|
|
|
|
|
LIB_H = \
|
|
|
|
|
archive.h blob.h cache.h commit.h csum-file.h delta.h grep.h \
|
|
|
|
|
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
|
|
|
|
|
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
|
|
|
|
|
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h
|
|
|
|
|
|
|
|
|
|
DIFF_OBJS = \
|
|
|
|
|
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
|
|
|
|
|
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
|
|
|
|
|
diffcore-delta.o log-tree.o
|
|
|
|
|
|
|
|
|
|
LIB_OBJS = \
|
|
|
|
|
blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
|
|
|
|
|
date.o diff-delta.o entry.o exec_cmd.o ident.o \
|
|
|
|
|
interpolate.o \
|
|
|
|
|
lockfile.o \
|
|
|
|
|
object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \
|
|
|
|
|
quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
|
|
|
|
|
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
|
|
|
|
|
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
|
|
|
|
|
revision.o pager.o tree-walk.o xdiff-interface.o \
|
|
|
|
|
write_or_die.o trace.o list-objects.o grep.o \
|
|
|
|
|
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
|
|
|
|
|
color.o wt-status.o archive-zip.o archive-tar.o
|
|
|
|
|
|
|
|
|
|
BUILTIN_OBJS = \
|
|
|
|
|
builtin-add.o \
|
|
|
|
|
builtin-annotate.o \
|
|
|
|
|
builtin-apply.o \
|
Add git-archive
git-archive is a command to make TAR and ZIP archives of a git tree.
It helps prevent a proliferation of git-{format}-tree commands.
Instead of directly calling git-{tar,zip}-tree command, it defines
a very simple API, that archiver should implement and register in
"git-archive.c". This API is made up by 2 functions whose prototype
is defined in "archive.h" file.
- The first one is used to parse 'extra' parameters which have
signification only for the specific archiver. That would allow
different archive backends to have different kind of options.
- The second one is used to ask to an archive backend to build
the archive given some already resolved parameters.
The main reason for making this API is to avoid using
git-{tar,zip}-tree commands, hence making them useless. Maybe it's
time for them to die ?
It also implements remote operations by defining a very simple
protocol: it first sends the name of the specific uploader followed
the repository name (git-upload-tar git://example.org/repo.git).
Then it sends options. It's done by sending a sequence of one
argument per packet, with prefix "argument ", followed by a flush.
The remote protocol is implemented in "git-archive.c" for client
side and is triggered by "--remote=<repo>" option. For example,
to fetch a TAR archive in a remote repo, you can issue:
$ git archive --format=tar --remote=git://xxx/yyy/zzz.git HEAD
We choose to not make a new command "git-fetch-archive" for example,
avoind one more GIT command which should be nice for users (less
commands to remember, keeps existing --remote option).
Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
builtin-archive.o \
|
|
|
|
|
builtin-blame.o \
|
|
|
|
|
builtin-branch.o \
|
|
|
|
|
builtin-cat-file.o \
|
|
|
|
|
builtin-checkout-index.o \
|
|
|
|
|
builtin-check-ref-format.o \
|
|
|
|
|
builtin-commit-tree.o \
|
|
|
|
|
builtin-count-objects.o \
|
|
|
|
|
builtin-diff.o \
|
|
|
|
|
builtin-diff-files.o \
|
|
|
|
|
builtin-diff-index.o \
|
|
|
|
|
builtin-diff-stages.o \
|
|
|
|
|
builtin-diff-tree.o \
|
|
|
|
|
builtin-fmt-merge-msg.o \
|
|
|
|
|
builtin-for-each-ref.o \
|
|
|
|
|
builtin-grep.o \
|
|
|
|
|
builtin-init-db.o \
|
|
|
|
|
builtin-log.o \
|
|
|
|
|
builtin-ls-files.o \
|
|
|
|
|
builtin-ls-tree.o \
|
|
|
|
|
builtin-mailinfo.o \
|
|
|
|
|
builtin-mailsplit.o \
|
|
|
|
|
builtin-merge-file.o \
|
|
|
|
|
builtin-mv.o \
|
|
|
|
|
builtin-name-rev.o \
|
|
|
|
|
builtin-pack-objects.o \
|
|
|
|
|
builtin-prune.o \
|
|
|
|
|
builtin-prune-packed.o \
|
|
|
|
|
builtin-push.o \
|
|
|
|
|
builtin-read-tree.o \
|
|
|
|
|
builtin-repo-config.o \
|
|
|
|
|
builtin-rev-list.o \
|
|
|
|
|
builtin-rev-parse.o \
|
|
|
|
|
builtin-rm.o \
|
|
|
|
|
builtin-runstatus.o \
|
|
|
|
|
builtin-shortlog.o \
|
|
|
|
|
builtin-show-branch.o \
|
|
|
|
|
builtin-stripspace.o \
|
|
|
|
|
builtin-symbolic-ref.o \
|
|
|
|
|
builtin-tar-tree.o \
|
|
|
|
|
builtin-unpack-objects.o \
|
|
|
|
|
builtin-update-index.o \
|
|
|
|
|
builtin-update-ref.o \
|
|
|
|
|
builtin-upload-archive.o \
|
|
|
|
|
builtin-verify-pack.o \
|
|
|
|
|
builtin-write-tree.o \
|
|
|
|
|
builtin-show-ref.o \
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
builtin-pack-refs.o
|
|
|
|
|
|
|
|
|
|
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
|
|
|
|
|
EXTLIBS = -lz
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Platform specific tweaks
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# 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...
|
|
|
|
|
|
|
|
|
|
ifeq ($(uname_S),Linux)
|
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),GNU/kFreeBSD)
|
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),Darwin)
|
|
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),SunOS)
|
|
|
|
|
NEEDS_SOCKET = YesPlease
|
|
|
|
|
NEEDS_NSL = YesPlease
|
|
|
|
|
SHELL_PATH = /bin/bash
|
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
|
ifeq ($(uname_R),5.8)
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
|
NO_SETENV = YesPlease
|
|
|
|
|
NO_C99_FORMAT = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_R),5.9)
|
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
|
NO_SETENV = YesPlease
|
|
|
|
|
NO_C99_FORMAT = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
INSTALL = ginstall
|
|
|
|
|
TAR = gtar
|
|
|
|
|
BASIC_CFLAGS += -D__EXTENSIONS__
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_O),Cygwin)
|
|
|
|
|
NO_D_TYPE_IN_DIRENT = YesPlease
|
|
|
|
|
NO_D_INO_IN_DIRENT = YesPlease
|
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
|
NO_SYMLINK_HEAD = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
NO_C99_FORMAT = YesPlease
|
|
|
|
|
NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
|
|
|
|
|
# There are conflicting reports about this.
|
|
|
|
|
# On some boxes NO_MMAP is needed, and not so elsewhere.
|
|
|
|
|
# Try uncommenting this if you see things break -- YMMV.
|
|
|
|
|
# NO_MMAP = YesPlease
|
|
|
|
|
NO_IPV6 = YesPlease
|
|
|
|
|
X = .exe
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),FreeBSD)
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),OpenBSD)
|
|
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),NetBSD)
|
|
|
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
BASIC_CFLAGS += -I/usr/pkg/include
|
|
|
|
|
BASIC_LDFLAGS += -L/usr/pkg/lib
|
|
|
|
|
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),AIX)
|
|
|
|
|
NO_STRCASESTR=YesPlease
|
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
|
NEEDS_LIBICONV=YesPlease
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),IRIX64)
|
|
|
|
|
NO_IPV6=YesPlease
|
|
|
|
|
NO_SETENV=YesPlease
|
|
|
|
|
NO_STRCASESTR=YesPlease
|
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
|
NO_SOCKADDR_STORAGE=YesPlease
|
|
|
|
|
SHELL_PATH=/usr/gnu/bin/bash
|
|
|
|
|
BASIC_CFLAGS += -DPATH_MAX=1024
|
|
|
|
|
# for now, build 32-bit version
|
|
|
|
|
BASIC_LDFLAGS += -L/usr/lib32
|
|
|
|
|
endif
|
|
|
|
|
ifneq (,$(findstring arm,$(uname_M)))
|
|
|
|
|
ARM_SHA1 = YesPlease
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-include config.mak.autogen
|
|
|
|
|
-include config.mak
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifndef NO_CURL
|
|
|
|
|
ifdef CURLDIR
|
|
|
|
|
# This is still problematic -- gcc does not always want -R.
|
|
|
|
|
BASIC_CFLAGS += -I$(CURLDIR)/include
|
|
|
|
|
CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
|
|
|
|
|
else
|
|
|
|
|
CURL_LIBCURL = -lcurl
|
|
|
|
|
endif
|
|
|
|
|
PROGRAMS += git-http-fetch$X
|
|
|
|
|
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
|
|
|
|
|
endif
|
|
|
|
|
ifndef NO_EXPAT
|
|
|
|
|
EXPAT_LIBEXPAT = -lexpat
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifndef NO_OPENSSL
|
|
|
|
|
OPENSSL_LIBSSL = -lssl
|
|
|
|
|
ifdef OPENSSLDIR
|
|
|
|
|
# Again this may be problematic -- gcc does not always want -R.
|
|
|
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
|
|
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
|
|
|
|
|
else
|
|
|
|
|
OPENSSL_LINK =
|
|
|
|
|
endif
|
|
|
|
|
else
|
|
|
|
|
BASIC_CFLAGS += -DNO_OPENSSL
|
|
|
|
|
MOZILLA_SHA1 = 1
|
|
|
|
|
OPENSSL_LIBSSL =
|
|
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_SSL_WITH_CRYPTO
|
|
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
|
|
|
|
|
else
|
|
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
|
|
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_LIBICONV
|
|
|
|
|
ifdef ICONVDIR
|
|
|
|
|
# Again this may be problematic -- gcc does not always want -R.
|
|
|
|
|
BASIC_CFLAGS += -I$(ICONVDIR)/include
|
|
|
|
|
ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
|
|
|
|
|
else
|
|
|
|
|
ICONV_LINK =
|
|
|
|
|
endif
|
|
|
|
|
EXTLIBS += $(ICONV_LINK) -liconv
|
|
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_SOCKET
|
|
|
|
|
EXTLIBS += -lsocket
|
|
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_NSL
|
|
|
|
|
EXTLIBS += -lnsl
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_D_TYPE_IN_DIRENT
|
|
|
|
|
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_D_INO_IN_DIRENT
|
|
|
|
|
BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_C99_FORMAT
|
|
|
|
|
ALL_CFLAGS += -DNO_C99_FORMAT
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_SYMLINK_HEAD
|
|
|
|
|
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_STRCASESTR
|
|
|
|
|
COMPAT_CFLAGS += -DNO_STRCASESTR
|
|
|
|
|
COMPAT_OBJS += compat/strcasestr.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_STRLCPY
|
|
|
|
|
COMPAT_CFLAGS += -DNO_STRLCPY
|
|
|
|
|
COMPAT_OBJS += compat/strlcpy.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_SETENV
|
|
|
|
|
COMPAT_CFLAGS += -DNO_SETENV
|
|
|
|
|
COMPAT_OBJS += compat/setenv.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_UNSETENV
|
|
|
|
|
COMPAT_CFLAGS += -DNO_UNSETENV
|
|
|
|
|
COMPAT_OBJS += compat/unsetenv.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_MMAP
|
|
|
|
|
COMPAT_CFLAGS += -DNO_MMAP
|
|
|
|
|
COMPAT_OBJS += compat/mmap.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_FAST_WORKING_DIRECTORY
|
|
|
|
|
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_IPV6
|
|
|
|
|
BASIC_CFLAGS += -DNO_IPV6
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_SOCKADDR_STORAGE
|
|
|
|
|
ifdef NO_IPV6
|
|
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in
|
|
|
|
|
else
|
|
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in6
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_INET_NTOP
|
|
|
|
|
LIB_OBJS += compat/inet_ntop.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_INET_PTON
|
|
|
|
|
LIB_OBJS += compat/inet_pton.o
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef NO_ICONV
|
|
|
|
|
BASIC_CFLAGS += -DNO_ICONV
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
EXTLIBS += $(LIB_4_CRYPTO)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_ACCURATE_DIFF
|
|
|
|
|
BASIC_CFLAGS += -DNO_ACCURATE_DIFF
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_PERL_MAKEMAKER
|
|
|
|
|
export NO_PERL_MAKEMAKER
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Shell quote (do not use $(call) to accommodate ancient setups);
|
|
|
|
|
|
|
|
|
|
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
|
|
|
|
|
|
|
|
|
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
|
|
|
|
bindir_SQ = $(subst ','\'',$(bindir))
|
|
|
|
|
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
|
|
|
|
|
template_dir_SQ = $(subst ','\'',$(template_dir))
|
|
|
|
|
prefix_SQ = $(subst ','\'',$(prefix))
|
|
|
|
|
|
|
|
|
|
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|
|
|
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
|
|
|
|
|
|
|
|
|
LIBS = $(GITLIBS) $(EXTLIBS)
|
|
|
|
|
|
|
|
|
|
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
|
|
|
|
|
LIB_OBJS += $(COMPAT_OBJS)
|
|
|
|
|
|
|
|
|
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
|
|
|
|
ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Build rules
|
|
|
|
|
|
|
|
|
|
all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
|
|
|
|
|
|
|
|
|
|
all:
|
|
|
|
|
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
|
|
|
|
|
$(MAKE) -C templates
|
|
|
|
|
|
|
|
|
|
strip: $(PROGRAMS) git$X
|
|
|
|
|
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
|
|
|
|
|
|
|
|
|
|
git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
|
|
|
|
|
$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
|
|
|
|
|
$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
|
|
|
|
|
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
|
|
|
|
|
|
|
|
|
|
help.o: common-cmds.h
|
|
|
|
|
|
|
|
|
|
git-merge-recur$X: git-merge-recursive$X
|
|
|
|
|
rm -f $@ && ln git-merge-recursive$X $@
|
|
|
|
|
|
|
|
|
|
$(BUILT_INS): git$X
|
|
|
|
|
rm -f $@ && ln git$X $@
|
|
|
|
|
|
|
|
|
|
common-cmds.h: Documentation/git-*.txt
|
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>
19 years ago
|
|
|
./generate-cmdlist.sh > $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
|
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>
19 years ago
|
|
|
rm -f $@ $@+
|
|
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
|
|
|
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
|
|
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
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>
19 years ago
|
|
|
$@.sh >$@+
|
|
|
|
|
chmod +x $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
|
|
|
|
|
|
|
|
|
perl/perl.mak: GIT-CFLAGS
|
|
|
|
|
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
|
|
|
|
|
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
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>
19 years ago
|
|
|
rm -f $@ $@+
|
|
|
|
|
INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
|
|
|
|
sed -e '1{' \
|
|
|
|
|
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
|
|
|
|
-e ' h' \
|
|
|
|
|
-e ' s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
|
|
|
|
|
-e ' H' \
|
|
|
|
|
-e ' x' \
|
|
|
|
|
-e '}' \
|
|
|
|
|
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
|
|
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
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>
19 years ago
|
|
|
$@.perl >$@+
|
|
|
|
|
chmod +x $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
git-cherry-pick: git-revert
|
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>
19 years ago
|
|
|
cp $< $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
git-status: git-commit
|
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>
19 years ago
|
|
|
cp $< $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
gitweb/gitweb.cgi: gitweb/gitweb.perl
|
|
|
|
|
rm -f $@ $@+
|
|
|
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
|
|
|
|
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
|
|
|
|
|
-e 's|++GIT_BINDIR++|$(bindir)|g' \
|
|
|
|
|
-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
|
|
|
|
|
-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
|
|
|
|
|
-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
|
|
|
|
|
-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
|
|
|
|
|
-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
|
|
|
|
|
-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
|
|
|
|
|
-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
|
|
|
|
|
-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' \
|
|
|
|
|
-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
|
|
|
|
|
-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
|
|
|
|
|
-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
|
|
|
|
|
$< >$@+
|
|
|
|
|
chmod +x $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
|
|
|
|
|
rm -f $@ $@+
|
|
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
|
|
|
|
-e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
|
|
|
|
|
-e '/@@GITWEB_CGI@@/d' \
|
|
|
|
|
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
|
|
|
|
|
-e '/@@GITWEB_CSS@@/d' \
|
|
|
|
|
$@.sh > $@+
|
|
|
|
|
chmod +x $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
configure: configure.ac
|
|
|
|
|
rm -f $@ $<+
|
|
|
|
|
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
|
$< > $<+
|
|
|
|
|
autoconf -o $@ $<+
|
|
|
|
|
rm -f $<+
|
|
|
|
|
|
|
|
|
|
# These can record GIT_VERSION
|
|
|
|
|
git$X git.spec \
|
|
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
|
: GIT-VERSION-FILE
|
|
|
|
|
|
|
|
|
|
%.o: %.c GIT-CFLAGS
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
|
%.o: %.S
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
|
|
|
|
|
|
exec_cmd.o: exec_cmd.c GIT-CFLAGS
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
|
|
|
|
|
builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
|
|
|
|
|
|
|
|
|
|
http.o: http.c GIT-CFLAGS
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
|
|
|
|
|
|
|
|
|
|
ifdef NO_EXPAT
|
|
|
|
|
http-fetch.o: http-fetch.c http.h GIT-CFLAGS
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
git-%$X: %.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
|
|
|
|
|
|
|
|
|
ssh-pull.o: ssh-fetch.c
|
|
|
|
|
ssh-push.o: ssh-upload.c
|
|
|
|
|
git-local-fetch$X: fetch.o
|
|
|
|
|
git-ssh-fetch$X: rsh.o fetch.o
|
|
|
|
|
git-ssh-upload$X: rsh.o
|
|
|
|
|
git-ssh-pull$X: rsh.o fetch.o
|
|
|
|
|
git-ssh-push$X: rsh.o
|
|
|
|
|
|
|
|
|
|
git-imap-send$X: imap-send.o $(LIB_FILE)
|
|
|
|
|
|
|
|
|
|
http.o http-fetch.o http-push.o: http.h
|
|
|
|
|
git-http-fetch$X: fetch.o http.o http-fetch.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
|
|
|
|
|
|
git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
|
|
|
|
|
|
$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
|
|
|
|
|
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
|
|
|
|
|
$(DIFF_OBJS): diffcore.h
|
|
|
|
|
|
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
|
|
|
rm -f $@ && $(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
|
|
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>
18 years ago
|
|
|
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
|
|
|
|
|
xdiff/xmerge.o
|
|
|
|
|
$(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>
19 years ago
|
|
|
|
|
|
|
|
$(XDIFF_LIB): $(XDIFF_OBJS)
|
|
|
|
|
rm -f $@ && $(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>
19 years ago
|
|
|
|
|
|
|
|
|
|
|
|
|
perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
|
|
|
|
|
(cd perl && $(PERL_PATH) Makefile.PL \
|
|
|
|
|
PREFIX='$(prefix_SQ)')
|
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>
19 years ago
|
|
|
|
|
|
|
|
doc:
|
|
|
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
|
|
|
|
|
TAGS:
|
|
|
|
|
rm -f TAGS
|
|
|
|
|
find . -name '*.[hcS]' -print | xargs etags -a
|
|
|
|
|
|
|
|
|
|
tags:
|
|
|
|
|
rm -f tags
|
|
|
|
|
find . -name '*.[hcS]' -print | xargs ctags -a
|
|
|
|
|
|
|
|
|
|
### Detect prefix changes
|
|
|
|
|
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
|
|
|
|
|
$(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
|
|
|
|
|
|
|
|
|
|
### Testing rules
|
|
|
|
|
|
|
|
|
|
# GNU make supports exporting all variables by "export" without parameters.
|
|
|
|
|
# However, the environment gets quite big, and some programs have problems
|
|
|
|
|
# with that.
|
|
|
|
|
|
|
|
|
|
export NO_SVN_TESTS
|
|
|
|
|
|
|
|
|
|
test: all
|
|
|
|
|
$(MAKE) -C t/ all
|
|
|
|
|
|
|
|
|
|
test-date$X: test-date.c date.o ctype.o
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
|
|
|
|
|
|
|
|
|
|
test-delta$X: test-delta.o diff-delta.o patch-delta.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
|
|
|
|
|
|
|
|
|
test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
|
|
|
|
|
|
|
|
|
test-sha1$X: test-sha1.o $(GITLIBS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
|
|
|
|
|
|
|
|
|
check-sha1:: test-sha1$X
|
|
|
|
|
./test-sha1.sh
|
|
|
|
|
|
|
|
|
|
check:
|
|
|
|
|
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
|
|
|
|
|
|
install: all
|
|
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
|
|
|
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
|
|
|
|
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
|
|
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
|
|
|
|
$(MAKE) -C perl prefix='$(prefix_SQ)' install
|
|
|
|
|
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
|
|
|
|
|
then \
|
|
|
|
|
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
|
|
|
|
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' || \
|
|
|
|
|
cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
|
|
|
|
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
|
|
|
|
|
fi
|
|
|
|
|
$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
|
|
|
|
|
|
|
|
|
|
install-doc:
|
|
|
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
|
|
|
|
|
|
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>
19 years ago
|
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
|
|
|
|
|
mv $@+ $@
|
|
|
|
|
|
|
|
|
|
GIT_TARNAME=git-$(GIT_VERSION)
|
|
|
|
|
dist: git.spec git-archive
|
|
|
|
|
./git-archive --format=tar \
|
|
|
|
|
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
|
|
|
|
@mkdir -p $(GIT_TARNAME)
|
|
|
|
|
@cp git.spec $(GIT_TARNAME)
|
|
|
|
|
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
|
|
|
|
$(TAR) rf $(GIT_TARNAME).tar \
|
|
|
|
|
$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
|
|
|
|
|
@rm -rf $(GIT_TARNAME)
|
|
|
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
|
|
|
|
|
|
|
|
|
rpm: dist
|
|
|
|
|
$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
|
|
|
|
|
|
|
|
|
|
htmldocs = git-htmldocs-$(GIT_VERSION)
|
|
|
|
|
manpages = git-manpages-$(GIT_VERSION)
|
|
|
|
|
dist-doc:
|
|
|
|
|
rm -fr .doc-tmp-dir
|
|
|
|
|
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
|
|
|
|
|
:
|
|
|
|
|
rm -fr .doc-tmp-dir
|
|
|
|
|
mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
|
|
|
|
|
$(MAKE) -C Documentation DESTDIR=./ \
|
|
|
|
|
man1dir=../.doc-tmp-dir/man1 \
|
|
|
|
|
man7dir=../.doc-tmp-dir/man7 \
|
|
|
|
|
install
|
|
|
|
|
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
|
|
|
|
|
gzip -n -9 -f $(manpages).tar
|
|
|
|
|
rm -fr .doc-tmp-dir
|
|
|
|
|
|
|
|
|
|
### Cleaning rules
|
|
|
|
|
|
|
|
|
|
clean:
|
|
|
|
|
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
|
|
|
|
|
$(LIB_FILE) $(XDIFF_LIB)
|
|
|
|
|
rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
|
|
|
|
|
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
|
|
|
|
|
rm -rf autom4te.cache
|
|
|
|
|
rm -f configure config.log config.mak.autogen config.mak.append config.status config.cache
|
|
|
|
|
rm -rf $(GIT_TARNAME) .doc-tmp-dir
|
|
|
|
|
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
|
|
|
|
rm -f $(htmldocs).tar.gz $(manpages).tar.gz
|
|
|
|
|
rm -f gitweb/gitweb.cgi
|
|
|
|
|
$(MAKE) -C Documentation/ clean
|
|
|
|
|
$(MAKE) -C perl clean
|
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>
19 years ago
|
|
|
$(MAKE) -C templates/ clean
|
|
|
|
|
$(MAKE) -C t/ clean
|
|
|
|
|
rm -f GIT-VERSION-FILE GIT-CFLAGS
|
|
|
|
|
|
|
|
|
|
.PHONY: all install clean strip
|
|
|
|
|
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags .FORCE-GIT-CFLAGS
|
|
|
|
|
|
|
|
|
|
### Check documentation
|
|
|
|
|
#
|
|
|
|
|
check-docs::
|
|
|
|
|
@for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \
|
|
|
|
|
do \
|
|
|
|
|
case "$$v" in \
|
|
|
|
|
git-merge-octopus | git-merge-ours | git-merge-recursive | \
|
|
|
|
|
git-merge-resolve | git-merge-stupid | git-merge-recur | \
|
|
|
|
|
git-ssh-pull | git-ssh-push ) continue ;; \
|
|
|
|
|
esac ; \
|
|
|
|
|
test -f "Documentation/$$v.txt" || \
|
|
|
|
|
echo "no doc: $$v"; \
|
|
|
|
|
grep -q "^gitlink:$$v\[[0-9]\]::" Documentation/git.txt || \
|
|
|
|
|
case "$$v" in \
|
|
|
|
|
git) ;; \
|
|
|
|
|
*) echo "no link: $$v";; \
|
|
|
|
|
esac ; \
|
|
|
|
|
done | sort
|
|
|
|
|
|
|
|
|
|
### Make sure built-ins do not have dups and listed in git.c
|
|
|
|
|
#
|
|
|
|
|
check-builtins::
|
|
|
|
|
./check-builtins.sh
|
