diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:23:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:23:38 +0300 |
| commit | 3fea5c5911919ab4c4abc333624ccbbacc2e54ef (patch) | |
| tree | 3ba40f7c7b028e9b4f8ef8314b5c929f22eab7dc | |
| parent | b16488eb3cf8b39e6a4ee941295a4aac45bc073a (diff) | |
| parent | da10ea373b80cc8bf8efca5acb1d11ecf410fb0c (diff) | |
Merge branch 'jn/reproducible-build'
The build procedure has been taught to avoid some unnecessary
instability in the build products.
* jn/reproducible-build:
generate-cmdlist: avoid non-deterministic output
git-gui: sort entries in optimized tclIndex
| -rwxr-xr-x | generate-cmdlist.sh | 2 | ||||
| -rw-r--r-- | git-gui/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index ab0d1b0c06..eeea4b67ea 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo "/* Automatically generated by $0 */ +echo "/* Automatically generated by generate-cmdlist.sh */ struct cmdname_help { char name[16]; char help[80]; diff --git a/git-gui/Makefile b/git-gui/Makefile index 918a8de369..f10caedaa7 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -254,7 +254,7 @@ $(ALL_MSGFILES): %.msg : %.po lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS $(QUIET_INDEX)if echo \ $(foreach p,$(PRELOAD_FILES),source $p\;) \ - auto_mkindex lib '*.tcl' \ + auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \ | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \ else \ echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \ |