From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Dec 2009 22:33:05 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43?hp=-c

Merge branch 'maint'

* maint:
Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
Start 1.6.6.X maintenance track
Add git-http-backend to command-list.
t4019 "grep" portability fix
t1200: work around a bug in some implementations of "find"

Conflicts:
RelNotes
---

1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43
diff --combined Makefile
index fd4919c0ad,fd7f51e8b9..c11719c277
--- a/Makefile
+++ b/Makefile
@@@ -168,8 -168,6 +168,8 @@@ all:
  #
  # Define NO_PERL if you do not want Perl scripts or libraries at all.
  #
 +# Define NO_PYTHON if you do not want Python scripts or libraries at all.
 +#
  # Define NO_TCLTK if you do not want Tcl/Tk GUI.
  #
  # The TCL_PATH variable governs the location of the Tcl interpreter
@@@ -343,7 -341,6 +343,7 @@@ LIB_H 
  LIB_OBJS =
  PROGRAMS =
  SCRIPT_PERL =
 +SCRIPT_PYTHON =
  SCRIPT_SH =
  TEST_PROGRAMS =
  
@@@ -382,7 -379,6 +382,7 @@@ SCRIPT_PERL += git-svn.per
  
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
  	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
 +	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	  git-instaweb
  
  # Empty...
@@@ -438,12 -434,8 +438,12 @@@ endi
  ifndef PERL_PATH
  	PERL_PATH = /usr/bin/perl
  endif
 +ifndef PYTHON_PATH
 +	PYTHON_PATH = /usr/bin/python
 +endif
  
  export PERL_PATH
 +export PYTHON_PATH
  
  LIB_FILE=libgit.a
  XDIFF_LIB=xdiff/lib.a
@@@ -836,6 -828,7 +836,7 @@@ ifeq ($(uname_O),Cygwin
  endif
  ifeq ($(uname_S),FreeBSD)
  	NEEDS_LIBICONV = YesPlease
+ 	OLD_ICONV = YesPlease
  	NO_MEMMEM = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
@@@ -1354,10 -1347,6 +1355,10 @@@ ifeq ($(PERL_PATH),
  NO_PERL=NoThanks
  endif
  
 +ifeq ($(PYTHON_PATH),)
 +NO_PYTHON=NoThanks
 +endif
 +
  QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
  QUIET_SUBDIR1  =
  
@@@ -1405,7 -1394,6 +1406,7 @@@ prefix_SQ = $(subst ','\'',$(prefix)
  
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 +PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
  LIBS = $(GITLIBS) $(EXTLIBS)
@@@ -1452,9 -1440,6 +1453,9 @@@ ifndef NO_TCLT
  endif
  ifndef NO_PERL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
 +endif
 +ifndef NO_PYTHON
 +	$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
  endif
  	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
  
@@@ -1582,41 -1567,11 +1583,41 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git
  	mv $@+ $@
  endif # NO_PERL
  
 +
  ifdef JSMIN
  gitweb/gitweb.min.js: gitweb/gitweb.js
  	$(QUIET_GEN)$(JSMIN) <$< >$@
  endif # JSMIN
  
 +ifndef NO_PYTHON
 +$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
 +$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
 +	$(QUIET_GEN)$(RM) $@ $@+ && \
 +	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
 +		--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
 +		instlibdir` && \
 +	sed -e '1{' \
 +	    -e '	s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 +	    -e '}' \
 +	    -e 's|^import sys.*|&; \\\
 +	           import os; \\\
 +	           sys.path[0] = os.environ.has_key("GITPYTHONLIB") and \\\
 +	                         os.environ["GITPYTHONLIB"] or \\\
 +	                         "@@INSTLIBDIR@@"|' \
 +	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
 +	    $@.py >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +else # NO_PYTHON
 +$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh
 +	$(QUIET_GEN)$(RM) $@ $@+ && \
 +	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +	    -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
 +	    unimplemented.sh >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +endif # NO_PYTHON
 +
  configure: configure.ac
  	$(QUIET_GEN)$(RM) $@ $<+ && \
  	sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
@@@ -1743,7 -1698,6 +1744,7 @@@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPT
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
  	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
 +	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
  
  ### Detect Tck/Tk interpreter path changes
  ifndef NO_TCLTK
@@@ -1843,9 -1797,6 +1844,9 @@@ install: al
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  endif
 +ifndef NO_PYTHON
 +	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 +endif
  ifndef NO_TCLTK
  	$(MAKE) -C gitk-git install
  	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
@@@ -1962,9 -1913,6 +1963,9 @@@ clean
  ifndef NO_PERL
  	$(RM) gitweb/gitweb.cgi
  	$(MAKE) -C perl clean
 +endif
 +ifndef NO_PYTHON
 +	$(MAKE) -C git_remote_helpers clean
  endif
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean