a2239b79e5
Contains the following changes since v0.99.8c.
Johannes Schindelin:
Teach git-status about spaces in file names also on MacOSX
t5400-send-pack relies on a working cpio
Jonas Fonseca:
git.sh: quote all paths
Junio C Hamano:
Also force LC_ALL in test scripts.
OpenBSD needs the strcasestr replacement.
git-check-ref-format: reject funny ref names.
Refuse to create funny refs in clone-pack, git-fetch and receive-pack.
Ignore funny refname sent from remote
Introduce notation "ref^{type}".
Martin Langhoff:
cvsimport: don't pass --cvs-direct if user options contradict us
Ralf Baechle:
rsh.c: typo fix
Note that "funny ref" bits are not strictly fixes but rather
backport from the "master" branch. They will prevent refs and
heads with funny names from being created. In addition, what is
in the master branch will start feeding the clients unwrapped
tag information to help Martin's findtags and possibly later
Cogito. These backported "funny ref" changes are to prevent
clients on the "maint" branch from getting confused when talking
with newer git-upload-pack and when reading from info/refs file
prepared with newer git-update-server-info.
Signed-off-by: Junio C Hamano <junkio@cox.net>
419 lines
11 KiB
Makefile
419 lines
11 KiB
Makefile
# 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 NO_OPENSSL environment variable if you do not have OpenSSL. You will
|
|
# miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
|
|
#
|
|
# Define NO_CURL if you do not have curl installed. git-http-pull is 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_STRCASESTR if you don't have strcasestr.
|
|
#
|
|
# 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 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 WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
|
|
#
|
|
# Define COLLISION_CHECK below if you believe that SHA1's
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
# sufficient guarantee that no collisions between objects will ever happen.
|
|
|
|
# DEFINES += -DCOLLISION_CHECK
|
|
|
|
# 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).
|
|
|
|
# DEFINES += -DUSE_NSEC
|
|
|
|
# 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.
|
|
|
|
# DEFINES += -DUSE_STDEV
|
|
|
|
GIT_VERSION = 0.99.8d
|
|
|
|
CFLAGS = -g -O2 -Wall
|
|
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
|
|
|
|
prefix = $(HOME)
|
|
bindir = $(prefix)/bin
|
|
template_dir = $(prefix)/share/git-core/templates/
|
|
GIT_PYTHON_DIR = $(prefix)/share/git-core/python
|
|
# DESTDIR=
|
|
|
|
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 ---
|
|
|
|
SCRIPT_SH = \
|
|
git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
|
|
git-cherry.sh git-clone.sh git-commit.sh \
|
|
git-count-objects.sh git-diff.sh git-fetch.sh \
|
|
git-format-patch.sh git-log.sh git-ls-remote.sh \
|
|
git-merge-one-file.sh git-octopus.sh git-parse-remote.sh \
|
|
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
|
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
|
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
|
|
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
|
|
git-applymbox.sh git-applypatch.sh \
|
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
|
git-merge-resolve.sh git-grep.sh
|
|
|
|
SCRIPT_PERL = \
|
|
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
|
git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl
|
|
|
|
SCRIPT_PYTHON = \
|
|
git-merge-recursive.py
|
|
|
|
# The ones that do not have to link with lcrypto nor lz.
|
|
SIMPLE_PROGRAMS = \
|
|
git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
|
|
git-daemon git-var
|
|
|
|
# ... and all the rest
|
|
PROGRAMS = \
|
|
git-apply git-cat-file \
|
|
git-checkout-index git-clone-pack git-commit-tree \
|
|
git-convert-objects git-diff-files \
|
|
git-diff-index git-diff-stages \
|
|
git-diff-tree git-fetch-pack git-fsck-objects \
|
|
git-hash-object git-init-db \
|
|
git-local-fetch git-ls-files git-ls-tree git-merge-base \
|
|
git-merge-index git-mktag git-pack-objects git-patch-id \
|
|
git-peek-remote git-prune-packed git-read-tree \
|
|
git-receive-pack git-rev-list git-rev-parse \
|
|
git-send-pack git-show-branch \
|
|
git-show-index git-ssh-fetch \
|
|
git-ssh-upload git-tar-tree git-unpack-file \
|
|
git-unpack-objects git-update-index git-update-server-info \
|
|
git-upload-pack git-verify-pack git-write-tree \
|
|
git-update-ref git-symbolic-ref git-check-ref-format \
|
|
$(SIMPLE_PROGRAMS)
|
|
|
|
# Backward compatibility -- to be removed after 1.0
|
|
PROGRAMS += git-ssh-pull git-ssh-push
|
|
|
|
GIT_LIST_TWEAK =
|
|
|
|
PYMODULES = \
|
|
gitMergeCommon.py
|
|
|
|
ifdef WITH_OWN_SUBPROCESS_PY
|
|
PYMODULES += compat/subprocess.py
|
|
endif
|
|
|
|
ifdef WITH_SEND_EMAIL
|
|
SCRIPT_PERL += git-send-email.perl
|
|
else
|
|
GIT_LIST_TWEAK += -e '/^send-email$$/d'
|
|
endif
|
|
|
|
LIB_FILE=libgit.a
|
|
|
|
LIB_H = \
|
|
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
|
|
diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
|
|
run-command.h strbuf.h tag.h tree.h
|
|
|
|
DIFF_OBJS = \
|
|
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
|
|
diffcore-pickaxe.o diffcore-rename.o
|
|
|
|
LIB_OBJS = \
|
|
blob.o commit.o connect.o count-delta.o csum-file.o \
|
|
date.o diff-delta.o entry.o ident.o index.o \
|
|
object.o pack-check.o patch-delta.o path.o pkt-line.o \
|
|
quote.o read-cache.o refs.o run-command.o \
|
|
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
|
|
tag.o tree.o usage.o $(DIFF_OBJS)
|
|
|
|
LIBS = $(LIB_FILE)
|
|
LIBS += -lz
|
|
|
|
#
|
|
# Platform specific tweaks
|
|
#
|
|
ifeq ($(shell uname -s),Darwin)
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
NEEDS_LIBICONV = YesPlease
|
|
endif
|
|
ifeq ($(shell uname -s),SunOS)
|
|
NEEDS_SOCKET = YesPlease
|
|
NEEDS_NSL = YesPlease
|
|
SHELL_PATH = /bin/bash
|
|
NO_STRCASESTR = YesPlease
|
|
CURLDIR = /opt/sfw
|
|
INSTALL = ginstall
|
|
TAR = gtar
|
|
PLATFORM_DEFINES += -D__EXTENSIONS__
|
|
endif
|
|
ifneq (,$(findstring arm,$(shell uname -m)))
|
|
ARM_SHA1 = YesPlease
|
|
endif
|
|
ifeq ($(shell uname -s),OpenBSD)
|
|
NO_STRCASESTR = YesPlease
|
|
NEEDS_LIBICONV = YesPlease
|
|
PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
|
|
endif
|
|
|
|
ifndef NO_CURL
|
|
ifdef CURLDIR
|
|
# This is still problematic -- gcc does not want -R.
|
|
CFLAGS += -I$(CURLDIR)/include
|
|
CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
|
|
else
|
|
CURL_LIBCURL = -lcurl
|
|
endif
|
|
PROGRAMS += git-http-fetch
|
|
endif
|
|
|
|
ifndef SHELL_PATH
|
|
SHELL_PATH = /bin/sh
|
|
endif
|
|
ifndef PERL_PATH
|
|
PERL_PATH = /usr/bin/perl
|
|
endif
|
|
ifndef PYTHON_PATH
|
|
PYTHON_PATH = /usr/bin/python
|
|
endif
|
|
|
|
ifndef NO_OPENSSL
|
|
LIB_OBJS += epoch.o
|
|
OPENSSL_LIBSSL = -lssl
|
|
ifdef OPENSSLDIR
|
|
# Again this may be problematic -- gcc does not always want -R.
|
|
CFLAGS += -I$(OPENSSLDIR)/include
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
|
|
else
|
|
OPENSSL_LINK =
|
|
endif
|
|
else
|
|
DEFINES += '-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.
|
|
CFLAGS += -I$(ICONVDIR)/include
|
|
ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
|
|
else
|
|
ICONV_LINK =
|
|
endif
|
|
LIB_4_ICONV = $(ICONV_LINK) -liconv
|
|
else
|
|
LIB_4_ICONV =
|
|
endif
|
|
ifdef NEEDS_SOCKET
|
|
LIBS += -lsocket
|
|
SIMPLE_LIB += -lsocket
|
|
endif
|
|
ifdef NEEDS_NSL
|
|
LIBS += -lnsl
|
|
SIMPLE_LIB += -lnsl
|
|
endif
|
|
ifdef NO_STRCASESTR
|
|
DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
|
|
LIB_OBJS += compat/strcasestr.o
|
|
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>
|
|
LIBS += $(LIB_4_CRYPTO)
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
|
gitk
|
|
|
|
export TAR INSTALL DESTDIR SHELL_PATH
|
|
### Build rules
|
|
|
|
all: $(PROGRAMS) $(SCRIPTS)
|
|
|
|
all:
|
|
$(MAKE) -C templates
|
|
|
|
git: git.sh Makefile
|
|
rm -f $@+ $@
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
$(GIT_LIST_TWEAK) <$@.sh >$@+
|
|
chmod +x $@+
|
|
mv $@+ $@
|
|
|
|
$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
|
|
rm -f $@
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' $@.sh >$@
|
|
chmod +x $@
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
|
|
rm -f $@
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@
|
|
chmod +x $@
|
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
|
|
rm -f $@
|
|
sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \
|
|
-e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \
|
|
$@.py >$@
|
|
chmod +x $@
|
|
|
|
%.o: %.c
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
%.o: %.S
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
git-%: %.o $(LIB_FILE)
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
|
|
|
git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV)
|
|
$(SIMPLE_PROGRAMS) : $(LIB_FILE)
|
|
$(SIMPLE_PROGRAMS) : git-% : %.o
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB)
|
|
|
|
git-http-fetch: fetch.o
|
|
git-local-fetch: fetch.o
|
|
git-ssh-fetch: rsh.o fetch.o
|
|
git-ssh-upload: rsh.o
|
|
git-ssh-pull: rsh.o fetch.o
|
|
git-ssh-push: rsh.o
|
|
|
|
git-http-fetch: LIBS += $(CURL_LIBCURL)
|
|
git-rev-list: LIBS += $(OPENSSL_LIBSSL)
|
|
|
|
init-db.o: init-db.c
|
|
$(CC) -c $(ALL_CFLAGS) \
|
|
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
|
|
|
|
$(LIB_OBJS): $(LIB_H)
|
|
$(patsubst git-%,%.o,$(PROGRAMS)): $(LIB_H)
|
|
$(DIFF_OBJS): diffcore.h
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
doc:
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
|
### Testing rules
|
|
|
|
test: all
|
|
$(MAKE) -C t/ all
|
|
|
|
test-date: test-date.c date.o
|
|
$(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o
|
|
|
|
test-delta: test-delta.c diff-delta.o patch-delta.o
|
|
$(CC) $(ALL_CFLAGS) -o $@ $^
|
|
|
|
check:
|
|
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i; done
|
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
install: $(PROGRAMS) $(SCRIPTS)
|
|
$(INSTALL) -d -m755 $(DESTDIR)$(bindir)
|
|
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
|
|
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
|
|
sh ./cmd-rename.sh $(DESTDIR)$(bindir)
|
|
$(MAKE) -C templates install
|
|
$(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
|
|
$(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
|
|
|
|
install-doc:
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
git-core.spec: git-core.spec.in Makefile
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
|
|
|
|
GIT_TARNAME=git-core-$(GIT_VERSION)
|
|
dist: git-core.spec git-tar-tree
|
|
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
|
|
@mkdir -p $(GIT_TARNAME)
|
|
@cp git-core.spec $(GIT_TARNAME)
|
|
$(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
|
|
@rm -rf $(GIT_TARNAME)
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
|
|
|
rpm: dist
|
|
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
|
|
|
|
deb: dist
|
|
rm -rf $(GIT_TARNAME)
|
|
$(TAR) zxf $(GIT_TARNAME).tar.gz
|
|
dpkg-source -b $(GIT_TARNAME)
|
|
cd $(GIT_TARNAME) && fakeroot debian/rules binary
|
|
|
|
### Cleaning rules
|
|
|
|
clean:
|
|
rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
|
|
rm -f $(filter-out gitk,$(SCRIPTS))
|
|
rm -f git-core.spec *.pyc *.pyo
|
|
rm -rf $(GIT_TARNAME)
|
|
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
|
rm -f git-core_$(GIT_VERSION)-*.deb git-core_$(GIT_VERSION)-*.dsc
|
|
rm -f git-tk_$(GIT_VERSION)-*.deb
|
|
$(MAKE) -C Documentation/ clean
|
|
$(MAKE) -C templates clean
|
|
$(MAKE) -C t/ clean
|