global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 10:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'resource-version' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2016-12-12 22:31:02 +01:00
parent f76800144e 3bf90d5376
commit edcf185ddc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -1822,9 +1822,14 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
$(QUIET_GEN)$(cmd_munge_script) && \
mv $@+ $@
ifeq (,$(findstring .windows.,$(GIT_VERSION)))
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) -DPATCHLEVEL=0
else
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION)))))))
endif
git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
$(QUIET_RC)$(RC) $(RC_VERSION_DEFS) \
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
# This makes sure we depend on the NO_PERL setting itself.

4
git.rc
View File

@@ -1,6 +1,6 @@
1 VERSIONINFO
FILEVERSION MAJOR,MINOR,0,0
PRODUCTVERSION MAJOR,MINOR,0,0
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
BEGIN
BLOCK "StringFileInfo"
BEGIN