git repos / blockattack-game

commit d09cb987

Poul Sander · 2025-12-09 18:04
d09cb987a3afd4f9670e6dc7975c09ec4d52dfff patch · browse files
parent ff3c3984f1bc13424e8052985e403e9c56b83a52 

Basic grammer check of the README file

Changed files

M .github/workflows/main.yml before
M README.md before
D source/misc/docker/Dockerfile.WindoesBuild before
A source/misc/docker/Dockerfile.WindowsBuild
M source/misc/scripts/update_version.sh before
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3c607f..a74ade3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml
@@ -17,4 +17,4 @@ jobs:
- name: Test Ubuntu
run: docker build -f source/misc/docker/Dockerfile.Ubuntu22.04build . -t blockattack_test
- name: Test Windows MXE
- run: docker build -f source/misc/docker/Dockerfile.WindoesBuild . -t blockattack_test
+ run: docker build -f source/misc/docker/Dockerfile.WindowsBuild . -t blockattack_test
diff --git a/README.md b/README.md index 7d64db5..b432019 100644 --- a/README.md +++ b/README.md
@@ -5,7 +5,7 @@ A Tetris Attack Clone under the GPL.
Homepage: <https://blockattack.net><br/>
Source: <https://github.com/blockattack/blockattack-game>
-## Screen shot
+## Screenshot
![Block Attack - Rise of the Blocks](https://blockattack.github.io/images/screenshots/blockattack-2.3.0-3.png "Screen shot")
## Supported OS
@@ -13,8 +13,8 @@ Source: <https://github.com/blockattack/blockattack-game>
### Linux
Recent Linux version. Target is all current Ubuntu Desktop LTS versions (up to 5 years).
-### Windoes
-Target is all official supported versions of windows for x86-64 that allows manually installed software. Currently Windows 10+.
+### Windows
+Target is all officially supported versions of Windows for x86-64 that allow manually installed software. Currently Windows 10+.
## Dependencies
* A version of g++ with C++17 support. Tested on g++-11
@@ -28,7 +28,7 @@ Target is all official supported versions of windows for x86-64 that allows manu
* libboost-program-options
## Building
-The only supported build method is using the CMake<br/>
+The only supported build method is using CMake<br/>
To build do:
```bash
./packdata.sh
@@ -52,7 +52,7 @@ sudo make install
Windows build uses MXE (mxe.cc) and Docker. See "Building with Docker".
## Building using Docker
-As getting a C++ project with many dependencies to compile can be a daunting task then I have provided a couple of Docker images that can perform a build. Both for Windows and Linux.
+Since getting a C++ project with many dependencies to compile can be a daunting task, I have provided a couple of Docker images that can perform a build. Both for Windows and Linux.
The project should at all time be able to compile on the oldest and latest supported version of Ubuntu. This is tested with Docker.
@@ -62,7 +62,7 @@ docker build -f source/misc/docker/Dockerfile.Ubuntu18.04build . -t blockattack_
```
and
```bash
-docker build -f source/misc/docker/Dockerfile.WindoesBuild . -t blockattack_test
+docker build -f source/misc/docker/Dockerfile.WindowsBuild . -t blockattack_test
```
## Source Structure
@@ -85,7 +85,7 @@ This project is a bit unconventional because I didn't know any better at the tim
## Reporting bugs
Please report bugs on github: <https://github.com/blockattack/blockattack-game/issues>
-If possible: Check if the bug is already fixed in master. But if you don't know how to check it then just report it.
+If possible: Check if the bug is already fixed in master. But if you don't know how to check it, then just report it.
## Contributions
Contributions are welcome. See CONTRIBUTING.md for details.
diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild deleted file mode 100644 index 8168ee9..0000000 --- a/source/misc/docker/Dockerfile.WindoesBuild +++ /dev/null
@@ -1,33 +0,0 @@
-FROM sago007/docker_blockattack
-
-RUN mkdir -p /staging/blockattack-game
-
-RUN mkdir -p /staging/package/
-
-RUN mkdir -p /output
-
-COPY . /staging/blockattack-game
-
-ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT
-
-RUN cd /staging/blockattack-game && \
-./packdata.sh && ls -lrt source/misc/embedded_libs/fmt-11.0.2 && \
-i686-w64-mingw32.static-cmake . && \
-make clean && make && \
-cd windows\ installer/ && \
-makensis install_script.nsi && \
-mv Setup.exe /output/blockattack-installer-${BLOCKATTACK_VERSION}.exe && \
-mkdir /staging/package/blockattack-${BLOCKATTACK_VERSION} && \
-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" && \
-cd /staging/package/ && \
-zip -r /output/blockattack-${BLOCKATTACK_VERSION}-windows-no-installer.zip "blockattack-${BLOCKATTACK_VERSION}" && \
-mv blockattack-${BLOCKATTACK_VERSION} blockattack-itch && \
-zip -r /output/blockattack-itch-${BLOCKATTACK_VERSION}.zip "blockattack-itch" && \
-cd /output && chown nobody * && chmod 666 * && ls -lh
diff --git a/source/misc/docker/Dockerfile.WindowsBuild b/source/misc/docker/Dockerfile.WindowsBuild new file mode 100644 index 0000000..8168ee9 --- /dev/null +++ b/source/misc/docker/Dockerfile.WindowsBuild
@@ -0,0 +1,33 @@
+FROM sago007/docker_blockattack
+
+RUN mkdir -p /staging/blockattack-game
+
+RUN mkdir -p /staging/package/
+
+RUN mkdir -p /output
+
+COPY . /staging/blockattack-game
+
+ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT
+
+RUN cd /staging/blockattack-game && \
+./packdata.sh && ls -lrt source/misc/embedded_libs/fmt-11.0.2 && \
+i686-w64-mingw32.static-cmake . && \
+make clean && make && \
+cd windows\ installer/ && \
+makensis install_script.nsi && \
+mv Setup.exe /output/blockattack-installer-${BLOCKATTACK_VERSION}.exe && \
+mkdir /staging/package/blockattack-${BLOCKATTACK_VERSION} && \
+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" && \
+cd /staging/package/ && \
+zip -r /output/blockattack-${BLOCKATTACK_VERSION}-windows-no-installer.zip "blockattack-${BLOCKATTACK_VERSION}" && \
+mv blockattack-${BLOCKATTACK_VERSION} blockattack-itch && \
+zip -r /output/blockattack-itch-${BLOCKATTACK_VERSION}.zip "blockattack-itch" && \
+cd /output && chown nobody * && chmod 666 * && ls -lh
diff --git a/source/misc/scripts/update_version.sh b/source/misc/scripts/update_version.sh index b5c958c..01957ab 100755 --- a/source/misc/scripts/update_version.sh +++ b/source/misc/scripts/update_version.sh
@@ -25,7 +25,7 @@ sed -i "/SET(CPACK_PACKAGE_VERSION_PATCH /c\\SET(CPACK_PACKAGE_VERSION_PATCH \"$
sed -i -E "s/#define VERSION_NUMBER.*$/#define VERSION_NUMBER \"$FULLVERSION\"/" source/code/version.h
sed -i -E "s/!define PRODUCT_VERSION .*$/!define PRODUCT_VERSION \"$FULLVERSION\"/" "windows installer/install_script.nsi"
-sed -i -E "s/#ENV BLOCKATTACK_VERSION .*$/#ENV BLOCKATTACK_VERSION $FULLVERSION/" source/misc/docker/Dockerfile.WindoesBuild
+sed -i -E "s/#ENV BLOCKATTACK_VERSION .*$/#ENV BLOCKATTACK_VERSION $FULLVERSION/" source/misc/docker/Dockerfile.WindowsBuild
make
pushd man