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

fix build of Win32 installer

Browse Source
This commit is contained in:
Thomas Bernard 2018-05-14 00:34:09 +02:00
parent 994b950616
commit 36ad344673
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install/Makefile
View File

@ -1,18 +1,23 @@
# (c) 2018 Thomas Bernard
MAKENSIS = makensis
UNZIP = unzip -o
SED = sed
VERSIONTAG = ../obj/win32/versiontag VERSIONTAG = ../obj/win32/versiontag
VERSION := $(shell cat $(VERSIONTAG)) VERSION := $(shell cat $(VERSIONTAG))
SOURCES = ../src-$(VERSION).tgz SOURCES = ../src-$(VERSION).tgz
INSTALLER = ../grafx2-$(VERSION).win32.exe INSTALLER = grafx2-$(VERSION).win32.exe
all: $(INSTALLER) all: $(INSTALLER)
$(INSTALLER): WinInstaller.nsi $(SOURCES) $(VERSIONTAG) $(INSTALLER): WinInstaller.nsi $(SOURCES) $(VERSIONTAG)
sed 's/src-.*.tgz/src-$(VERSION).tgz/' $< | \ $(SED) 's/VERSION .*/VERSION $(VERSION)/' $< | $(MAKENSIS) -
sed 's/VERSION .*/VERSION $(VERSION)/' > new_$<
makensis new_$<
$(SOURCES): ../grafx2-$(VERSION)-win32.zip $(SOURCES): ../grafx2-$(VERSION)-win32.zip
cd .. && unzip grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz cd .. && $(UNZIP) grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz
touch $@
../grafx2-$(VERSION)-win32.zip: ../grafx2-$(VERSION)-win32.zip: $(VERSIONTAG)
cd ../src && WIN32CROSS=1 make ziprelease cd ../src && WIN32CROSS=1 $(MAKE) ziprelease

4
install/WinInstaller.nsi
View File

@ -84,7 +84,7 @@ Section "Grafx2" SecProgram
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
File ..\src\gfx2.ico File ..\src\gfx2.ico
File "..\src-${VERSION}-HEAD.tgz" File "..\src-${VERSION}.tgz"
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
File ..\bin\grafx2.exe File ..\bin\grafx2.exe
File ..\bin\SDL_image.dll File ..\bin\SDL_image.dll
@ -180,7 +180,7 @@ Section "un.SecProgram"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\gfx2.ico" Delete "$INSTDIR\gfx2.ico"
Delete "$INSTDIR\bin\grafx2.exe" Delete "$INSTDIR\bin\grafx2.exe"
Delete "$INSTDIR\src-${VERSION}-HEAD.tgz" Delete "$INSTDIR\src-${VERSION}.tgz"
Delete "$INSTDIR\share\grafx2\gfx2.gif" Delete "$INSTDIR\share\grafx2\gfx2.gif"
Delete "$INSTDIR\share\grafx2\gfx2def.ini" Delete "$INSTDIR\share\grafx2\gfx2def.ini"
Delete "$INSTDIR\bin\SDL_image.dll" Delete "$INSTDIR\bin\SDL_image.dll"