diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/global.h | 2 | ||||
| -rw-r--r-- | src/report.cc | 4 | ||||
| -rw-r--r-- | src/system.hh.in | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b10061f..dc8b60fc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,7 @@ +set(LEDGER_CLI_SOURCES + global.cc + main.cc) + set(LEDGER_SOURCES stats.cc generate.cc @@ -255,7 +259,7 @@ else() endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) endif() -add_pch_rule(${PROJECT_BINARY_DIR}/system.hh LEDGER_SOURCES main.cc global.cc) +add_pch_rule(${PROJECT_BINARY_DIR}/system.hh LEDGER_SOURCES LEDGER_CLI_SOURCES) include(GNUInstallDirs) diff --git a/src/global.h b/src/global.h index 292c9cb0..454fc64e 100644 --- a/src/global.h +++ b/src/global.h @@ -123,6 +123,8 @@ public: out << "Ledger " << Ledger_VERSION_MAJOR << '.' << Ledger_VERSION_MINOR << '.' << Ledger_VERSION_PATCH; + if (Ledger_VERSION_PRERELEASE != 0) + out << Ledger_VERSION_PRERELEASE; if (Ledger_VERSION_DATE != 0) out << '-' << Ledger_VERSION_DATE; out << _(", the command-line accounting tool"); diff --git a/src/report.cc b/src/report.cc index 4b240611..2ce70151 100644 --- a/src/report.cc +++ b/src/report.cc @@ -631,7 +631,7 @@ value_t report_t::fn_trim(call_scope_t& args) while (*p && std::isspace(*p)) p++; - const char * e = buf.get() + temp.length(); + const char * e = buf.get() + temp.length() - 1; while (e > p && std::isspace(*e)) e--; @@ -643,7 +643,7 @@ value_t report_t::fn_trim(call_scope_t& args) return string_value(empty_string); } else { - return string_value(string(p, static_cast<std::string::size_type>(e - p))); + return string_value(string(p, static_cast<std::string::size_type>(e - p + 1))); } } diff --git a/src/system.hh.in b/src/system.hh.in index 21417e09..eaf4b1ac 100644 --- a/src/system.hh.in +++ b/src/system.hh.in @@ -54,6 +54,7 @@ #define Ledger_VERSION_MAJOR @Ledger_VERSION_MAJOR@ #define Ledger_VERSION_MINOR @Ledger_VERSION_MINOR@ #define Ledger_VERSION_PATCH @Ledger_VERSION_PATCH@ +#define Ledger_VERSION_PRERELEASE "@Ledger_VERSION_PRERELEASE@" #define Ledger_VERSION_DATE @Ledger_VERSION_DATE@ #define HAVE_EDIT @HAVE_EDIT@ |