From 314bacd3d7c3bc379276fae35065af7077eca8dc Mon Sep 17 00:00:00 2001 From: b Date: Thu, 22 Feb 2024 23:52:04 +0000 Subject: [PATCH] debug build target; updated config tool; install script --- 403.1.htm | 28 ---------------------------- bluenh.1.htm | 2 +- config | 2 +- diff.1.htm | 2 +- enhance.1.conf | 22 +++++++--------------- install.sh | 5 +++++ makefile | 30 +++++++++++++++++------------- makefile.1.mak | 22 +++++++++++++--------- nofading.1.htm | 4 ++-- npb-ong1.htm | 29 ----------------------------- npb.1.htm | 2 +- pal.1.htm | 2 +- reveal.1.htm | 4 ++-- settings-debug.txt | 37 +++++++++++++++++++++++++++++++++++++ settings-release.txt | 37 +++++++++++++++++++------------------ settings.txt | 44 ++++++++++++++++++++++++++++++++++---------- t-1.1.htm | 2 +- 17 files changed, 142 insertions(+), 132 deletions(-) delete mode 100644 403.1.htm create mode 100755 install.sh delete mode 100644 npb-ong1.htm create mode 100644 settings-debug.txt diff --git a/403.1.htm b/403.1.htm deleted file mode 100644 index c285df8..0000000 --- a/403.1.htm +++ /dev/null @@ -1,28 +0,0 @@ - - - - It's 403fication time! • Bicycles on the Moon - - - - -

It's 403fication time!

- -
- -
- Source code available at svn://bicyclesonthemoon.dnsd.info/npb (use "e" to login) or http://1190.bicyclesonthemoon.dnsd.info/pro/npb. - - - diff --git a/bluenh.1.htm b/bluenh.1.htm index c63c6db..0c0a7c3 100644 --- a/bluenh.1.htm +++ b/bluenh.1.htm @@ -1,5 +1,5 @@

ENHANCE!

a=, b=, c=,
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/diff.1.htm b/diff.1.htm index a9e8274..d613624 100644 --- a/diff.1.htm +++ b/diff.1.htm @@ -1,5 +1,5 @@

See the difference!

- + Enhance by URL
URL 1:
URL 2:
diff --git a/enhance.1.conf b/enhance.1.conf index ef0a174..9f63f2c 100644 --- a/enhance.1.conf +++ b/enhance.1.conf @@ -1,21 +1,13 @@ # Enhance tools -ScriptAlias /enhance/bluenh ###CONF_bluenh; -ScriptAlias /enhance/diff ###CONF_diff; -ScriptAlias /enhance/nofading ###CONF_nofading; -ScriptAlias /enhance/npb ###CONF_npb; -ScriptAlias /enhance/pal ###CONF_pal; -ScriptAlias /enhance/reveal ###CONF_reveal; -ScriptAlias /enhance/t-1 ###CONF_t-1; +ScriptAlias ###CONF_cgi_bluenh; ###CONF_bin_bluenh; +ScriptAlias ###CONF_cgi_diff; ###CONF_bin_diff; +ScriptAlias ###CONF_cgi_nofading; ###CONF_bin_nofading; +ScriptAlias ###CONF_cgi_npb; ###CONF_bin_npb; +ScriptAlias ###CONF_cgi_pal; ###CONF_bin_pal; +ScriptAlias ###CONF_cgi_reveal; ###CONF_bin_reveal; +ScriptAlias ###CONF_cgi_t-1; ###CONF_bin_t-1; Require all granted - -# legacy redirections -Redirect permanent /pro/npb/npb.htm /enhance/npb.htm -Redirect permanent /pro/npb/403.htm /enhance/npb.htm -Redirect permanent /pro/bluenh/bluenh.htm /enhance/bluenh.htm -Redirect permanent /pro/nofading/nofading.htm /enhance/nofading.htm -Redirect permanent /pro/insertframe/insertframe.htm /enhance/pal.htm -Redirect permanent /pro /enhance? \ No newline at end of file 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 15bf9ea..93446e1 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,6 @@ # "makefile" is automatically generated from "makefile.1.mak" -# 07.12.2022 # -# Copyright (C) 2022 Balthasar SzczepaÅski +# Copyright (C) 2022, 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 @@ -17,8 +16,10 @@ # along with this program. If not, see . + +DEFAULT_TARGET = debug ifndef TARGET -TARGET = release +TARGET = debug # when want to change target run this first: # make -B TARGET=target_name makefile endif @@ -37,18 +38,19 @@ MKDIR=/usr/bin/mkdir PERL =/usr/bin/perl RM =/usr/bin/rm -BIN_PATH = /botm/bin/enhance -TMP_PATH = /botm/tmp/enhance -WWW_PATH = /botm/www/1190/enhance +BIN_PATH = /botm/bin/test-enhance +TMP_PATH = /botm/tmp/test-enhance +WWW_PATH = /botm/www/1190/enhancetest -CONF = /botm/etc/www/conf/1190/enhance.conf +CONF = /botm/etc/www/conf/1190/test-enhance.conf CONFIGFILE = settings-$(TARGET).txt settings.txt +DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt # The configuration tool # http://bicyclesonthemoon.info/git/botm-config -CONFIGURE = $(PERL) ./configure.pl +CONFIGURE = $(PERL) ./configure.pl --do CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE) @@ -173,10 +175,10 @@ all: $(BIN) $(WWW) enhance.conf 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 + $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG) @@ -192,7 +194,7 @@ $(H_SUBTOOL): %.h: settings-subtool.txt subtool.h configure.pl $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@ $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl - $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE) + $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE) $(CGI): %: %.c online-core.c online-core.h $(H_PNG) $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI) @@ -204,10 +206,10 @@ f2h: f2h.c $(CC) $(CF) -o f2h f2h.c $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl - $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > $*.htm + $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) --out $*.htm index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl - $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) > index.htm + $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) --out index.htm setuid: $(SETUID) @@ -230,9 +232,11 @@ cp_www: $(WWW) | mktree $(CP) -r $(WWW) $(WWW_PATH) install: all cp_bin cp_www cp_conf + clean: $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI) + $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile PHONY: all clean install setuid mktree cp_bin cp_www diff --git a/makefile.1.mak b/makefile.1.mak index 65a80a7..923901c 100644 --- a/makefile.1.mak +++ b/makefile.1.mak @@ -1,7 +1,6 @@ # "makefile" is automatically generated from "makefile.1.mak" -# 07.12.2022 # -# Copyright (C) 2022 Balthasar SzczepaÅski +# Copyright (C) 2022, 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 @@ -17,8 +16,10 @@ # 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 @@ -45,10 +46,11 @@ PERL = perl CONFIGFILE = settings-$(TARGET).txt settings.txt +DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt # The configuration tool # http://bicyclesonthemoon.info/git/botm-config -CONFIGURE = $(PERL) ./configure.pl +CONFIGURE = $(PERL) ./configure.pl --do CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE) @@ -173,10 +175,10 @@ all: $(BIN) $(WWW) enhance.conf 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 + $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG) @@ -192,7 +194,7 @@ $(H_SUBTOOL): %.h: settings-subtool.txt subtool.h configure.pl $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@ $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl - $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE) + $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE) $(CGI): %: %.c online-core.c online-core.h $(H_PNG) $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI) @@ -204,10 +206,10 @@ f2h: f2h.c $(CC) $(CF) -o f2h f2h.c $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl - $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > $*.htm + $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) --out $*.htm index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl - $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) > index.htm + $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) --out index.htm setuid: $(SETUID) @@ -230,9 +232,11 @@ cp_www: $(WWW) | mktree $(CP) -r $(WWW) $(WWW_PATH) install: all cp_bin cp_www cp_conf + clean: $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI) + $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile PHONY: all clean install setuid mktree cp_bin cp_www diff --git a/nofading.1.htm b/nofading.1.htm index 9326bc9..bfa9a81 100644 --- a/nofading.1.htm +++ b/nofading.1.htm @@ -1,5 +1,5 @@

No fading!

- + Enhance by URL
URL of image: @@ -11,7 +11,7 @@ enhance alpha
- -
- -
- Source code available at svn://bicyclesonthemoon.info/npb (use "e" to login) or http://1190.bicyclesonthemoon.info/pro/npb. - - - diff --git a/npb.1.htm b/npb.1.htm index c4f9e20..09787b0 100644 --- a/npb.1.htm +++ b/npb.1.htm @@ -1,5 +1,5 @@

It's NewpixbOTTification time!

-
-

+ Enhance by file upload
Upload the image: diff --git a/settings-debug.txt b/settings-debug.txt new file mode 100644 index 0000000..cbaeafd --- /dev/null +++ b/settings-debug.txt @@ -0,0 +1,37 @@ +# Name must be unique, not shared with other projects / targets. +# otherwise config files will collide +name: test-enhance + +# target name. settings file (THIS FILE) is "settings-TARGET_NAME.txt" +# where TARGET_NAME is the value +target: debug + +useragent: ENHANCE!ment tool (http://1190.bicyclesonthemoon.info/enhancetest) + +title_bluenh : ENHANCE! +title_diff : See the difference! +title_enhance : ENHANCE! +title_nofading: No fading! +title_npb : It's NewpixbOTTification time! +title_pal : Hidden frames +title_reveal : Reveal hidden detail! +title_t-1 : Remap t-1 + +bin_path : /botm/bin/test-enhance +cgi_path : /enhancetest +conf_path: /botm/etc/www/conf/1190 +tmp_path : /botm/tmp/test-enhance +www_path : /botm/www/1190/enhancetest + +cat : /usr/bin/cat +cp : /usr/bin/cp +chmod: /usr/bin/chmod +mkdir: /usr/bin/mkdir +perl : /usr/bin/perl +rm : /usr/bin/rm +wget : /usr/bin/wget + +CC : gcc +CF : -g -Wall +L_IL : -lIL +L_CGI: -lcgi diff --git a/settings-release.txt b/settings-release.txt index a24fe6e..7c71fa9 100644 --- a/settings-release.txt +++ b/settings-release.txt @@ -8,29 +8,30 @@ target: release useragent: ENHANCE!ment tool (http://1190.bicyclesonthemoon.info/enhance) -title_bluenh: ENHANCE! -title_diff: See the difference! -title_enhance: ENHANCE! +title_bluenh : ENHANCE! +title_diff : See the difference! +title_enhance : ENHANCE! title_nofading: No fading! -title_npb: It's NewpixbOTTification time! -title_pal: Hidden frames -title_reveal: Reveal hidden detail! -title_t-1: Remap t-1 +title_npb : It's NewpixbOTTification time! +title_pal : Hidden frames +title_reveal : Reveal hidden detail! +title_t-1 : Remap t-1 -bin_path: /botm/bin/enhance +bin_path : /botm/bin/enhance +cgi_path : /enhance conf_path: /botm/etc/www/conf/1190 -tmp_path: /botm/tmp/enhance -www_path: /botm/www/1190/enhance +tmp_path : /botm/tmp/enhance +www_path : /botm/www/1190/enhance -cat: /usr/bin/cat -cp: /usr/bin/cp +cat : /usr/bin/cat +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 -L_IL: -lIL +CC : gcc +CF : -g -Wall +L_IL : -lIL L_CGI: -lcgi diff --git a/settings.txt b/settings.txt index fc883ae..c6fde17 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,6 @@ # settings.txt -# 04.12.2022 # -# Copyright (C) 2022 Balthasar SzczepaÅski +# Copyright (C) 2022, 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 @@ -36,19 +35,44 @@ _bin_reveal_path = @_PATH($bin_path, reveal) _bin_reveal_cgi_path = @_PATH($bin_path, reveal-cgi) _bin_t-1_cgi_path = @_PATH($bin_path, t-1-cgi) +_cgi_bluenh_path = @_PATH($cgi_path, bluenh) +_cgi_diff_path = @_PATH($cgi_path, diff) +_cgi_nofading_path = @_PATH($cgi_path, nofading) +_cgi_npb_path = @_PATH($cgi_path, npb) +_cgi_pal_path = @_PATH($cgi_path, pal) +_cgi_reveal_path = @_PATH($cgi_path, reveal) +_cgi_t-1_path = @_PATH($cgi_path, t-1) + _conf_path = @_PATH($conf_path, $name\.conf) -HTML_TITLE = @_HTML_TITLE() + +HTML_TITLE = @_HT_ENCODE(@_HTML_TITLE()) + +HTML_BLUENH_PATH = @_HT_ENCODE($_cgi_bluenh_path) +HTML_DIFF_PATH = @_HT_ENCODE($_cgi_diff_path) +HTML_NOFADING_PATH = @_HT_ENCODE($_cgi_nofading_path) +HTML_NPB_PATH = @_HT_ENCODE($_cgi_npb_path) +HTML_PAL_PATH = @_HT_ENCODE($_cgi_pal_path) +HTML_REVEAL_PATH = @_HT_ENCODE($_cgi_reveal_path) +HTML_T-1_PATH = @_HT_ENCODE($_cgi_t-1_path) CONF_bin = $bin_path -CONF_bluenh = $_bin_bluenh_cgi_path -CONF_diff = $_bin_diff_cgi_path -CONF_nofading = $_bin_nofading_cgi_path -CONF_npb = $_bin_npb_cgi_path -CONF_pal = $_bin_pal_cgi_path -CONF_reveal = $_bin_reveal_cgi_path -CONF_t-1 = $_bin_t-1_cgi_path +CONF_bin_bluenh = $_bin_bluenh_cgi_path +CONF_bin_diff = $_bin_diff_cgi_path +CONF_bin_nofading = $_bin_nofading_cgi_path +CONF_bin_npb = $_bin_npb_cgi_path +CONF_bin_pal = $_bin_pal_cgi_path +CONF_bin_reveal = $_bin_reveal_cgi_path +CONF_bin_t-1 = $_bin_t-1_cgi_path + +CONF_cgi_bluenh = $_cgi_bluenh_path +CONF_cgi_diff = $_cgi_diff_path +CONF_cgi_nofading = $_cgi_nofading_path +CONF_cgi_npb = $_cgi_npb_path +CONF_cgi_pal = $_cgi_pal_path +CONF_cgi_reveal = $_cgi_reveal_path +CONF_cgi_t-1 = $_cgi_t-1_path MAKE_TARGET = TARGET = $target diff --git a/t-1.1.htm b/t-1.1.htm index a271ac4..c330a58 100644 --- a/t-1.1.htm +++ b/t-1.1.htm @@ -1,5 +1,5 @@ ï»¿

Remap t-1

- + Remap by file upload
File:

-- 2.30.2