From: Bastian Dehn Date: Tue, 7 Jul 2026 16:10:21 +0000 (+0200) Subject: add compile option before aug 2026 X-Git-Tag: 1.3.25^2~1^2~6 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=5047524f276b35c4a52eaf69a5099dd2952bcb6f;p=feierabend.git add compile option before aug 2026 --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1b3936..157adff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,6 +9,12 @@ set(SOLL_HOUR 8 CACHE STRING "soll Stunden") message(STATUS "SOLL_HOUR: ${SOLL_HOUR}") set(SOLL_MINUTES 0 CACHE STRING "soll Minuten") message(STATUS "SOLL_MINUTES: ${SOLL_MINUTES}") +option(BEFORE_AUG_2026 OFF) +message(STATUS "BEFORE_AUG_2026 ${BEFORE_AUG_2026}") + +if(${BEFORE_AUG_2026}) + add_compile_definitions(BEFORE_AUG_2026) +endif() configure_file(config.h.in config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${LIBXML2_INCLUDE_DIR}) diff --git a/src/break.c b/src/break.c index 09b05cd..9b089a9 100644 --- a/src/break.c +++ b/src/break.c @@ -1,5 +1,6 @@ #include "break.h" +#ifdef BEFORE_AUG_2026 #define TWO_HOURS 7200 #define TWO_HOURS_FIFTEEN_MINUTES 8100 #define FOUR_HOURS_FIFTY_FIVE_MINUTES 17100 @@ -33,4 +34,5 @@ time_t get_break_time(const time_t worktime) return worktime - TWO_HOURS; return 0; -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3601e44..b987f9a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,10 @@ find_library(CMOCKA cmocka REQUIRED) message(STATUS "find cmocka: ${CMOCKA}") +if(${BEFORE_AUG_2026}) + add_compile_definitions(BEFORE_AUG_2026) +endif() + find_program(CPPCHECK cppcheck REQUIRED) message(STATUS "find cppcheck: ${CPPCHECK}") execute_process(COMMAND bash -c "${CPPCHECK} --version | sed -z 's/Cppcheck \\(.*\\)\\n$/\\1/'" diff --git a/tests/break_tests.c b/tests/break_tests.c index 4a793da..37494f9 100644 --- a/tests/break_tests.c +++ b/tests/break_tests.c @@ -6,6 +6,7 @@ #include #include "../src/break.h" +#ifdef BEFORE_AUG_2026 void two_hours_zero_break_test() { const time_t worktime = 7200; @@ -162,4 +163,5 @@ int run_break_tests() }; return cmocka_run_group_tests(break_tests, NULL, NULL); -} \ No newline at end of file +} +#endif \ No newline at end of file