Blob

Date:
Message:
merge new diff implementation from the git.gameoftrees.org diff.git repository This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.
Actions:
History | Blame | Raw File
1 .PATH:${.CURDIR}/../lib

3 .include "../got-version.mk"

5 PROG=		tog

6 SRCS=		tog.c blame.c commit_graph.c delta.c diff.c \

7 		diffreg.c error.c fileindex.c object.c object_cache.c \

8 		object_idset.c object_parse.c opentemp.c path.c pack.c \

9 		privsep.c reference.c repository.c sha1.c worktree.c \

10 		utf8.c inflate.c buf.c rcsutil.c diff3.c \

11 		lockfile.c deflate.c object_create.c delta_cache.c \

12 		gotconfig.c diff_main.c diff_atomize_text.c \

13 		diff_myers.c diff_output.c diff_output_plain.c \

14 		diff_output_unidiff.c diff_output_edscript.c \

15 		diff_patience.c

16 MAN =		${PROG}.1

18 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib

20 .if defined(PROFILE)

21 LDADD = -lpanel_p -lncursesw_p -lutil_p -lz_p -lpthread_p -lc_p

22 .else

23 LDADD = -lpanel -lncursesw -lutil -lz -lpthread

24 .endif

25 DPADD = ${LIBZ} ${LIBUTIL}

27 .if ${GOT_RELEASE} != "Yes"

28 NOMAN = Yes

29 .endif

31 realinstall:

32 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \

33 	-m ${BINMODE} ${PROG} ${BINDIR}/${PROG}

35 .include <bsd.prog.mk>