From 4c964aff3d081664d724d17553ca72ae8da35283 Mon Sep 17 00:00:00 2001 From: jgabaut <109908086+jgabaut@users.noreply.github.com> Date: Sun, 17 Dec 2023 10:52:23 +0100 Subject: [PATCH] feat: 0.3.18 invil 0.1.6, add kls_dbg_features() (#58) * chore: move AM_CONDITIONAL * feat: add kls_dbg_features(), bump invil * fix: should stabilize ./anvil -i --- bin/stego.lock | 1 + bin/v0.3.18/.gitignore | 4 ++++ bin/v0.3.18/static | 1 + configure.ac | 18 +++++++++--------- docs/koliseo.doxyfile | 2 +- invil | 2 +- src/koliseo.c | 22 ++++++++++++++++++++++ src/koliseo.h | 5 +++-- 8 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 bin/v0.3.18/.gitignore create mode 120000 bin/v0.3.18/static diff --git a/bin/stego.lock b/bin/stego.lock index 99e0749..cd28343 100644 --- a/bin/stego.lock +++ b/bin/stego.lock @@ -52,3 +52,4 @@ testsdir = "ok" "0.3.12" = "Bump amboso to 1.9.6" "0.3.13" = "Bump amboso to 1.9.7, add invil" "0.3.17" = "Global lib install, config options, invil 0.1.5" +"0.3.18" = "invil 0.1.6, fixes broken ./anvil -i" diff --git a/bin/v0.3.18/.gitignore b/bin/v0.3.18/.gitignore new file mode 100644 index 0000000..f915d8e --- /dev/null +++ b/bin/v0.3.18/.gitignore @@ -0,0 +1,4 @@ +#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir +* +!.gitignore +!static diff --git a/bin/v0.3.18/static b/bin/v0.3.18/static new file mode 120000 index 0000000..382349a --- /dev/null +++ b/bin/v0.3.18/static @@ -0,0 +1 @@ +../../static/ \ No newline at end of file diff --git a/configure.ac b/configure.ac index b9222be..1db956b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Define the package name and version -AC_INIT([koliseo], [0.3.17], [jgabaut@github.com]) +AC_INIT([koliseo], [0.3.18], [jgabaut@github.com]) # Verify automake version and enable foreign option AM_INIT_AUTOMAKE([foreign -Wall]) @@ -23,18 +23,20 @@ AC_ARG_ENABLE([gulp], [enable_gulp=$enableval], [enable_gulp=no]) AM_CONDITIONAL([DEBUG_BUILD], [test "$enable_debug" = "yes"]) +AM_CONDITIONAL([CURSES_BUILD], [test "$enable_curses" = "yes"]) +AM_CONDITIONAL([GULP_BUILD], [test "$enable_gulp" = "yes"]) # Define the include and library paths based on the host system if test "$host_os" = "mingw32"; then echo "Building for mingw32: [$host_cpu-$host_vendor-$host_os]" # mingw32 specific flags if test "$enable_curses" = "yes"; then - echo "Building with curses header" - AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD -DNCURSES_STATIC"]) - AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"]) + echo "Building with curses header" + AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD -DNCURSES_STATIC"]) + AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"]) else - AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD"]) - AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"]) + AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD"]) + AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"]) fi AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) AC_SUBST([OS], ["w64-mingw32"]) @@ -67,13 +69,11 @@ if test "$host_os" = "linux-gnu"; then AC_SUBST([OS], ["Linux"]) AC_SUBST([TARGET], ["demo"]) fi -AM_CONDITIONAL([CURSES_BUILD], [test "$enable_curses" = "yes"]) -AM_CONDITIONAL([GULP_BUILD], [test "$enable_gulp" = "yes"]) # Set a default version number if not specified externally AC_ARG_VAR([VERSION], [Version number]) if test -z "$VERSION"; then - VERSION="0.3.17" + VERSION="0.3.18" fi # Output variables to the config.h header diff --git a/docs/koliseo.doxyfile b/docs/koliseo.doxyfile index a91b6e3..69561e0 100644 --- a/docs/koliseo.doxyfile +++ b/docs/koliseo.doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = "koliseo" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "0.3.17" +PROJECT_NUMBER = "0.3.18" # 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 d06eedc..4b56e3a 160000 --- a/invil +++ b/invil @@ -1 +1 @@ -Subproject commit d06eedc5166b2c409310910320e36dda126e916c +Subproject commit 4b56e3a131cf447c016efad008c07b78bfd97b55 diff --git a/src/koliseo.c b/src/koliseo.c index 9b6fb9a..0baeac1 100644 --- a/src/koliseo.c +++ b/src/koliseo.c @@ -2623,6 +2623,28 @@ void kls_temp_end(Koliseo_Temp *tmp_kls) } } +/** + * Prints enabled Koliseo features to stderr. + */ +void kls_dbg_features(void) +{ + #ifdef KOLISEO_HAS_CURSES + fprintf(stderr, "[KLS] ncurses.h integration is enabled\n"); + #else + fprintf(stderr, "[KLS] ncurses.h integration is not enabled\n"); + #endif + #ifdef KOLISEO_HAS_GULP + fprintf(stderr, "[KLS] KLS_GULP is enabled\n"); + #else + fprintf(stderr, "[KLS] KLS_GULP is not enabled\n"); + #endif + #ifdef KLS_DEBUG_CORE + fprintf(stderr, "[KLS] Koliseo core debugging is enabled\n"); + #else + fprintf(stderr, "[KLS] Koliseo core debugging is not enabled\n"); + #endif +} + KLS_Region_List kls_emptyList(void) { return NULL; diff --git a/src/koliseo.h b/src/koliseo.h index cd5625f..34e077c 100644 --- a/src/koliseo.h +++ b/src/koliseo.h @@ -45,7 +45,7 @@ #define KLS_MAJOR 0 /**< Represents current major release.*/ #define KLS_MINOR 3 /**< Represents current minor release.*/ -#define KLS_PATCH 17 /**< Represents current patch release.*/ +#define KLS_PATCH 18 /**< Represents current patch release.*/ /*! \mainpage Koliseo index page * @@ -183,7 +183,7 @@ static const int KOLISEO_API_VERSION_INT = /** * Defines current API version string. */ -static const char KOLISEO_API_VERSION_STRING[] = "0.3.17"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/ +static const char KOLISEO_API_VERSION_STRING[] = "0.3.18"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/ /** * Returns current koliseo version as a string. @@ -346,6 +346,7 @@ void *kls_push_zero_named(Koliseo * kls, ptrdiff_t size, ptrdiff_t align, void *kls_push_zero_typed(Koliseo * kls, ptrdiff_t size, ptrdiff_t align, ptrdiff_t count, int type, char *name, char *desc); void *kls_pop(Koliseo * kls, ptrdiff_t size, ptrdiff_t align, ptrdiff_t count); +void kls_dbg_features(void); /** * Macro used to request memory from a Koliseo.