commit 289b307c

Poul Sander · 2022-02-18 20:14
289b307c8057e89c6f1c86e2c9b38666a51da561 patch · browse files
parent 09de95ec1c16ccd5bb6dd0569cd3704bba4eee6e

Prepare for next iteration cycle

Changed files

M	CMakeLists.txt before
M	man/blockattack.man before
M	source/code/version.h before
M	source/misc/docker/Dockerfile.Fedora29build before
M	source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu18.04build before
M	source/misc/docker/Dockerfile.Ubuntu20.04build before
M	source/misc/docker/Dockerfile.WindoesBuild before
M	windows installer/install_script.nsi before

diff --git a/CMakeLists.txt b/CMakeLists.txt index 79f5813..03bd60b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.5.1...3.18.4)

project (blockattack)

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

-SET(CPACK_PACKAGE_VERSION "2.8.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.9.0-SNAPSHOT")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

-SET(CPACK_PACKAGE_VERSION_MINOR "8")

+SET(CPACK_PACKAGE_VERSION_MINOR "9")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Block Attack - Rise of the Blocks ${CPACK_PACKAGE_VERSION}")

SET(CPACK_PACKAGE_VENDOR "Poul Sander")

diff --git a/man/blockattack.man b/man/blockattack.man index 406910d..37180e7 100644 --- a/man/blockattack.man +++ b/man/blockattack.man

@@ -1,12 +1,12 @@

.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.

-.TH BLOCKATTACK "6" "October 2021" "blockattack 2.8.0-SNAPSHOT" "Games"

+.TH BLOCKATTACK "6" "February 2022" "blockattack 2.9.0-SNAPSHOT" "Games"

.SH NAME

blockattack \- a puzzle game inspired by Tetris Attack

.SH SYNOPSIS

.B blockattack

[\fI\,OPTION\/\fR]...

.SH DESCRIPTION

-Block Attack \- Rise of the blocks 2.8.0\-SNAPSHOT

+Block Attack \- Rise of the blocks 2.9.0\-SNAPSHOT

.PP

Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.

.PP

@@ -76,7 +76,7 @@ Disables translations

.SH "REPORTING BUGS"

Report bugs to the issue tracker here: <https://github.com/blockattack/blockattack\-game/issues>

.SH COPYRIGHT

-Copyright \(co 2005\-2016 Poul Sander

+Copyright \(co 2005\-2022 Poul Sander

License GPLv2+: GNU GPL version 2 <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html> or later <http://gnu.org/licenses/gpl.html>

.br

This is free software: you are free to change and redistribute it.

diff --git a/source/code/version.h b/source/code/version.h index d058320..4e54b24 100644 --- a/source/code/version.h +++ b/source/code/version.h

@@ -30,5 +30,5 @@ https://blockattack.net

#define GAMENAME "blockattack"

#ifndef VERSION_NUMBER

-#define VERSION_NUMBER "2.8.0-SNAPSHOT"

+#define VERSION_NUMBER "2.9.0-SNAPSHOT"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build index fc27fda..a792854 100644 --- a/source/misc/docker/Dockerfile.Fedora29build +++ b/source/misc/docker/Dockerfile.Fedora29build

@@ -15,7 +15,7 @@ zip \

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone index 63da5fe..d48196e 100644 --- a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone

@@ -15,7 +15,7 @@ RUN /compile_requirements.sh

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build b/source/misc/docker/Dockerfile.Ubuntu18.04build index 44e3583..1b5f944 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build

@@ -6,7 +6,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu20.04build b/source/misc/docker/Dockerfile.Ubuntu20.04build index 68fe880..41dcae5 100644 --- a/source/misc/docker/Dockerfile.Ubuntu20.04build +++ b/source/misc/docker/Dockerfile.Ubuntu20.04build

@@ -11,7 +11,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index a716c59..b6fd51b 100644 --- a/source/misc/docker/Dockerfile.WindoesBuild +++ b/source/misc/docker/Dockerfile.WindoesBuild

@@ -8,7 +8,7 @@ RUN mkdir -p /output

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.9.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 40501a8..634598e 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.8.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.9.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"