From 4bc055294368e4dd4fda491dfd97772e8e88fc35 Mon Sep 17 00:00:00 2001 From: kx Date: Sun, 11 Oct 2026 23:52:31 +0300 Subject: Bump version to 1.0.5 --- NEWS | 6 ++++++ README | 3 ++- configure.ac | 2 +- doc/mcpu-cpp-en.md | 2 +- doc/mcpu-cpp-ru.md | 2 +- man/mcpu-cpp.1 | 2 +- man/ru/mcpu-cpp.1 | 2 +- tests/t0022-predefined-macros.sh | 2 +- tests/t0024-abi-predefined.sh | 2 +- tests/t0025-dump-macros.sh | 2 +- tests/t0033-dump-definitions.sh | 2 +- tests/t0053-interface-cleanup.sh | 4 ++-- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index c3d3802..033c861 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,10 @@ +mcpu-cpp 1.0.5 +============== + +* Fixed target machine depended tests. + + mcpu-cpp 1.0.4 ============== diff --git a/README b/README index 0f1231b..6e58a30 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ + mcpu-cpp ======== @@ -470,7 +471,7 @@ Build mcpu-cpp uses Autoconf/Automake and obtains LibMPUIO compilation and linker flags from `mpuio-config`, following the conventions of LibMPU and LibMPUIO. -No pkg-config or flex dependency is introduced. The 1.0.4 release is +No pkg-config or flex dependency is introduced. The 1.0.5 release is developed and tested against LibMPU 1.0.27 and LibMPUIO 1.0.7. The LibMPUIO UCS-2 ctype API is required. ZUBR 4.1.1 is the parser-regeneration tool; it is not required for a normal build from a release archive containing the generated diff --git a/configure.ac b/configure.ac index 56cd2a2..7bfcdf1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) m4_include([acsite.m4]) -AC_INIT([mcpu-cpp], [1.0.4], [], [mcpu-cpp]) +AC_INIT([mcpu-cpp], [1.0.5], [], [mcpu-cpp]) AC_MCPU_CPP_REQUIRE_BASH diff --git a/doc/mcpu-cpp-en.md b/doc/mcpu-cpp-en.md index dd12ab4..18633ae 100644 --- a/doc/mcpu-cpp-en.md +++ b/doc/mcpu-cpp-en.md @@ -1252,7 +1252,7 @@ exist for the future high-level language. The version of `mcpu-cpp` has its own unambiguous name: ```text -#define __MCPU_CPP_VERSION__ "1.0.4" +#define __MCPU_CPP_VERSION__ "1.0.5" ``` The value is obtained automatically from `PACKAGE_VERSION`. When a compiler diff --git a/doc/mcpu-cpp-ru.md b/doc/mcpu-cpp-ru.md index ed68598..662ff2c 100644 --- a/doc/mcpu-cpp-ru.md +++ b/doc/mcpu-cpp-ru.md @@ -1261,7 +1261,7 @@ rescan. пока нет. Собственная версия `mcpu-cpp` имеет отдельное однозначное имя: ```text -#define __MCPU_CPP_VERSION__ "1.0.4" +#define __MCPU_CPP_VERSION__ "1.0.5" ``` Значение автоматически берётся из `PACKAGE_VERSION`. Когда появится compiler diff --git a/man/mcpu-cpp.1 b/man/mcpu-cpp.1 index 8279587..8d7f911 100644 --- a/man/mcpu-cpp.1 +++ b/man/mcpu-cpp.1 @@ -1,4 +1,4 @@ -.TH MCPU-CPP 1 "October 2026" "MCPU-CPP 1.0.4" "User Commands" +.TH MCPU-CPP 1 "October 2026" "MCPU-CPP 1.0.5" "User Commands" .SH NAME mcpu-cpp \- preprocessor for MCPU languages .SH SYNOPSIS diff --git a/man/ru/mcpu-cpp.1 b/man/ru/mcpu-cpp.1 index 8681def..3db32b3 100644 --- a/man/ru/mcpu-cpp.1 +++ b/man/ru/mcpu-cpp.1 @@ -1,4 +1,4 @@ -.TH MCPU-CPP 1 "Октябрь 2026" "MCPU-CPP 1.0.4" "Команды пользователя" +.TH MCPU-CPP 1 "Октябрь 2026" "MCPU-CPP 1.0.5" "Команды пользователя" .SH ИМЯ mcpu-cpp \- препроцессор языков MCPU .SH СИНТАКСИС diff --git a/tests/t0022-predefined-macros.sh b/tests/t0022-predefined-macros.sh index 8abf4d9..2179a4a 100755 --- a/tests/t0022-predefined-macros.sh +++ b/tests/t0022-predefined-macros.sh @@ -39,7 +39,7 @@ grep -F "root_file = \"$base/main.c\";" "$base/out" >/dev/null grep -F "root_base = \"$base/main.c\";" "$base/out" >/dev/null grep '^root_level = 0;$' "$base/out" >/dev/null grep '^root_line = 5;$' "$base/out" >/dev/null -grep '^cpp_version = "1\.0\.4";$' "$base/out" >/dev/null +grep '^cpp_version = "1\.0\.5";$' "$base/out" >/dev/null grep '^old_version_name = __VERSION__;$' "$base/out" >/dev/null grep '^date = "[A-Z][a-z][a-z] [0-9] [0-9][0-9][0-9][0-9]";$\|^date = "[A-Z][a-z][a-z] [12][0-9] [0-9][0-9][0-9][0-9]";$\|^date = "[A-Z][a-z][a-z] 3[01] [0-9][0-9][0-9][0-9]";$' "$base/out" >/dev/null grep '^time = "[0-2][0-9]:[0-5][0-9]:[0-5][0-9]";$' "$base/out" >/dev/null diff --git a/tests/t0024-abi-predefined.sh b/tests/t0024-abi-predefined.sh index 56cce15..9afee99 100755 --- a/tests/t0024-abi-predefined.sh +++ b/tests/t0024-abi-predefined.sh @@ -99,7 +99,7 @@ EOT "$MCPU_CPP" --no-config "$base/main.c" -o "$base/out" grep '^arch = 1;$' "$base/out" >/dev/null -grep '^cpp_version = "1\.0\.4";$' "$base/out" >/dev/null +grep '^cpp_version = "1\.0\.5";$' "$base/out" >/dev/null grep '^old_version = __VERSION__;$' "$base/out" >/dev/null grep '^byte_order = \(1234\|4321\);$' "$base/out" >/dev/null grep '^mcpu_byte_order = \(1234\|4321\);$' "$base/out" >/dev/null diff --git a/tests/t0025-dump-macros.sh b/tests/t0025-dump-macros.sh index 3aae692..3213f7b 100755 --- a/tests/t0025-dump-macros.sh +++ b/tests/t0025-dump-macros.sh @@ -9,7 +9,7 @@ trap 'rm -rf "$base"' EXIT HUP INT TERM test -s "$base/macros" LC_ALL=C sort -c "$base/macros" grep '^#define _ARCH_MCPU 1$' "$base/macros" >/dev/null -grep '^#define __MCPU_CPP_VERSION__ "1\.0\.4"$' "$base/macros" >/dev/null +grep '^#define __MCPU_CPP_VERSION__ "1\.0\.5"$' "$base/macros" >/dev/null grep '^#define __MCPU_MACHINE_REGISTER_WIDTH__ \(64\|32\)$' "$base/macros" >/dev/null grep '^#define __MCPU_REAL_IO_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null grep '^#define __MCPU_MATH_FN_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null diff --git a/tests/t0033-dump-definitions.sh b/tests/t0033-dump-definitions.sh index 3da147b..856c17a 100755 --- a/tests/t0033-dump-definitions.sh +++ b/tests/t0033-dump-definitions.sh @@ -24,7 +24,7 @@ EOT # ordinary preprocessed result. grep '^# 0 "'"$base/main.c"'"$' "$base/out" >/dev/null grep '^# 0 ""$' "$base/out" >/dev/null -grep '^#define __MCPU_CPP_VERSION__ "1.0.4"$' "$base/out" >/dev/null +grep '^#define __MCPU_CPP_VERSION__ "1.0.5"$' "$base/out" >/dev/null grep '^#define FROM_HEADER 17$' "$base/out" >/dev/null grep '^#define LOCAL_VALUE 25$' "$base/out" >/dev/null if grep '^[[:blank:]]*#[[:blank:]]*\(if\|ifdef\|ifndef\|elif\|else\|endif\)\>' "$base/out" >/dev/null; then diff --git a/tests/t0053-interface-cleanup.sh b/tests/t0053-interface-cleanup.sh index f766062..d3caecd 100755 --- a/tests/t0053-interface-cleanup.sh +++ b/tests/t0053-interface-cleanup.sh @@ -6,13 +6,13 @@ trap 'rm -rf "$base"' EXIT HUP INT TERM # --version identifies the independent MCPU languages preprocessor. "$MCPU_CPP" --version > "$base/version" -printf '%s\n' 'mcpu-cpp 1.0.4' 'MCPU languages preprocessor' > "$base/version.expected" +printf '%s\n' 'mcpu-cpp 1.0.5' 'MCPU languages preprocessor' > "$base/version.expected" cmp "$base/version.expected" "$base/version" # --help contains the current public interface, including --object-suffix, # and puts the stdin/stdout notes after the option list. "$MCPU_CPP" --help > "$base/help" -grep '^mcpu-cpp 1\.0\.4$' "$base/help" >/dev/null +grep '^mcpu-cpp 1\.0\.5$' "$base/help" >/dev/null grep '^MCPU languages preprocessor$' "$base/help" >/dev/null grep '^ --object-suffix SFX set object suffix used for dependency targets$' "$base/help" >/dev/null grep '^ --sys-root=PATH use PATH as MCPU root and do not read configuration files$' "$base/help" >/dev/null -- cgit v1.2.3