From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jun 2012 21:42:38 +0000 (-0700)
Subject: Merge branch 'vr/help-per-platform'
X-Git-Tag: v1.7.12-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a88d7aaee8f8b80fdd2b70d38beb534b5102ee7c?hp=-c

Merge branch 'vr/help-per-platform'

We used to always default to "man" format even on platforms where
"man" viewer is not widely available.

* vr/help-per-platform:
help: use HTML as the default help format on Windows
---

a88d7aaee8f8b80fdd2b70d38beb534b5102ee7c
diff --combined Makefile
index 62de0b42b9,e09ab97a3f..f62ca2aebb
--- a/Makefile
+++ b/Makefile
@@@ -297,8 -297,9 +297,12 @@@ all:
  # fast unaligned word loads.  Does NOT work on big-endian systems!
  # Enabled by default on x86_64.
  #
 +# Define GIT_USER_AGENT if you want to change how git identifies itself during
 +# network interactions.  The default is "git/$(GIT_VERSION)".
++#
+ # Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
+ # (defaults to "man") if you want to have a different default when
+ # "git help" is called without a parameter specifying the format.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -802,7 -803,6 +806,7 @@@ LIB_OBJS += usage.
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
  LIB_OBJS += varint.o
 +LIB_OBJS += version.o
  LIB_OBJS += walker.o
  LIB_OBJS += wrapper.o
  LIB_OBJS += write_or_die.o
@@@ -908,8 -908,6 +912,8 @@@ BUILTIN_OBJS += builtin/write-tree.
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  EXTLIBS =
  
 +GIT_USER_AGENT = git/$(GIT_VERSION)
 +
  #
  # Platform specific tweaks
  #
@@@ -1242,6 -1240,7 +1246,7 @@@ ifeq ($(uname_S),Windows
  	BLK_SHA1 = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	NATIVE_CRLF = YesPlease
+ 	DEFAULT_HELP_FORMAT = html
  
  	CC = compat/vcbuild/scripts/clink.pl
  	AR = compat/vcbuild/scripts/lib.pl
@@@ -1921,11 -1920,10 +1926,15 @@@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHE
  BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
  endif
  
 +GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT))
 +GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))"
 +GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ))
 +BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)'
 +
+ ifdef DEFAULT_HELP_FORMAT
+ BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
+ endif
+ 
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)
  
@@@ -1973,7 -1971,7 +1982,7 @@@ strip: $(PROGRAMS) git$
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
  git.o: common-cmds.h
 -git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
 +git.sp git.s git.o: EXTRA_CPPFLAGS = \
  	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
  	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
  	'-DGIT_INFO_PATH="$(infodir_SQ)"'
@@@ -1990,9 -1988,6 +1999,9 @@@ builtin/help.sp builtin/help.s builtin/
  	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
  	'-DGIT_INFO_PATH="$(infodir_SQ)"'
  
 +version.sp version.s version.o: EXTRA_CPPFLAGS = \
 +	'-DGIT_VERSION="$(GIT_VERSION)"'
 +
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
  	ln git$X $@ 2>/dev/null || \
@@@ -2010,7 -2005,6 +2019,7 @@@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|
      -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
      -e 's|@@DIFF@@|$(DIFF_SQ)|' \
      -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 +    -e 's|@@GIT_USER_AGENT@@|$(GIT_USER_AGENT_SQ)|g' \
      -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
      -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
      -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
@@@ -2104,7 -2098,7 +2113,7 @@@ configure: configure.a
  	$(RM) $<+
  
  # These can record GIT_VERSION
 -git.o git.spec \
 +version.o git.spec \
  	$(patsubst %.sh,%,$(SCRIPT_SH)) \
  	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
  	: GIT-VERSION-FILE
@@@ -2274,6 -2268,9 +2283,6 @@@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS 
  gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
  	-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
  
 -http.sp http.s http.o: EXTRA_CPPFLAGS = \
 -	-DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
 -
  ifdef NO_EXPAT
  http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif