From 7c4f7b8b24475e14da0d3100983462ddf12d5171 Mon Sep 17 00:00:00 2001 From: ketmar <> Date: Wed, 11 Oct 2023 19:57:26 +0000 Subject: [PATCH] jamrules: use globs in install target; this is wrong, but i am too lazy to track all files manually FossilOrigin-Name: f29880820776177ef71d222919c974544b6935e92f097b63facf63de6485c624 --- Jamrules.install | 115 +++++++++++++------------------------------- config/keybinds/default.skb | 2 +- config/syntax/urforth.sxh | 10 +++- 3 files changed, 44 insertions(+), 83 deletions(-) diff --git a/Jamrules.install b/Jamrules.install index e6d4b8c..a5b6045 100644 --- a/Jamrules.install +++ b/Jamrules.install @@ -53,158 +53,111 @@ InstallFile share/sxeditor/config : # keybinds InstallFile share/sxeditor/config/keybinds : - $(TOP)/config/keybinds/default.skb - $(TOP)/config/keybinds/wordstar-diamond.skb + [ Glob $(TOP)/config/keybinds : "*.skb" : files-only full-path ] ; # default styles InstallFile share/sxeditor/config/styles : - $(TOP)/config/styles/default.sxs + [ Glob $(TOP)/config/styles : "*.sxs" : files-only full-path ] ; # default style includes InstallFile share/sxeditor/config/styles/defaults : - $(TOP)/config/styles/defaults/execwin.sxs - $(TOP)/config/styles/defaults/manwin.sxs - $(TOP)/config/styles/defaults/syntax.sxs + [ Glob $(TOP)/config/styles/defaults : "*.sxs" : files-only full-path ] ; # default style includes InstallFile share/sxeditor/config/styles/defaults/syntax : - $(TOP)/config/styles/defaults/syntax/char_string.sxs - $(TOP)/config/styles/defaults/syntax/comment.sxs - $(TOP)/config/styles/defaults/syntax/keyword.sxs - $(TOP)/config/styles/defaults/syntax/php.sxs - $(TOP)/config/styles/defaults/syntax/preprocessor.sxs - $(TOP)/config/styles/defaults/syntax/punct_misc.sxs - $(TOP)/config/styles/defaults/syntax/todo.sxs + [ Glob $(TOP)/config/styles/defaults/syntax : "*.sxs" : files-only full-path ] ; # default style includes InstallFile share/sxeditor/config/styles/defaults/popups : - $(TOP)/config/styles/defaults/popups/common.sxs - $(TOP)/config/styles/defaults/popups/framelist.sxs - $(TOP)/config/styles/defaults/popups/fgrep.sxs - $(TOP)/config/styles/defaults/popups/help.sxs - $(TOP)/config/styles/defaults/popups/forms.sxs + [ Glob $(TOP)/config/styles/defaults/popups : "*.sxs" : files-only full-path ] ; # syntax InstallFile share/sxeditor/config/syntax : - $(TOP)/config/syntax/c_cpp.sxh - $(TOP)/config/syntax/commit-messages.sxh - $(TOP)/config/syntax/dlang.sxh - $(TOP)/config/syntax/frag.sxh - $(TOP)/config/syntax/html.sxh - $(TOP)/config/syntax/jam.sxh - $(TOP)/config/syntax/js.sxh - $(TOP)/config/syntax/makefile.sxh - $(TOP)/config/syntax/mes.sxh - $(TOP)/config/syntax/nasal.sxh - $(TOP)/config/syntax/pascal.sxh - $(TOP)/config/syntax/php.sxh - $(TOP)/config/syntax/plm.sxh - $(TOP)/config/syntax/shell.sxh - $(TOP)/config/syntax/sql.sxh - $(TOP)/config/syntax/todo.sxh - $(TOP)/config/syntax/vavoomc.sxh - $(TOP)/config/syntax/zas.sxh + [ Glob $(TOP)/config/syntax : "*.sxh" : files-only full-path ] ; # syntax includes InstallFile share/sxeditor/config/syntax/inc : - $(TOP)/config/syntax/inc/c_cpp_comments.sxi - $(TOP)/config/syntax/inc/c_cpp_preprocessor.sxi - $(TOP)/config/syntax/inc/comment_escapes.sxi - $(TOP)/config/syntax/inc/dlang_comments.sxi - $(TOP)/config/syntax/inc/php_keywords.sxi + [ Glob $(TOP)/config/syntax/inc : "*.sxi" : files-only full-path ] ; # syntax includes InstallFile share/sxeditor/config/syntax/inc/php : - $(TOP)/config/syntax/inc/php/keywords.sxi + [ Glob $(TOP)/config/syntax/inc/php : "*.sxi" : files-only full-path ] ; # sex InstallFile share/sxeditor/config/sex : - $(TOP)/config/sex/main.sex - $(TOP)/config/sex/modules.sex - $(TOP)/config/sex/keybinds.sex - $(TOP)/config/sex/extcmds.sex + [ Glob $(TOP)/config/sex : "*.sex" : files-only full-path ] ; # sex standalone utils InstallFile share/sxeditor/config/sex/standalone_utils : - $(TOP)/config/sex/standalone_utils/cleanup_db.sex - $(TOP)/config/sex/standalone_utils/prj_tool.sex - $(TOP)/config/sex/standalone_utils/tty_learn_keys.sex + [ Glob $(TOP)/config/sex/standalone_utils : "*.sex" : files-only full-path ] ; # sex output parsers InstallFile share/sxeditor/config/sex/outparsers : - $(TOP)/config/sex/outparsers/nasal.sex - $(TOP)/config/sex/outparsers/php.sex - $(TOP)/config/sex/outparsers/spidermonkey.sex - $(TOP)/config/sex/outparsers/urasm.sex + [ Glob $(TOP)/config/sex/outparsers : "*.sex" : files-only full-path ] ; # sex external command detectors InstallFile share/sxeditor/config/sex/extdetect : - $(TOP)/config/sex/extdetect/c_standalone.sex - $(TOP)/config/sex/extdetect/dlang.sex - $(TOP)/config/sex/extdetect/nasal.sex - $(TOP)/config/sex/extdetect/php.sex - $(TOP)/config/sex/extdetect/spidermonkey.sex - $(TOP)/config/sex/extdetect/urasm.sex - $(TOP)/config/sex/extdetect/vccrun.sex + [ Glob $(TOP)/config/sex/extdetect : "*.sex" : files-only full-path ] ; # sex modules # util/exec InstallFile share/sxeditor/config/sex/modules/util/exec : - $(TOP)/config/sex/modules/util/exec/main.sex + [ Glob $(TOP)/config/sex/modules/util/exec : "*.sex" : files-only full-path ] ; # code folder InstallFile share/sxeditor/config/sex/modules/folding : - $(TOP)/config/sex/modules/folding/main.sex + [ Glob $(TOP)/config/sex/modules/folding : "*.sex" : files-only full-path ] +; +# code folder +InstallFile share/sxeditor/config/sex/modules/formsui : + [ Glob $(TOP)/config/sex/modules/formsui : "*.sex" : files-only full-path ] ; # kill spaces InstallFile share/sxeditor/config/sex/modules/killspaces : - $(TOP)/config/sex/modules/killspaces/main.sex + [ Glob $(TOP)/config/sex/modules/killspaces : "*.sex" : files-only full-path ] ; # lowercase words InstallFile share/sxeditor/config/sex/modules/locaseword : - $(TOP)/config/sex/modules/locaseword/main.sex + [ Glob $(TOP)/config/sex/modules/locaseword : "*.sex" : files-only full-path ] ; # minibuffer history InstallFile share/sxeditor/config/sex/modules/mb_history : - $(TOP)/config/sex/modules/mb_history/main.sex + [ Glob $(TOP)/config/sex/modules/mb_history : "*.sex" : files-only full-path ] ; -InstallFile share/sxeditor/config/sex/postload : - $(TOP)/config/sex/postload/activate_mb_history.sex +# Oberon support +InstallFile share/sxeditor/config/sex/modules/oberon : + [ Glob $(TOP)/config/sex/modules/oberon : "*.sex" : files-only full-path ] ; # format paragraph InstallFile share/sxeditor/config/sex/modules/parafmt : - $(TOP)/config/sex/modules/parafmt/main.sex + [ Glob $(TOP)/config/sex/modules/parafmt : "*.sex" : files-only full-path ] ; # run "man" command InstallFile share/sxeditor/config/sex/modules/runman : - $(TOP)/config/sex/modules/runman/main.sex + [ Glob $(TOP)/config/sex/modules/runman : "*.sex" : files-only full-path ] ; # urasm helper InstallFile share/sxeditor/config/sex/modules/urasm : - $(TOP)/config/sex/modules/urasm/main.sex + [ Glob $(TOP)/config/sex/modules/urasm : "*.sex" : files-only full-path ] ; # z80 help system InstallFile share/sxeditor/config/sex/modules/z80help : - $(TOP)/config/sex/modules/z80help/main.sex - $(TOP)/config/sex/modules/z80help/flags.sex - $(TOP)/config/sex/modules/z80help/tsinfo.sex + [ Glob $(TOP)/config/sex/modules/z80help : "*.sex" : files-only full-path ] +; + +# postload initialisers +InstallFile share/sxeditor/config/sex/extdetect : + [ Glob $(TOP)/config/sex/postload : "*.sex" : files-only full-path ] ; # sex autoload InstallFile share/sxeditor/config/sex/appeal : - $(TOP)/config/sex/appeal/binds_code_fold.sex - $(TOP)/config/sex/appeal/binds_global_options.sex - $(TOP)/config/sex/appeal/binds_kill_trailing_spaces.sex - $(TOP)/config/sex/appeal/binds_loword.sex - $(TOP)/config/sex/appeal/binds_para_fmt.sex - $(TOP)/config/sex/appeal/binds_runman.sex - $(TOP)/config/sex/appeal/binds_urasm.sex - $(TOP)/config/sex/appeal/binds_z80help.sex + [ Glob $(TOP)/config/sex/appeal : "*.sex" : files-only full-path ] ; diff --git a/config/keybinds/default.skb b/config/keybinds/default.skb index 3396fdf..622b1f4 100644 --- a/config/keybinds/default.skb +++ b/config/keybinds/default.skb @@ -483,7 +483,7 @@ section "text modification" { help = "delete characted before the cursor"; } { - keys = "C-bs"; + keys = "C-bs | C-w"; action = "|w|sxed_frame_delete_word_back"; help = "delete word before the cursor"; } diff --git a/config/syntax/urforth.sxh b/config/syntax/urforth.sxh index cee39e3..2214eb4 100644 --- a/config/syntax/urforth.sxh +++ b/config/syntax/urforth.sxh @@ -44,7 +44,6 @@ keyword type @separate @any-end { keyword special { recurse compile - exit false true @@ -71,6 +70,11 @@ keyword internal { [char] ['] + break + continue + + exit + /[:]\S+/ create "create;" @@ -110,6 +114,8 @@ keyword hi begin { "+loop" until "not-until" + for + endfor } @@ -122,6 +128,8 @@ keyword hi loop { keyword type { "[:" ";]" + + to } -- 2.11.4.GIT