commit 05a00d3f

Poul Sander · 2021-10-10 18:06
05a00d3f60b30036a4188a09ef6de3483631a8f0 patch · browse files
parent c93baeedcfc73a077f1bc79c4d7a89b0e7bafe46

Now pack the default sample mod in the Windows build as well

Changed files

M	source/misc/docker/Dockerfile.WindoesBuild before
M	windows installer/install_script.nsi before

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 8d44006..7673b13 100644 --- a/source/misc/docker/Dockerfile.WindoesBuild +++ b/source/misc/docker/Dockerfile.WindoesBuild

@@ -22,6 +22,7 @@ cd /staging/package/blockattack-${BLOCKATTACK_VERSION} && \

cp /staging/blockattack-game/Game/blockattack.data ./ && \

cp /staging/blockattack-game/Game/blockattack.exe ./ && \

cp /staging/blockattack-game/COPYING ./COPYING.txt && \

+mkdir -p mods && cp /staging/blockattack-game/Game/mods/1.3.0.bricks.data ./mods/ && \

cp -r /staging/blockattack-game/source/misc/translation/locale ./ && \

echo "[InternetShortcut]" > "Block Attack - Rise Of the Blocks.url" && \

echo "URL=https://blockattack.net" >> "Block Attack - Rise Of the Blocks.url" && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 0a5e25a..7eef3bc 100644 --- a/windows installer/install_script.nsi +++ b/windows installer/install_script.nsi

@@ -2,7 +2,7 @@

; HM NIS Edit Wizard helper defines

!define PRODUCT_NAME "Block Attack - Rise Of the Blocks"

-!define PRODUCT_VERSION "2.7.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.7.0-SNAPSHOT"

!define PRODUCT_PUBLISHER "Poul Sander"

!define PRODUCT_WEB_SITE "http://www.blockattack.net"

!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\blockattack.exe"

@@ -62,6 +62,8 @@ Section "Game Files" SEC01

File "..\Game\blockattack.data"

SetOutPath "$INSTDIR"

File "..\Game\COPYING.TXT"

+ SetOutPath "$INSTDIR\mods"

+ File "..\Game\mods\1.3.0.bricks.data"

SetOutPath "$INSTDIR\locale\da\LC_MESSAGES"

File "../source/misc/translation/locale/da/LC_MESSAGES/blockattack_roftb.mo"

SetOutPath "$INSTDIR"

@@ -223,6 +225,7 @@ Section Uninstall

Delete "$INSTDIR\gfx\iDraw.png"

Delete "$INSTDIR\gfx\bOff.png"

Delete "$INSTDIR\gfx\mouse.png"

+ Delete "$INSTDIR\mods\1.3.0.bricks.data"

Delete "$INSTDIR\music\bgMusic.ogg"

Delete "$INSTDIR\music\highbeat.ogg"

Delete "$INSTDIR\res\puzzle.levels"

@@ -272,6 +275,7 @@ Section Uninstall

RMDir "$INSTDIR\gfx\animations"

RMDir "$INSTDIR\gfx"

RMDir "$INSTDIR\docs"

+ RMDir "$INSTDIR\mods"

RMDir /r "$INSTDIR\locale"

RMDir "$INSTDIR"