From d9f1a4a8e648725bff2b03a59651e56644eb8c4b Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sat, 22 Nov 2025 10:35:33 +0100 Subject: Introduce libguile and drop version generator --- src/gemma.cpp | 3 ++- src/guile_api.cpp | 9 +++++++++ src/guile_api.h | 9 +++++++++ src/main.cpp | 4 ++++ src/version.h | 5 ++--- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/guile_api.cpp create mode 100644 src/guile_api.h (limited to 'src') diff --git a/src/gemma.cpp b/src/gemma.cpp index 63f952e..d2281ae 100644 --- a/src/gemma.cpp +++ b/src/gemma.cpp @@ -62,6 +62,7 @@ extern "C" { #include "vc.h" #include "debug.h" #include "version.h" +#include using namespace std; @@ -84,7 +85,7 @@ void gemma_gsl_error_handler (const char * reason, void GEMMA::PrintHeader(void) { cout << - "Pangemma --- GEMMA 0.98.5 compatible executable " << version << " (" << date << ") by Xiang Zhou, Pjotr Prins and team (C) 2012-" << year << endl; + "Pangemma --- GEMMA 0.98.5 compatible executable " << version << " (" << date << ") with guile " << global_guile_version() << " by Xiang Zhou, Pjotr Prins and team (C) 2012-" << year << endl ; return; } diff --git a/src/guile_api.cpp b/src/guile_api.cpp new file mode 100644 index 0000000..0c809bd --- /dev/null +++ b/src/guile_api.cpp @@ -0,0 +1,9 @@ +#include + +void global_start_guile() { + scm_init_guile(); +} + +string global_guile_version() { + return string("3.0"); +} diff --git a/src/guile_api.h b/src/guile_api.h new file mode 100644 index 0000000..1244b11 --- /dev/null +++ b/src/guile_api.h @@ -0,0 +1,9 @@ +#pragma once + +#include +#include + +using namespace std; + +void global_start_guile(); +string global_guile_version(); diff --git a/src/main.cpp b/src/main.cpp index deadc63..95c8fd3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,7 @@ #include #include #include +#include using namespace std; @@ -31,6 +32,9 @@ int main(int argc, char *argv[]) { gsl_set_error_handler (&gemma_gsl_error_handler); + global_start_guile(); + + if (argc <= 1) { cGemma.PrintHeader(); cGemma.PrintHelp(0); diff --git a/src/version.h b/src/version.h index 3382003..02d4c09 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,4 @@ // version.h generated by GEMMA scripts/gen_version_info.sh -#define GEMMA_VERSION "0.0.1" -#define GEMMA_DATE "2025-01-04" +#define GEMMA_VERSION "1.0.0" +#define GEMMA_DATE "2025-11-22" #define GEMMA_YEAR "2025" -#define GEMMA_PROFILE "/gnu/store/ln160n2kzn791jwgv36yrxlxygjwl9hh-profile" -- cgit 1.4.1