From ef1b56ec3a39e60aa5dbdb0e37c3d5efb5010358 Mon Sep 17 00:00:00 2001 From: b Date: Sat, 24 Feb 2024 08:20:12 +0000 Subject: [PATCH] updated subprojects; install script --- botm-common | 2 +- config | 2 +- exec | 2 +- install.sh | 5 +++++ makefile | 13 +++++++------ makefile.1.mak | 11 +++++++---- settings-debug.txt | 24 ++++++++++++------------ settings-release.txt | 24 ++++++++++++------------ settings.txt | 5 ++--- 9 files changed, 48 insertions(+), 40 deletions(-) create mode 100755 install.sh diff --git a/botm-common b/botm-common index 8dbd1b4..44fbe59 160000 --- a/botm-common +++ b/botm-common @@ -1 +1 @@ -Subproject commit 8dbd1b461e07f2894c4fcacacd681ab7c34b6bcb +Subproject commit 44fbe59bfd7652a0975e601591df4a4b218da40d diff --git a/config b/config index 1c21433..fc9affe 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 1c21433837c5bc34100f04bbfeb8ce403844e91d +Subproject commit fc9affec336a16cde93b2675a836bdd01d1c2210 diff --git a/exec b/exec index e95a720..92cf35c 160000 --- a/exec +++ b/exec @@ -1 +1 @@ -Subproject commit e95a720dc218bda573b24d2ba52af79b4be48da9 +Subproject commit 92cf35c0340afcadb39f06248de26e114ad5603c diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..27f5a30 --- /dev/null +++ b/install.sh @@ -0,0 +1,5 @@ +#!/bin/sh +make clean +make -B TARGET=release makefile +make install +make clean diff --git a/makefile b/makefile index 2337270..2987f3c 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ # "makefile" is automatically generated from "makefile.1.mak" # -# Copyright (C) 2023 Balthasar Szczepański +# Copyright (C) 2023, 2024 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 @@ -15,6 +15,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +DEFAULT_TARGET = debug ifndef TARGET TARGET = debug # when want to change target run this first: @@ -38,9 +39,10 @@ TMP_PATH = /botm/tmp/test-post CONFIGFILE = settings-$(TARGET).txt settings.txt +DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt # The configuration tool -CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE) +CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE) # keep these 2 lists in the same order!: GENERATE_FROM=\ @@ -85,7 +87,7 @@ post_common.pm all: $(BIN) setuid exec makefile: makefile.1.mak $(CONFIGFILE) configure.pl - $(CONFIGURE_CMD) < makefile.1.mak > makefile + $(CONFIGURE_CMD) --in makefile.1.mak --out makefile configure.pl: $(CONFIGFILE) config/configure.1.pl $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl @@ -101,8 +103,6 @@ $(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt configure.pl exec: $(EXEC) $(CHMOD) +x $(EXEC) -wrap_exec: - setuid: $(SETUID) $(CHMOD) u+s,g+s $(SETUID) @@ -127,8 +127,9 @@ install: all cp_bin cp_lib clean: $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c) + $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile -PHONY: all clean install cp_bin cp_lib +PHONY: all clean install setuid exec mktree cp_bin cp_lib diff --git a/makefile.1.mak b/makefile.1.mak index 5ced71e..2c6ac43 100644 --- a/makefile.1.mak +++ b/makefile.1.mak @@ -1,6 +1,6 @@ # "makefile" is automatically generated from "makefile.1.mak" # -# Copyright (C) 2023 Balthasar Szczepański +# Copyright (C) 2023, 2024 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 @@ -15,8 +15,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +DEFAULT_TARGET = debug ifndef TARGET -TARGET = debug ###MAKE_TARGET: +TARGET = $(DEFAULT_TARGET) ###MAKE_TARGET: # when want to change target run this first: # make -B TARGET=target_name makefile endif @@ -38,9 +39,10 @@ PERL = perl CONFIGFILE = settings-$(TARGET).txt settings.txt +DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt # The configuration tool -CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE) +CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE) # keep these 2 lists in the same order!: GENERATE_FROM=\ @@ -85,7 +87,7 @@ post_common.pm all: $(BIN) setuid exec makefile: makefile.1.mak $(CONFIGFILE) configure.pl - $(CONFIGURE_CMD) < makefile.1.mak > makefile + $(CONFIGURE_CMD) --in makefile.1.mak --out makefile configure.pl: $(CONFIGFILE) config/configure.1.pl $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl @@ -125,6 +127,7 @@ install: all cp_bin cp_lib clean: $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c) + $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile PHONY: all clean install setuid exec mktree cp_bin cp_lib diff --git a/settings-debug.txt b/settings-debug.txt index 3fb8390..d283d78 100644 --- a/settings-debug.txt +++ b/settings-debug.txt @@ -3,32 +3,32 @@ target: debug -bin_path: /botm/bin/test-post -lib_path: /botm/lib/test-post -tmp_path: /botm/tmp/test-post +bin_path : /botm/bin/test-post +lib_path : /botm/lib/test-post +tmp_path : /botm/tmp/test-post data_path: /botm/data/test-post mirror_url: http://1190.botcastle1b/ott -encoding_file: UTF-8 -encoding_ott: UTF-8 +encoding_file : UTF-8 +encoding_ott : UTF-8 encoding_mirror: UTF-8 -default_subject: Re: 1190: "Time" +default_subject : Re: 1190: "Time" default_username: _ default_password: _ wget_useragent: post tool (http://bicyclesonthemoon.info/git-projects/?p=ott/post) -wget_retries: 3 -wget_timeout: 60 +wget_retries : 3 +wget_timeout : 60 -cp: /usr/bin/cp +cp : /usr/bin/cp chmod: /usr/bin/chmod mkdir: /usr/bin/mkdir -perl: /usr/bin/perl -rm: /usr/bin/rm -wget: /usr/bin/wget +perl : /usr/bin/perl +rm : /usr/bin/rm +wget : /usr/bin/wget CC: gcc CF: -g -Wall \ No newline at end of file diff --git a/settings-release.txt b/settings-release.txt index 59c0959..0ce8b69 100644 --- a/settings-release.txt +++ b/settings-release.txt @@ -3,33 +3,33 @@ target: release -bin_path: /botm/bin/post -lib_path: /botm/lib/post -tmp_path: /botm/tmp/post +bin_path : /botm/bin/post +lib_path : /botm/lib/post +tmp_path : /botm/tmp/post data_path: /botm/data/post # TODO: wget doesn't accept my https :( mirror_url: http://1190.bicyclesonthemoon.info/ott -encoding_file: UTF-8 -encoding_ott: UTF-8 +encoding_file : UTF-8 +encoding_ott : UTF-8 encoding_mirror: UTF-8 -default_subject: Re: 1190: "Time" +default_subject : Re: 1190: "Time" default_username: default_username default_password: _ wget_useragent: post tool (http://bicyclesonthemoon.info/git-projects/?p=ott/post) -wget_retries: 3 -wget_timeout: 60 +wget_retries : 3 +wget_timeout : 60 -cp: /usr/bin/cp +cp : /usr/bin/cp chmod: /usr/bin/chmod mkdir: /usr/bin/mkdir -perl: /usr/bin/perl -rm: /usr/bin/rm -wget: /usr/bin/wget +perl : /usr/bin/perl +rm : /usr/bin/rm +wget : /usr/bin/wget CC: gcc CF: -g -Wall \ No newline at end of file diff --git a/settings.txt b/settings.txt index 8731502..a11c314 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,6 @@ # settings.txt -# 08.15.2023 # -# Copyright (C) 2023 Balthasar Szczepański +# Copyright (C) 2023, 2024 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 @@ -16,7 +15,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -_version: 1.0.3 +_version: 1.0.4 _PERL_STR: '@_ESCAPE($0,')' _SHEBANG: #!$0 -- 2.30.2