m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better update of FILEVERSION in gfx2.rc

Browse Source
This commit is contained in:
Thomas Bernard 2018-06-28 12:41:39 +02:00
parent d5d518864f
commit d7abcb36c9
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile
View File

@ -55,6 +55,9 @@ endif
ifneq (,$(LABEL)) ifneq (,$(LABEL))
LABEL_CACHE = .label.cache LABEL_CACHE = .label.cache
RES := $(shell if [ ! -f $(LABEL_CACHE) ] || [ "`cat $(LABEL_CACHE)`" != "$(LABEL)" ] ; then echo "$(LABEL)" > $(LABEL_CACHE) ; fi ) RES := $(shell if [ ! -f $(LABEL_CACHE) ] || [ "`cat $(LABEL_CACHE)`" != "$(LABEL)" ] ; then echo "$(LABEL)" > $(LABEL_CACHE) ; fi )
else
# get label stored in pversion.c
LABEL := $(shell cat pversion.c | cut -f 2 -d '"')
endif endif
CFLAGS_CACHE = $(OBJDIR)/.cflags.cache CFLAGS_CACHE = $(OBJDIR)/.cflags.cache
@ -786,14 +789,12 @@ endif
version.c: $(REVISION_CACHE) version.c: $(REVISION_CACHE)
echo "const char SVN_revision[]=\"$(GIT_REVISION)\";" > version.c echo "const char SVN_revision[]=\"$(GIT_REVISION)\";" > version.c
ifneq ($(LABEL),)
pversion.c: $(LABEL_CACHE) pversion.c: $(LABEL_CACHE)
echo "const char Program_version[]=\"$(LABEL)\";" > pversion.c echo "const char Program_version[]=\"$(LABEL)\";" > pversion.c
endif
$(OBJDIR)/versiontag: pversion.c $(REVISION_CACHE) $(OBJDIR)/versiontag: pversion.c $(REVISION_CACHE)
$(if $(wildcard $(OBJDIR)),,$(MKDIR) $(OBJDIR)) $(if $(wildcard $(OBJDIR)),,$(MKDIR) $(OBJDIR))
echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.$(GIT_REVISION) | tr " :" "_-" | sed -e "s/\([wW][iI][pP]\)\\./\1/" > $(OBJDIR)/versiontag echo "$(subst wip.,wip,$(LABEL).$(GIT_REVISION))" > $@
RES := $(shell $(MKDIR) $(OBJDIR) ; if [ ! -f $(CFLAGS_CACHE) ] || [ "`cat $(CFLAGS_CACHE)`" != "$(COPT) $(CFLAGS)" ] ; then echo "$(COPT) $(CFLAGS)" > $(CFLAGS_CACHE) ; fi ) RES := $(shell $(MKDIR) $(OBJDIR) ; if [ ! -f $(CFLAGS_CACHE) ] || [ "`cat $(CFLAGS_CACHE)`" != "$(COPT) $(CFLAGS)" ] ; then echo "$(COPT) $(CFLAGS)" > $(CFLAGS_CACHE) ; fi )
@ -823,10 +824,12 @@ $(OBJDIR)/%.o : %.m
depend : depend :
$(CC) -MM *.c | sed 's:^[^ ]:$$(OBJDIR)/&:' > Makefile.dep $(CC) -MM *.c | sed 's:^[^ ]:$$(OBJDIR)/&:' > Makefile.dep
comma := ,
# Link the icons to the program under windows # Link the icons to the program under windows
$(OBJDIR)/winres.o : gfx2.rc gfx2.ico $(REVISION_CACHE) $(OBJDIR)/winres.o : gfx2.rc gfx2.ico $(REVISION_CACHE) $(LABEL_CACHE)
sed -e 's/\(VERSION [ ]*\([0-9]*,\)\{3\}\)\(.*\)/\1$(firstword $(subst -, ,$(GIT_REVISION)))/' \ sed -e 's/\(VERSION [ ]*\)\(.*\)/\1$(subst .,$(comma),$(subst wip,,$(LABEL))),0,$(firstword $(subst -, ,$(GIT_REVISION)))/' \
-e 's/\(Version", "\([0-9]*\.\)\{2\}\)\(.*\)"/\1$(GIT_REVISION)"/' $< > $<.tmp -e 's/\(Version", "\)\(.*\)"/\1$(subst wip.,wip,$(LABEL).$(GIT_REVISION))"/' $< > $<.tmp
if ! diff -q -i $< $<.tmp ; then mv $<.tmp $< ; else rm $<.tmp ; fi if ! diff -q -i $< $<.tmp ; then mv $<.tmp $< ; else rm $<.tmp ; fi
$(WINDRES) -i $< -o $(OBJDIR)/winres.o $(WINDRES) -i $< -o $(OBJDIR)/winres.o

8
src/gfx2.rc
View File

@ -5,8 +5,8 @@
#endif #endif
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,5,0,2047 FILEVERSION 2,6,0,2058
PRODUCTVERSION 2,5,0,2047 PRODUCTVERSION 2,6,0,2058
FILEFLAGSMASK VS_FF_DEBUG FILEFLAGSMASK VS_FF_DEBUG
#ifdef DEBUG #ifdef DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
@ -20,12 +20,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "The GrafX2 Team" VALUE "CompanyName", "The GrafX2 Team"
VALUE "FileDescription", "The ultimate 256-color painting programm" VALUE "FileDescription", "The ultimate 256-color painting programm"
VALUE "FileVersion", "2.5.2047" VALUE "FileVersion", "2.6wip2058-rc"
VALUE "InternalName", "grafx2" VALUE "InternalName", "grafx2"
VALUE "LegalCopyright", "(c) 2007-2018 The GrafX2 Team, (c) 1996-2001 Sunset Design" VALUE "LegalCopyright", "(c) 2007-2018 The GrafX2 Team, (c) 1996-2001 Sunset Design"
VALUE "OriginalFilename", "grafx2.exe" VALUE "OriginalFilename", "grafx2.exe"
VALUE "ProductName", "GrafX2" VALUE "ProductName", "GrafX2"
VALUE "ProductVersion", "2.5.2047" VALUE "ProductVersion", "2.6wip2058-rc"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"