commit 4a115797

branches: v2.10.X

Poul Sander · 2025-10-16 18:22
4a115797ad81dc3495d5ff5ae54c1c61ff929b57 patch · browse files
parent 7dfed7312f5f018898c3aa5d4a44f8031a31df36

Set version to 2.10.0

Changed files

diff --git a/CMakeLists.txt b/CMakeLists.txt index 22e2091..6fa8dba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5.1...4.1.0)

project (blockattack)

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

-SET(CPACK_PACKAGE_VERSION "2.10.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.10.0")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

SET(CPACK_PACKAGE_VERSION_MINOR "10")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

diff --git a/man/blockattack.man b/man/blockattack.man index 2a03ee9..ceb2b2b 100644 --- a/man/blockattack.man +++ b/man/blockattack.man

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

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

-.TH BLOCKATTACK "6" "May 2024" "blockattack 2.10.0-SNAPSHOT" "Games"

+.TH BLOCKATTACK "6" "October 2025" "blockattack 2.10.0" "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.10.0\-SNAPSHOT

+Block Attack \- Rise of the blocks 2.10.0

.PP

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

.PP

@@ -46,6 +46,12 @@ Do not automatically auto scale

\fB\-\-always\-sixteen\-nine\fR

Use 16:9 format even in Window mode

.TP

+\fB\-\-editor\fR

+Start the sprite editor/browser

+.TP

+\fB\-\-puzzle\-editor\fR

+Start the build in puzzle editor

+.TP

\fB\-\-puzzle\-level\-file\fR arg

Sets the default puzzle file to load

.TP

diff --git a/source/code/version.h b/source/code/version.h index 33b018b..405add6 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.10.0-SNAPSHOT"

+#define VERSION_NUMBER "2.10.0"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora42build b/source/misc/docker/Dockerfile.Fedora42build index 25ae487..357c323 100644 --- a/source/misc/docker/Dockerfile.Fedora42build +++ b/source/misc/docker/Dockerfile.Fedora42build

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build b/source/misc/docker/Dockerfile.Ubuntu18.04build index 7273e91..7f9eddc 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.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone index 33a5b97..801647d 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu20.04build b/source/misc/docker/Dockerfile.Ubuntu20.04build index 4cedda6..5d62f64 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.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu22.04build b/source/misc/docker/Dockerfile.Ubuntu22.04build index 70289d2..5d3b525 100644 --- a/source/misc/docker/Dockerfile.Ubuntu22.04build +++ b/source/misc/docker/Dockerfile.Ubuntu22.04build

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 934b872..559f150 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.10.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.10.0

RUN cd /staging/blockattack-game && \

./packdata.sh && ls -lrt source/misc/embedded_libs/fmt-11.0.2 && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index f745b72..c2b81ac 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.10.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.10.0"

!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"

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