From b558cc4ccf665d6392ffbdba364f76302f31a797 Mon Sep 17 00:00:00 2001 From: b Date: Sat, 6 Jun 2026 17:15:46 +0000 Subject: [PATCH] exec is now external dependency, not submodule --- .gitmodules | 3 --- exec | 1 - makefile | 7 +++++-- makefile.1.mak | 7 +++++-- settings-again.txt | 1 + settings-bsta.txt | 1 + settings-debug.txt | 1 + settings.txt | 6 ++++++ 8 files changed, 19 insertions(+), 8 deletions(-) delete mode 160000 exec diff --git a/.gitmodules b/.gitmodules index 8299156..18429c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "exec"] - path = exec - url = ../../botm/exec [submodule "botm-common"] path = botm-common url = ../../botm/common-perl diff --git a/exec b/exec deleted file mode 160000 index 92cf35c..0000000 --- a/exec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92cf35c0340afcadb39f06248de26e114ad5603c diff --git a/makefile b/makefile index c289948..5ae7468 100644 --- a/makefile +++ b/makefile @@ -36,6 +36,9 @@ SUDO =/usr/bin/sudo CONFIGURE = $(PERL) /botm/bin/config-1.3/configure.pl +EXEC_C = /botm/lib/exec/exec.c +EXEC_SETTINGS = /botm/lib/exec/settings.txt + BIN_PATH = /botm/bin/test-bsta DATA_PATH = /botm/data/test-bsta DATA_WORDS_PATH = /botm/data/test-bsta/words @@ -161,8 +164,8 @@ makefile: makefile.1.mak $(CONFIGFILE) $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE) -$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt - $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c +$(PERL_WRAP_EXEC): %: + $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log $(EXEC_SETTINGS) --in $(EXEC_C) --out $*.c $(CC) $(CF) -o $@ $*.c exec: $(EXEC) diff --git a/makefile.1.mak b/makefile.1.mak index 8cb3534..d811fdf 100644 --- a/makefile.1.mak +++ b/makefile.1.mak @@ -36,6 +36,9 @@ CONFIGURE = botm-config ###MAKE_CONFIGURE: CONFIGURE = perl /botm/bin/config-1.3/configure.pl +###MAKE_EXEC_C: EXEC_C = /botm/lib/exec/exec.c +###MAKE_EXEC_SETTINGS: EXEC_SETTINGS = /botm/lib/exec/settings.txt + ###MAKE_BIN_PATH: BIN_PATH = /botm/bin/bsta ###MAKE_DATA_PATH: DATA_PATH = /botm/data/bsta ###MAKE_DATA_WORDS_PATH: DATA_WORDS_PATH = /botm/data/bsta/words @@ -161,8 +164,8 @@ makefile: makefile.1.mak $(CONFIGFILE) $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE) -$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt - $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c +$(PERL_WRAP_EXEC): %: + $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log $(EXEC_SETTINGS) --in $(EXEC_C) --out $*.c $(CC) $(CF) -o $@ $*.c exec: $(EXEC) diff --git a/settings-again.txt b/settings-again.txt index 0026ad7..24319d3 100644 --- a/settings-again.txt +++ b/settings-again.txt @@ -56,6 +56,7 @@ sudo : /usr/bin/sudo oldlogs : /botm/bin/oldlogs/oldlogs.pl configure: /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings-bsta.txt b/settings-bsta.txt index e9d554c..e89076e 100644 --- a/settings-bsta.txt +++ b/settings-bsta.txt @@ -56,6 +56,7 @@ sudo : /usr/bin/sudo oldlogs : /botm/bin/oldlogs/oldlogs.pl configure: /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings-debug.txt b/settings-debug.txt index 5631c5f..76c2265 100644 --- a/settings-debug.txt +++ b/settings-debug.txt @@ -56,6 +56,7 @@ sudo : /usr/bin/sudo oldlogs : /botm/bin/oldlogs/oldlogs.pl configure: /botm/bin/config-1.3/configure.pl +exec : /botm/lib/exec CC: /usr/bin/gcc CF: -g -Wall diff --git a/settings.txt b/settings.txt index 16f5691..626e90b 100644 --- a/settings.txt +++ b/settings.txt @@ -83,6 +83,9 @@ _ott_url = @_PATH( $ott_url, ) _ott_view_url = @_PATH( $ott_url, view ) _ott_mview_url = @_PATH( $ott_url, mview) +_exec_c = @_PATH( $exec, exec.c) +_exec_settings = @_PATH( $exec, settings.txt) + CONF_BIN = $_bin_path CONF_BIN_2WORDS = $_bin_2words_path @@ -150,6 +153,9 @@ MAKE_WWW_PATH = WWW_PATH = $www_path MAKE_CONFIGURE = CONFIGURE = \$(PERL) $configure +MAKE_EXEC_C = EXEC_C = $_exec_c +MAKE_EXEC_SETTINGS = EXEC_SETTINGS = $_exec_settings + PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path)) -- 2.30.2