git: update to v2.20.0

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a9887517a14f72235f04a86eb3ae4d8ec67a156d..e690c7f4bc3f9fd3109e0740d25eb2ca57b393f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
-CGIT_VERSION = v0.8.3.4
+all::
+
+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


@@ -12,48 +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.4
-GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+GIT_VER = 2.20.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
-#
-
-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')
-
-ifeq ($(uname_O),Cygwin)
-       NO_STRCASESTR = YesPlease
-       NEEDS_LIBICONV = YesPlease
-endif
-
+-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


@@ -61,117 +54,32 @@ endif
 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_MM       = @echo '   ' MM $@;

        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

+       QUIET_TAGS     = @echo '   ' TAGS $@;
+       export V

 endif
 
 endif
 

-#
-# Define a pattern rule for automatic dependency building
-#
-%.d: %.c
-       $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
-
-#
-# Define a pattern rule for silent object building
-#
-%.o: %.c
-       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
-
-
-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread
-OBJECTS =
-OBJECTS += cache.o
-OBJECTS += cgit.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
-
-ifdef NEEDS_LIBICONV
-       EXTLIBS += -liconv
-endif
+.SUFFIXES:

 
 

+all:: cgit

 
 

-.PHONY: all libgit test install uninstall clean force-version get-git \
-       doc clean-doc install-doc install-man install-html install-pdf \
-       uninstall-doc uninstall-man uninstall-html uninstall-pdf
+cgit:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1

 
 

-all: cgit
+sparse:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk NO_CURL=1 cgit-sparse

 
 

-VERSION: force-version
-       @./gen-version.sh "$(CGIT_VERSION)"
--include VERSION
-
-
-CFLAGS += -g -Wall -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)"'
-
-GIT_OPTIONS = prefix=/usr
-
-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
-       EXTLIBS += -lcrypto
-endif
-
-cgit: $(OBJECTS) libgit
-       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
-
-cgit.o: VERSION
-
-ifneq "$(MAKECMDGOALS)" "clean"
-  -include $(OBJECTS:.o=.d)
-endif
-
-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
-
-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


@@ -180,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
 


@@ -198,9 +108,10 @@ install-pdf: doc-pdf
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:

-       rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-       rm -f $(CGIT_DATA_PATH)/cgit.css
-       rm -f $(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
 


@@ -229,16 +140,31 @@ 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 -f cgit VERSION *.o *.d
+       $(RM) cgit VERSION CGIT-CFLAGS *.o tags
+       $(RM) -r .deps
+
+cleanall: clean
+       $(MAKE) -C git clean

 
 clean-doc:
 
 clean-doc:

-       rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
+       $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo

 
 get-git:
 
 get-git:

-       curl $(GIT_URL) | tar -xj && 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
+
+.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: tags test
+.PHONY: uninstall uninstall-doc uninstall-html uninstall-man uninstall-pdf