From 12e59a5ef93bb3b06e9cb4aa00fe72f7a75c173b Mon Sep 17 00:00:00 2001 From: jgabaut <109908086+jgabaut@users.noreply.github.com> Date: Sun, 17 Dec 2023 11:09:52 +0100 Subject: [PATCH] chore: 1.3.4 bump deps (#59) - Bump koliseo to 0.3.18 - Bump amboso to 1.9.9 - Bump invil to 0.1.6 - Drop 1.3.3 from stego.lock --- amboso | 2 +- bin/stego.lock | 2 +- bin/v1.3.4/.gitignore | 5 +++++ bin/v1.3.4/static | 1 + configure.ac | 4 ++-- docs/helapordo.doxyfile | 2 +- invil | 2 +- kazoj/bone/const.c | 2 +- koliseo | 2 +- sprites4curses | 2 +- src/game_core.h | 4 ++-- 11 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 bin/v1.3.4/.gitignore create mode 120000 bin/v1.3.4/static diff --git a/amboso b/amboso index a91e8a62..3649108f 160000 --- a/amboso +++ b/amboso @@ -1 +1 @@ -Subproject commit a91e8a623945f07add3b765cd16ef80b320dd5a8 +Subproject commit 3649108fedf1419c72a984daa9607a62da6f6f7a diff --git a/bin/stego.lock b/bin/stego.lock index 7dfac41c..249ce49c 100644 --- a/bin/stego.lock +++ b/bin/stego.lock @@ -51,4 +51,4 @@ errortestsdir = "kulpo" "1.3.0" = "Use std c11" "1.3.1" = "Add Skillslot, base for OP_SKILL" "1.3.2" = "Bump koliseo to 0.3.12, amboso to 1.9.6" -"1.3.3" = "Bump amboso to 1.9.7, add invil" +"1.3.4" = "Bump invil to 0.1.6, amboso to 1.9.9, koliseo to 0.3.18" diff --git a/bin/v1.3.4/.gitignore b/bin/v1.3.4/.gitignore new file mode 100644 index 00000000..9cd91fcd --- /dev/null +++ b/bin/v1.3.4/.gitignore @@ -0,0 +1,5 @@ +#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir +#we also keep specific dependencies... +* +!.gitignore +!static diff --git a/bin/v1.3.4/static b/bin/v1.3.4/static new file mode 120000 index 00000000..382349a7 --- /dev/null +++ b/bin/v1.3.4/static @@ -0,0 +1 @@ +../../static/ \ No newline at end of file diff --git a/configure.ac b/configure.ac index 856ecc33..175d3c98 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Define the package name and version -AC_INIT([helapordo], [1.3.3], [jgabaut@github.com]) +AC_INIT([helapordo], [1.3.4], [jgabaut@github.com]) # Verify automake version and enable foreign option AM_INIT_AUTOMAKE([foreign -Wall]) @@ -48,7 +48,7 @@ fi # Set a default version number if not specified externally AC_ARG_VAR([VERSION], [Version number]) if test -z "$VERSION"; then - VERSION="1.3.3" + VERSION="1.3.4" fi # Output variables to the config.h header diff --git a/docs/helapordo.doxyfile b/docs/helapordo.doxyfile index 58d7bc51..123ccad7 100644 --- a/docs/helapordo.doxyfile +++ b/docs/helapordo.doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = "helapordo" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.3.3" +PROJECT_NUMBER = "1.3.4" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/invil b/invil index 394cba94..4b56e3a1 160000 --- a/invil +++ b/invil @@ -1 +1 @@ -Subproject commit 394cba9431a33f4ec3b891b93e2e83f30e5dbfb5 +Subproject commit 4b56e3a131cf447c016efad008c07b78bfd97b55 diff --git a/kazoj/bone/const.c b/kazoj/bone/const.c index db56e86d..58f4b5eb 100644 --- a/kazoj/bone/const.c +++ b/kazoj/bone/const.c @@ -8,7 +8,7 @@ void fail(char* msg, int ex, int val) { int main(void) { int check = -1; - if ( ! (( check = strcmp(VERSION, "1.3.3") ) == 0)) { + if ( ! (( check = strcmp(VERSION, "1.3.4") ) == 0)) { fail("VERSION",0,check); }; if ( ! (HLP_MAX_INDEX == 30) ) { diff --git a/koliseo b/koliseo index 4377bb5d..4c964aff 160000 --- a/koliseo +++ b/koliseo @@ -1 +1 @@ -Subproject commit 4377bb5d709ab5d7fc77223e099faf3253fd28a3 +Subproject commit 4c964aff3d081664d724d17553ca72ae8da35283 diff --git a/sprites4curses b/sprites4curses index e8340f20..b1ff6ac9 160000 --- a/sprites4curses +++ b/sprites4curses @@ -1 +1 @@ -Subproject commit e8340f202086d8333ce9917076ee99ada4a34da9 +Subproject commit b1ff6ac90afbe0ec57d164081b598e79507c0129 diff --git a/src/game_core.h b/src/game_core.h index 09076740..0c86fffb 100644 --- a/src/game_core.h +++ b/src/game_core.h @@ -161,12 +161,12 @@ extern int G_DOTUTORIAL_ON; /** * Current patch release. */ -#define HELAPORDO_PATCH_VERSION 3 +#define HELAPORDO_PATCH_VERSION 4 /** * Current version string identifier, with MAJOR.MINOR.PATCH format. */ -#define VERSION "1.3.3" +#define VERSION "1.3.4" #define HELAPORDO_SAVEFILE_VERSION "0.1.7"