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

2.6 => 2.7wip

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-09 18:44:25 +01:00
parent 9951d46279
commit 52ccd396d5
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -4,7 +4,8 @@ OPT = WIN32CROSS=1 \
endif endif
.PHONY: all tools grafx2 ziprelease 3rdparty win32installer \ .PHONY: all tools grafx2 ziprelease 3rdparty win32installer \
doc doxygen docarchive doxygenarchive htmldoc doc doxygen docarchive doxygenarchive htmldoc \
updateversion
all: grafx2 tools all: grafx2 tools
@ -40,3 +41,7 @@ htmldoc:
# this C file is generated by the build # this C file is generated by the build
src/version.c: grafx2 src/version.c: grafx2
updateversion: src/version.c
$(MAKE) -C src gfx2.rc
$(MAKE) -C install/ updateversion

9
install/Makefile
View File

@ -12,10 +12,13 @@ VERSION := $(subst wip.,wip,$(LABEL).$(GIT_REVISION))
SOURCES = ../src-$(VERSION).tgz SOURCES = ../src-$(VERSION).tgz
INSTALLER = grafx2-$(API)-$(VERSION).win32.exe INSTALLER = grafx2-$(API)-$(VERSION).win32.exe
NSISCRIPT = WinInstaller.nsi
.PHONY: all updateversion
all: $(INSTALLER) all: $(INSTALLER)
$(INSTALLER): WinInstaller.nsi $(SOURCES) $(VERSIONTAG) $(INSTALLER): $(NSISCRIPT) $(SOURCES) $(VERSIONTAG)
ifdef WIN32CROSS ifdef WIN32CROSS
for f in ../doc/*.txt; do unix2dos $$f ; done for f in ../doc/*.txt; do unix2dos $$f ; done
endif endif
@ -26,3 +29,7 @@ endif
$(SOURCES): $(wildcard ../src/*.c) $(wildcard ../src/*.h) $(SOURCES): $(wildcard ../src/*.c) $(wildcard ../src/*.h)
cd ../src && WIN32CROSS=1 $(MAKE) $(SOURCES) cd ../src && WIN32CROSS=1 $(MAKE) $(SOURCES)
updateversion:
$(SED) -e 's/VERSION .*/VERSION $(VERSION)/' $(NSISCRIPT) > $(NSISCRIPT).tmp
if ! diff -q -i $(NSISCRIPT) $(NSISCRIPT).tmp ; then mv $(NSISCRIPT).tmp $(NSISCRIPT) ; else rm $(NSISCRIPT).tmp ; fi

2
install/WinInstaller.nsi
View File

@ -1,7 +1,7 @@
;NSIS Modern User Interface ;NSIS Modern User Interface
;Based on the Example Script written by Joost Verburg ;Based on the Example Script written by Joost Verburg
!define VERSION 2.6.2472 !define VERSION 2.7wip2567
!define API sdl !define API sdl
!define FREETYPEDLL libfreetype-6.dll !define FREETYPEDLL libfreetype-6.dll

8
src/gfx2.rc
View File

@ -5,8 +5,8 @@
#endif #endif
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,6,0,2472 FILEVERSION 2,6,0,2567
PRODUCTVERSION 2,6,0,2472 PRODUCTVERSION 2,6,0,2567
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.6.2472" VALUE "FileVersion", "2.6.2567"
VALUE "InternalName", "grafx2" VALUE "InternalName", "grafx2"
VALUE "LegalCopyright", "(c) 2007-2019 The GrafX2 Team, (c) 1996-2001 Sunset Design" VALUE "LegalCopyright", "(c) 2007-2019 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.6.2472" VALUE "ProductVersion", "2.6.2567"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
src/pversion.c
View File

@ -1 +1 @@
const char Program_version[]="2.6"; const char Program_version[]="2.7wip";