git: update to v2.22.0

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 42e8bfd0c0c173a188b97f0103e40ac2882b4de8..b2bd3514f8c9b0c9f27c5f4325da04e9b4552a6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 all::
 
 all::
 

-CGIT_VERSION = v0.9.1
+CGIT_VERSION = v1.2.1

 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit

-prefix = /usr
+prefix = /usr/local

 libdir = $(prefix)/lib
 filterdir = $(libdir)/cgit/filters
 docdir = $(prefix)/share/doc/cgit
 libdir = $(prefix)/lib
 filterdir = $(libdir)/cgit/filters
 docdir = $(prefix)/share/doc/cgit


@@ -14,47 +14,39 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>

-GIT_VER = 1.7.12.4
-GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
+GIT_VER = 2.22.0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz

 INSTALL = install
 INSTALL = install

+COPYTREE = cp -r

 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
 DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
 DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
 DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
 DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 

-# Define NO_STRCASESTR if you don't have strcasestr.
-#
-# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
-# implementation (slower).
-#
-# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
-#
+ASCIIDOC = asciidoc
+ASCIIDOC_EXTRA =
+ASCIIDOC_HTML = xhtml11
+ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA)
+TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
+

 # 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_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 HAVE_LINUX_SENDFILE to use sendfile()

 
 #-include config.mak
 
 
 #-include config.mak
 

-#
-# Platform specific tweaks
-#
-
-VERSION: force-version
-       @./gen-version.sh "$(CGIT_VERSION)"
--include VERSION
-
-uname_S := $(shell sh -c 'uname -s 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')
-
+-include git/config.mak.uname

 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 

+export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
+

 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
 # from git.git
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
 # from git.git


@@ -62,15 +54,13 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 

-ifneq ($(findstring $(MAKEFLAGS),w),w)
+ifneq ($(findstring w,$(MAKEFLAGS)),w)

 PRINT_DIR = --no-print-directory
 else # "make -w"
 NO_SUBDIR = :
 endif
 
 ifndef V
 PRINT_DIR = --no-print-directory
 else # "make -w"
 NO_SUBDIR = :
 endif
 
 ifndef V

-       QUIET_CC       = @echo '   ' CC $@;
-       QUIET_LINK     = @echo '   ' LINK $@;

        QUIET_SUBDIR0  = +@subdir=
        QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
                         $(MAKE) $(PRINT_DIR) -C $$subdir
        QUIET_SUBDIR0  = +@subdir=
        QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
                         $(MAKE) $(PRINT_DIR) -C $$subdir


@@ -78,109 +68,18 @@ ifndef V
        export V
 endif
 
        export V
 endif
 

-LDFLAGS ?=
-CFLAGS ?= -g -Wall
-CFLAGS += -Igit
-CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
-CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
-CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
-CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
-CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
-
-ifeq ($(uname_O),Cygwin)
-       NO_STRCASESTR = YesPlease
-       NEEDS_LIBICONV = YesPlease
-endif
-
-ifeq ($(uname_S),$(filter $(uname_S),FreeBSD OpenBSD))
-       # Apparantly libiconv is installed in /usr/local on BSD
-       LDFLAGS += -L/usr/local/lib
-       CFLAGS += -I/usr/local/include
-       NEEDS_LIBICONV = yes
-endif
-
-GIT_OPTIONS = prefix=/usr
-OBJECTS =
-
-ifdef NO_ICONV
-       CFLAGS += -DNO_ICONV
-endif
-ifdef NO_STRCASESTR
-       CFLAGS += -DNO_STRCASESTR
-endif
-ifdef NO_C99_FORMAT
-       CFLAGS += -DNO_C99_FORMAT
-endif
-ifdef NO_OPENSSL
-       CFLAGS += -DNO_OPENSSL
-       GIT_OPTIONS += NO_OPENSSL=1
-else
-       LDLIBS += -lcrypto
-endif
-
-ifdef NEEDS_LIBICONV
-       LDLIBS += -liconv
-endif
-
-LDLIBS += git/libgit.a git/xdiff/lib.a -lz -lpthread
-
-OBJECTS += cgit.o
-OBJECTS += cache.o
-OBJECTS += cmd.o
-OBJECTS += configfile.o
-OBJECTS += html.o
-OBJECTS += parsing.o
-OBJECTS += scan-tree.o
-OBJECTS += shared.o
-OBJECTS += ui-atom.o
-OBJECTS += ui-blob.o
-OBJECTS += ui-clone.o
-OBJECTS += ui-commit.o
-OBJECTS += ui-diff.o
-OBJECTS += ui-log.o
-OBJECTS += ui-patch.o
-OBJECTS += ui-plain.o
-OBJECTS += ui-refs.o
-OBJECTS += ui-repolist.o
-OBJECTS += ui-shared.o
-OBJECTS += ui-snapshot.o
-OBJECTS += ui-ssdiff.o
-OBJECTS += ui-stats.o
-OBJECTS += ui-summary.o
-OBJECTS += ui-tag.o
-OBJECTS += ui-tree.o
-OBJECTS += vector.o
-
-dep_files := $(foreach f,$(OBJECTS),$(dir $f).deps/$(notdir $f).d)
-dep_dirs := $(addsuffix .deps,$(sort $(dir $OBJECTS)))
-
-$(dep_dirs):
-       @mkdir -p $@
-
-missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs))
-dep_file = $(dir $@).deps/$(notdir $@).d
-dep_args = -MF $(dep_file) -MMD -MP
-

 .SUFFIXES:
 
 .SUFFIXES:
 

-$(OBJECTS): %.o: %.c $(missing_dep_dirs)
-       $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(CFLAGS) $<
-
-dep_files_present := $(wildcard $(dep_files))
-ifneq ($(dep_files_present),)
-include $(dep_files_present)
-endif
-

 all:: cgit
 
 all:: cgit
 

-cgit: VERSION $(OBJECTS) libgit
-       $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
+cgit:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1

 
 

-libgit:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
+sparse:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk NO_CURL=1 cgit-sparse

 
 

-test: all
+test:
+       @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all

        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all


@@ -189,8 +88,10 @@ install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png

+       $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
+       $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt

        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)

-       $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+       $(COPYTREE) filters/* $(DESTDIR)$(filterdir)

 
 install-doc: install-man install-html install-pdf
 
 
 install-doc: install-man install-html install-pdf
 


@@ -210,6 +111,7 @@ uninstall:
        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png

+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico

 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 
 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 


@@ -238,13 +140,14 @@ doc-pdf: $(DOC_PDF)
        a2x -f manpage $<
 
 $(DOC_HTML): %.html : %.txt
        a2x -f manpage $<
 
 $(DOC_HTML): %.html : %.txt

-       a2x -f xhtml --stylesheet=cgit-doc.css $<
+       $(TXT_TO_HTML) -o $@+ $< && \
+       mv $@+ $@

 
 $(DOC_PDF): %.pdf : %.txt
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc
 
 $(DOC_PDF): %.pdf : %.txt
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc

-       $(RM) cgit VERSION *.o tags
+       $(RM) cgit VERSION CGIT-CFLAGS *.o tags

        $(RM) -r .deps
 
 cleanall: clean
        $(RM) -r .deps
 
 cleanall: clean


@@ -254,12 +157,12 @@ clean-doc:
        $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 
 get-git:
        $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 
 get-git:

-       curl -L $(GIT_URL) | tar -xzf - && rm -rf git && mv git-$(GIT_VER) git
+       curl -L $(GIT_URL) | tar -xJf - && rm -rf git && mv git-$(GIT_VER) git

 
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
 
 
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
 

-.PHONY: all cgit get-git libgit force-version
+.PHONY: all cgit git get-git

 .PHONY: clean clean-doc cleanall
 .PHONY: doc doc-html doc-man doc-pdf
 .PHONY: install install-doc install-html install-man install-pdf
 .PHONY: clean clean-doc cleanall
 .PHONY: doc doc-html doc-man doc-pdf
 .PHONY: install install-doc install-html install-man install-pdf