Stage flat jsh sources for static builds
ober
bdf3f72f6cb89ba7f1c312629801675b3198729c
--- a/Makefile +++ b/Makefile @@ -1348,6 +1348,15 @@ linux-tui-local: vendor-deps mkdir -p $(MUSL_JSQLITE_STAGE)/jsqlite cp -a $(MUSL_DEPS)/jsqlite/src/jsqlite/. $(MUSL_JSQLITE_STAGE)/jsqlite/ find $(MUSL_JSQLITE_STAGE) -type f \( -name '*.so' -o -name '*.wpo' -o -name '*.ta6le' -o -name '*.ta6fb' -o -name '*.tarm64osx' -o -name '*.tx86_64osx' \) -delete 2>/dev/null || true + rm -rf $(MUSL_JSH_ROOT)/jsh-src + mkdir -p $(MUSL_JSH_ROOT)/jsh-src/jsh + cd $(MUSL_JSH_ROOT) && for m in ast registry macros pregexp-compat util environment lexer arithmetic glob fuzzy history recorder player parser functions signals expander redirect control jobs builtins pipeline executor completion prompt procwatch lineedit fzf script startup main; do \ + if [ -f "$$m.ss" ]; then \ + cp "$$m.ss" "jsh-src/jsh/$$m.ss"; \ + elif [ -f "jerboa-shell/$$m.ss" ]; then \ + cp "jerboa-shell/$$m.ss" "jsh-src/jsh/$$m.ss"; \ + fi; \ + done cd $(MUSL_JSH_ROOT) && $(MUSL_SCHEME) --libdirs $(MUSL_JERBOA)/lib --script support/jerbuild.ss jsh-src src --force cd $(MUSL_JSH_ROOT) && $(MUSL_SCHEME) --libdirs $(MUSL_JERBOA)/lib --script support/jerbuild.ss jerboa-src/src src --force @if [ ! -f "$(MUSL_JSH)/jsh/embed-data.sls" ]; then \ @@ -1470,6 +1479,15 @@ linux-qt-local: vendor-deps mkdir -p $(MUSL_JSQLITE_STAGE)/jsqlite cp -a $(MUSL_DEPS)/jsqlite/src/jsqlite/. $(MUSL_JSQLITE_STAGE)/jsqlite/ find $(MUSL_JSQLITE_STAGE) -type f \( -name '*.so' -o -name '*.wpo' -o -name '*.ta6le' -o -name '*.ta6fb' -o -name '*.tarm64osx' -o -name '*.tx86_64osx' \) -delete 2>/dev/null || true + rm -rf $(MUSL_JSH_ROOT)/jsh-src + mkdir -p $(MUSL_JSH_ROOT)/jsh-src/jsh + cd $(MUSL_JSH_ROOT) && for m in ast registry macros pregexp-compat util environment lexer arithmetic glob fuzzy history recorder player parser functions signals expander redirect control jobs builtins pipeline executor completion prompt procwatch lineedit fzf script startup main; do \ + if [ -f "$$m.ss" ]; then \ + cp "$$m.ss" "jsh-src/jsh/$$m.ss"; \ + elif [ -f "jerboa-shell/$$m.ss" ]; then \ + cp "jerboa-shell/$$m.ss" "jsh-src/jsh/$$m.ss"; \ + fi; \ + done cd $(MUSL_JSH_ROOT) && $(MUSL_SCHEME) --libdirs $(MUSL_JERBOA)/lib --script support/jerbuild.ss jsh-src src --force cd $(MUSL_JSH_ROOT) && $(MUSL_SCHEME) --libdirs $(MUSL_JERBOA)/lib --script support/jerbuild.ss jerboa-src/src src --force @if [ ! -f "$(MUSL_JSH)/jsh/embed-data.sls" ]; then \