From c2a617e8a8803d129e2112ea0f1c8b028b8cec91 Mon Sep 17 00:00:00 2001 From: jgabaut <109908086+jgabaut@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:19:40 +0100 Subject: [PATCH] feat: 0.3.19 add target for .a lib (#59) * feat: add rule to gen .a lib * chore: fix format * feat: add README to pack * fix: run ldconfig on make install --- .gitignore | 2 ++ Makefile.am | 9 ++++++++- bin/stego.lock | 1 + bin/v0.3.19/.gitignore | 4 ++++ bin/v0.3.19/static | 1 + configure.ac | 4 ++-- docs/koliseo.doxyfile | 2 +- invil | 2 +- src/koliseo.c | 18 +++++++++--------- src/koliseo.h | 4 ++-- 10 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 bin/v0.3.19/.gitignore create mode 120000 bin/v0.3.19/static diff --git a/.gitignore b/.gitignore index 6d67c16..8044a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.o # ignore shared object files *.so +# ignore .a files +*.a # also explicitly ignore our executable for good measure demo # also explicitly ignore our windows executable for good measure diff --git a/Makefile.am b/Makefile.am index 452d208..093436d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,11 @@ libkoliseo.so: libkoliseo.o $(CCOMP) $(CFLAGS) $(AM_CFLAGS) -shared $< -o $@ @echo -e "\033[1;33mDone.\e[0m" +libkoliseo.a: libkoliseo.o + @echo -e "\033[1;35m[Makefile]\e[0m Building \"$@\":" + ar rcs $@ $< + @echo -e "\033[1;33mDone.\e[0m" + # Build rule for object files %.o: %.c $(CCOMP) -c $(CFLAGS) $(AM_CFLAGS) $< -o $@ @@ -71,6 +76,7 @@ libkoliseo.so: libkoliseo.o install: libkoliseo.so doc @echo -en "Installing koliseo lib $(VERSION): " ./installer-sh "-i" $(VERSION) $(TARGET_INSTALL_DIR) $(SOURCE_INSTALL_DIR) $(INSTALLER_LOG_FILE) + ldconfig @echo -e "\n\033[1;33mDone.\e[0m" uninstall: @@ -210,6 +216,7 @@ pack: rebuild @echo -e "\033[1;32m[TREE] Done.\e[0m" @echo -e "\033[1;35m[PACK] Installing:\e[0m" install $(TARGET) ~/koliseo-local/share/$(PACK_NAME) + install README.md ~/koliseo-local/share/$(PACK_NAME) install ./src/koliseo.c ~/koliseo-local/share/$(PACK_NAME)/src install ./src/koliseo.h ~/koliseo-local/share/$(PACK_NAME)/src @@ -223,7 +230,7 @@ pack: rebuild @echo -e "\033[1;33mDone.\e[0m" # Default target (builds everything) -all: $(TARGET) libkoliseo.so +all: $(TARGET) libkoliseo.so libkoliseo.a # Target to clean and rebuild rebuild: clean all diff --git a/bin/stego.lock b/bin/stego.lock index cd28343..fbf51e1 100644 --- a/bin/stego.lock +++ b/bin/stego.lock @@ -53,3 +53,4 @@ testsdir = "ok" "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" +"0.3.19" = "Add .a rule, bump invil" diff --git a/bin/v0.3.19/.gitignore b/bin/v0.3.19/.gitignore new file mode 100644 index 0000000..f915d8e --- /dev/null +++ b/bin/v0.3.19/.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.19/static b/bin/v0.3.19/static new file mode 120000 index 0000000..382349a --- /dev/null +++ b/bin/v0.3.19/static @@ -0,0 +1 @@ +../../static/ \ No newline at end of file diff --git a/configure.ac b/configure.ac index 1db956b..4260cf9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Define the package name and version -AC_INIT([koliseo], [0.3.18], [jgabaut@github.com]) +AC_INIT([koliseo], [0.3.19], [jgabaut@github.com]) # Verify automake version and enable foreign option AM_INIT_AUTOMAKE([foreign -Wall]) @@ -73,7 +73,7 @@ fi # Set a default version number if not specified externally AC_ARG_VAR([VERSION], [Version number]) if test -z "$VERSION"; then - VERSION="0.3.18" + VERSION="0.3.19" fi # Output variables to the config.h header diff --git a/docs/koliseo.doxyfile b/docs/koliseo.doxyfile index 69561e0..e0b3951 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.18" +PROJECT_NUMBER = "0.3.19" # 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 4b56e3a..f88f0e8 160000 --- a/invil +++ b/invil @@ -1 +1 @@ -Subproject commit 4b56e3a131cf447c016efad008c07b78bfd97b55 +Subproject commit f88f0e82645f7b38d939603947bb7490651c3bed diff --git a/src/koliseo.c b/src/koliseo.c index 0baeac1..edb0e90 100644 --- a/src/koliseo.c +++ b/src/koliseo.c @@ -2628,21 +2628,21 @@ void kls_temp_end(Koliseo_Temp *tmp_kls) */ void kls_dbg_features(void) { - #ifdef KOLISEO_HAS_CURSES +#ifdef KOLISEO_HAS_CURSES fprintf(stderr, "[KLS] ncurses.h integration is enabled\n"); - #else +#else fprintf(stderr, "[KLS] ncurses.h integration is not enabled\n"); - #endif - #ifdef KOLISEO_HAS_GULP +#endif +#ifdef KOLISEO_HAS_GULP fprintf(stderr, "[KLS] KLS_GULP is enabled\n"); - #else +#else fprintf(stderr, "[KLS] KLS_GULP is not enabled\n"); - #endif - #ifdef KLS_DEBUG_CORE +#endif +#ifdef KLS_DEBUG_CORE fprintf(stderr, "[KLS] Koliseo core debugging is enabled\n"); - #else +#else fprintf(stderr, "[KLS] Koliseo core debugging is not enabled\n"); - #endif +#endif } KLS_Region_List kls_emptyList(void) diff --git a/src/koliseo.h b/src/koliseo.h index 34e077c..5c532a2 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 18 /**< Represents current patch release.*/ +#define KLS_PATCH 19 /**< 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.18"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/ +static const char KOLISEO_API_VERSION_STRING[] = "0.3.19"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/ /** * Returns current koliseo version as a string.