From: b Date: Sat, 6 Jun 2026 20:21:46 +0000 (+0000) Subject: use new botm common lib as external dependency, not submodule X-Git-Tag: v1.3.0 X-Git-Url: http://bicyclesonthemoon.info/git-projects/?a=commitdiff_plain;h=13c10752308f89c8b4658d8a0c50a041d889e80c;p=ott%2Fbsta use new botm common lib as external dependency, not submodule --- diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 18429c3..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "botm-common"] - path = botm-common - url = ../../botm/common-perl diff --git a/2words.1.pl b/2words.1.pl index 6148f29..6ca74f3 100644 --- a/2words.1.pl +++ b/2words.1.pl @@ -5,7 +5,7 @@ # # The wordgame interface # -# Copyright (C) 2016, 2017, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2016, 2017, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,17 +25,26 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'open_encoded' +); +use botm_url ( + 'merge_url', + 'url_query_decode', 'url_query_encode' +); +use botm_http ( 'HTTP_STATUS', - 'merge_settings', 'fail_method', 'fail_content_type', 'http_header_status', 'http_header_allow', - 'merge_url', - 'read_header_env', - 'html_entity_encode_dec', - 'url_query_decode', 'url_query_encode', - 'open_encoded' + 'read_header_env' +); +use botm_data_file ( + 'merge_settings' +); +use botm_html_encode ( + 'html_entity_encode_dec' ); use bsta_lib ( 'STATE', 'INTF_STATE', diff --git a/attach.1.pl b/attach.1.pl index 23c003c..91520bc 100644 --- a/attach.1.pl +++ b/attach.1.pl @@ -5,7 +5,7 @@ # # The attachment interface # -# Copyright (C) 2016, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2016, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,19 +25,27 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'join_path', + 'open_encoded', 'stat_encoded' +); +use botm_url ( + 'url_query_decode', + 'merge_url' +); +use botm_http ( 'HTTP_STATUS', - 'merge_settings', 'fail_method', 'fail_content_type', 'fail_attachment', 'fail_500', 'redirect', 'read_header_env', - 'url_query_decode', - 'join_path', - 'merge_url', - 'open_encoded', 'stat_encoded', 'http_header_line', 'http_header_content_length', 'http_header_content_disposition' ); +use botm_data_file ( + 'merge_settings' +); + use bsta_lib ( 'STATE', 'get_id', 'get_password', diff --git a/bbcode.1.pl b/bbcode.1.pl index 04a0ff4..403af26 100644 --- a/bbcode.1.pl +++ b/bbcode.1.pl @@ -5,7 +5,7 @@ # # The bbcode interface # -# Copyright (C) 2017, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2017, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,14 +25,19 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_url ( + 'url_query_decode', + 'merge_url' +); +use botm_http ( 'HTTP_STATUS', 'fail_method', 'fail_content_type', 'read_header_env', - 'url_query_decode', - 'merge_url', - 'http_header_status', + 'http_header_status' +); +use botm_data_file ( 'merge_settings' ); use bsta_lib ( diff --git a/botm-common b/botm-common deleted file mode 160000 index b3ffb0f..0000000 --- a/botm-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b3ffb0f0c3c240103a57c98c930d806f748f05a1 diff --git a/bsta_lib.1.pm b/bsta_lib.1.pm index a7820b0..244cefe 100644 --- a/bsta_lib.1.pm +++ b/bsta_lib.1.pm @@ -54,21 +54,29 @@ our @EXPORT_OK = ( 'eval_bb', 'bb_to_bbcode', 'bb_to_html' ); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( - 'HTTP_STATUS', +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +use botm_system ( + 'join_path', + 'copy_encoded', 'open_encoded', '_x_encoded', +); +use botm_url ( 'url_query_decode', 'url_query_encode', 'url_decode', 'url_encode', - 'html_entity_encode_dec', - 'merge_url', + 'merge_url' +); +use botm_http ( + 'HTTP_STATUS', 'read_header_env', - 'read_data_file', 'write_data_file', - 'join_path', - 'copy_encoded', 'open_encoded', '_x_encoded', 'http_header_line', 'http_status', 'http_header_status', 'http_header_allow', 'http_header_location', +); +use botm_data_file ( + 'read_data_file', 'write_data_file', 'merge_settings' ); +use botm_html_encode ( + 'html_entity_encode_dec' +); ###PERL_PATH_SEPARATOR: PATH_SEPARATOR = / diff --git a/chat.1.pl b/chat.1.pl index ca787d4..4059ff0 100644 --- a/chat.1.pl +++ b/chat.1.pl @@ -5,7 +5,7 @@ # # The coincidence interface # -# Copyright (C) 2016, 2017, 2023, 2024, 2025 Balthasar Szczepański +# Copyright (C) 2016, 2017, 2023, 2024, 2025, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -26,18 +26,27 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'open_encoded' +); +use botm_url ( + 'url_query_decode', 'url_query_encode', + 'merge_url' +); +use botm_http ( 'HTTP_STATUS', 'fail_method', 'fail_content_type', 'read_header_env', - 'url_query_decode', 'url_query_encode', - 'merge_url', - 'html_entity_encode_dec', - 'open_encoded', - 'http_header_status', + 'http_header_status' +); +use botm_data_file ( 'merge_settings' ); +use botm_html_encode ( + 'html_entity_encode_dec' +); use bsta_lib ( 'STATE', 'CHAT_STATE', 'CHAT_ACTION', 'get_remote_addr', 'get_id', 'get_password', diff --git a/frame.1.pl b/frame.1.pl index 60595ae..0ecb91e 100644 --- a/frame.1.pl +++ b/frame.1.pl @@ -5,7 +5,7 @@ # # The frame interface # -# Copyright (C) 2016, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2016, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,16 +25,23 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'join_path', + 'open_encoded', 'stat_encoded' +); +use botm_url ( + 'url_query_decode', + 'merge_url' +); +use botm_http ( 'HTTP_STATUS', 'fail_method', 'fail_content_type', 'fail_open_file', 'fail_500', 'redirect', 'read_header_env', - 'url_query_decode', - 'join_path', - 'merge_url', - 'open_encoded', 'stat_encoded', - 'http_header_line', 'http_header_content_length', 'http_header_content_disposition', + 'http_header_line', 'http_header_content_length', 'http_header_content_disposition' +); +use botm_data_file ( 'merge_settings' ); use bsta_lib ( diff --git a/goto.1.pl b/goto.1.pl index 26eef98..5d8d738 100644 --- a/goto.1.pl +++ b/goto.1.pl @@ -5,7 +5,7 @@ # # The frame list # -# Copyright (C) 2017, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2017, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,13 +25,20 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + '_x_encoded' +); +use botm_url ( + 'url_query_decode' +); +use botm_http ( 'fail_method', 'fail_content_type', 'redirect', - 'read_header_env', - 'url_query_decode', - '_x_encoded', + 'read_header_env' +); +use botm_data_file ( 'merge_settings' ); use bsta_lib ( diff --git a/info.1.pl b/info.1.pl index 58a675f..7d04e9d 100644 --- a/info.1.pl +++ b/info.1.pl @@ -5,7 +5,7 @@ # # The frame/story info interface # -# Copyright (C) 2017, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2017, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,14 +25,19 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_url ( + 'url_query_decode' +); +use botm_http ( 'HTTP_STATUS', 'fail_method', 'fail_content_type', 'http_header_status', - 'read_header_env', + 'read_header_env' +); +use botm_data_file ( 'write_data_file', - 'url_query_decode', 'merge_settings' ); use bsta_lib ( diff --git a/makefile b/makefile index 5ae7468..697d748 100644 --- a/makefile +++ b/makefile @@ -146,7 +146,6 @@ $(EXEC)\ $(PERL_WRAP_EXEC) LIB=\ -botm-common/botm_common.pm\ bsta_lib.pm WWW=\ diff --git a/makefile.1.mak b/makefile.1.mak index d811fdf..1f9270a 100644 --- a/makefile.1.mak +++ b/makefile.1.mak @@ -146,7 +146,6 @@ $(EXEC)\ $(PERL_WRAP_EXEC) LIB=\ -botm-common/botm_common.pm\ bsta_lib.pm WWW=\ diff --git a/ong.1.pl b/ong.1.pl index 2855d68..49a93fb 100644 --- a/ong.1.pl +++ b/ong.1.pl @@ -24,9 +24,10 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( - 'open_encoded', +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'open_encoded' ); use bsta_lib ( 'STATE', diff --git a/opomba.1.pl b/opomba.1.pl index 26cdaa5..eb67cfb 100644 --- a/opomba.1.pl +++ b/opomba.1.pl @@ -5,7 +5,7 @@ # # The comment posting interface # -# Copyright (C) 2024, 2025 Balthasar Szczepański +# Copyright (C) 2024, 2025, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,21 +25,31 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( - 'HTTP_STATUS', - 'fail_method', 'fail_content_type', - 'redirect', - 'read_header_env', 'url_query_decode', - 'write_data_file', - 'html_entity_encode_dec', +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( 'open_encoded', 'join_path', - 'merge_settings', + 'make_id' +); +use botm_url ( 'merge_url', - 'make_id', + 'url_query_decode', +); +use botm_http ( + 'HTTP_STATUS', + 'fail_method', 'fail_content_type', + 'redirect', + 'read_header_env', 'http_header_status' ); +use botm_data_file ( + 'write_data_file', + 'merge_settings' +); +use botm_html_encode ( + 'html_entity_encode_dec' +); use bsta_lib ( 'TEXT_MODE', 'STATE', 'get_password', diff --git a/reset.1.pl b/reset.1.pl index b4fe665..4a21a11 100644 --- a/reset.1.pl +++ b/reset.1.pl @@ -24,11 +24,14 @@ use utf8; use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( - 'write_data_file', +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( 'opendir_encoded', 'readdir_decoded', 'unlink_encoded', - 'join_path', + 'join_path' +); +use botm_data_file ( + 'write_data_file', 'merge_settings' ); use bsta_lib ( diff --git a/settings-again.txt b/settings-again.txt index 24319d3..ef0cb6a 100644 --- a/settings-again.txt +++ b/settings-again.txt @@ -54,9 +54,10 @@ perl : /usr/bin/perl rm : /usr/bin/rm sudo : /usr/bin/sudo -oldlogs : /botm/bin/oldlogs/oldlogs.pl -configure: /botm/bin/config-1.3/configure.pl -exec : /botm/lib/exec +oldlogs : /botm/bin/oldlogs/oldlogs.pl +configure : /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec +botm_common: /botm/lib/botm-common-perl-2.0 CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings-bsta.txt b/settings-bsta.txt index e89076e..feb236e 100644 --- a/settings-bsta.txt +++ b/settings-bsta.txt @@ -54,9 +54,10 @@ perl : /usr/bin/perl rm : /usr/bin/rm sudo : /usr/bin/sudo -oldlogs : /botm/bin/oldlogs/oldlogs.pl -configure: /botm/bin/config-1.3/configure.pl -exec : /botm/lib/exec +oldlogs : /botm/bin/oldlogs/oldlogs.pl +configure : /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec +botm_common: /botm/lib/botm-common-perl-2.0 CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings-debug.txt b/settings-debug.txt index 76c2265..4f18258 100644 --- a/settings-debug.txt +++ b/settings-debug.txt @@ -54,9 +54,10 @@ perl : /usr/bin/perl rm : /usr/bin/rm sudo : /usr/bin/sudo -oldlogs : /botm/bin/oldlogs/oldlogs.pl -configure: /botm/bin/config-1.3/configure.pl -exec : /botm/lib/exec +oldlogs : /botm/bin/oldlogs/oldlogs.pl +configure : /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec +botm_common: /botm/lib/botm-common-perl-2.0 CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings.txt b/settings.txt index 626e90b..e28e1c1 100644 --- a/settings.txt +++ b/settings.txt @@ -157,7 +157,8 @@ MAKE_EXEC_C = EXEC_C = $_exec_c MAKE_EXEC_SETTINGS = EXEC_SETTINGS = $_exec_settings -PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path)) +PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path )) +PERL_LIB_COMMON = @_PERL_USE_2(lib, @_PERL_STR($botm_common)) PERL_SET_PATH = \$ENV{'PATH'} = @_PERL_STR($path); diff --git a/update.1.pl b/update.1.pl index 1397e7c..b2704e6 100644 --- a/update.1.pl +++ b/update.1.pl @@ -4,7 +4,7 @@ # # update already ONGed frames & stuff # -# Copyright (C) 2016, 2017, 2023, 2024, 2025 Balthasar Szczepański +# Copyright (C) 2016, 2017, 2023, 2024, 2025, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,8 +25,6 @@ use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); ###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( -); use bsta_lib ( 'STATE', 'ong', diff --git a/viewer.1.pl b/viewer.1.pl index f0ed2c2..6c335c7 100644 --- a/viewer.1.pl +++ b/viewer.1.pl @@ -5,7 +5,7 @@ # # The viewer interface # -# Copyright (C) 2016, 2017, 2019, 2020, 2023, 2024 Balthasar Szczepański +# Copyright (C) 2016, 2017, 2019, 2020, 2023, 2024, 2026 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -25,17 +25,24 @@ use utf8; # use Encode::Locale ('decode_argv'); use Encode ('encode', 'decode'); -###PERL_LIB: use lib /botm/lib/bsta -use botm_common ( +###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0 +###PERL_LIB: use lib /botm/lib/bsta +use botm_system ( + 'join_path', + 'open_encoded', '_x_encoded', +); +use botm_url ( + 'merge_url', + 'url_query_decode' +); +use botm_http ( 'HTTP_STATUS', 'fail_method', 'fail_content_type', 'redirect', 'read_header_env', - 'url_query_decode', - 'join_path', - 'open_encoded', '_x_encoded', - 'http_header_status', - 'merge_settings', - 'merge_url' + 'http_header_status' +); +use botm_data_file ( + 'merge_settings' ); use bsta_lib ( 'STATE', 'TEXT_MODE', 'INTF_STATE',