chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0541839)
fixing up bundle-sources
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Nov 2020 12:22:26 +0000 (12:22 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Nov 2020 12:22:26 +0000 (12:22 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Makefile patch | blob | history
bundled-sources-make-index [new file with mode: 0755] patch | blob

diff --git a/Makefile b/Makefile
index 642cf5e7046ffb13cec2e97cd0196506d9004b70..7b4ee079cbe3da2d3e416569e2dd2698840055e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@
 # make -j8 release
 
 SHELL=/bin/bash
+src=.
 
 default: all check
 all: debug
@@ -19,6 +20,11 @@ rsrcs = $(shell \
     find $1 \( -name Cargo.toml -o -name Cargo.lock -o -name \*.rs \) )
 stamp=@mkdir -p stamp; touch $@
 
+BUNDLED_SOURCES_LIT = README.md LICENCE
+BUNDLED_SOURCES_FILES = index.html $(BUNDLED_SOURCES_LIT)
+BUNDLED_SOURCES_LINKS += $(BUNDLED_SOURCES_LIT) otter/
+BUNDLED_SOURCES += $(BUNDLED_SOURCES_FILES)
+
 #---------- programs and config variables ----------
 
 CARGO ?= cargo
@@ -68,6 +74,8 @@ $1 := $(abspath $(BUILD_SUBDIR)/$2/target/$3/$4)
 $(abspath $(BUILD_SUBDIR)/$2/target/$3/$4):; cd ../$2 && $$(CARGO) build $(call cr,$3)
 )
 bundled-sources:: bundled-sources/$2
+.PHONY: bundled-sources/$2
+BUNDLED_SOURCES_LINKS += $2/
 endef
 
 $(eval $(call lp,BUNDLE_SOURCES,bundle-sources,debug,bundle-rust-sources))
@@ -167,14 +175,27 @@ stamp/wasm-pack: stamp/cargo.wasm-release
 #---------- bundle-sources ----------
 
 bundled-sources:: bundled-sources/otter
+.PHONY: bundled-sources/otter
+
+TARGET_BUNDLED=$(TARGET_DIR)/bundled-sources
 
 bundled-sources/%: $(BUNDLE_SOURCES)
-       set -e; d=$(abspath $(TARGET_DIR)/bundled-sources); \
+       set -e; d=$(abspath $(TARGET_BUNDLED); \
        $(NAILING_CARGO_JUST_RUN) mkdir -p $$d; \
        $(if $(filter-out otter,$*), cd ../$*;) \
        $(BUNDLE_SOURCES_CMD) --output $$d/$*
 
-.PHONY: bundled-sources/%
+bundled-sources:: $(addprefix $(TARGET_BUNDLED)/, $(BUNDLED_SOURCES_FILES))
+
+$(addprefix $(TARGET_BUNDLED)/, $(BUNDLED_SOURCES_LIT)): $(TARGET_BUNDLED)/%: %
+       $(NAILING_CARGO_JUST_RUN) cp $(abspath $(src))/$< $(abspath $@)
+
+$(TARGET_BUNDLED)/index.html: bundled-sources-make-index Makefile
+       $(NAILING_CARGO_JUST_RUN) sh -ec '                      \
+               cd $(abspath $(src));                           \
+               ./$< >$@.tmp $(BUNDLED_SOURCES_LINKS);          \
+               mv -f $@.tmp $@;                                \
+       '
 
 bundled-sources::
        @echo Bundled sources.
diff --git a/bundled-sources-make-index b/bundled-sources-make-index
new file mode 100755 (executable)
index 0000000..0a199c5
--- /dev/null
+++ b/bundled-sources-make-index
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+title="Otter source code"
+echo "<html><head><title>$title</title></head>"
+echo "<body><h1>$title</h1><ul>"
+for x in $@; do
+    echo "<li><a href=\"$x\">$x</a>"
+done
+echo '</ul><body></html>'
Unnamed repository; edit this file 'description' to name the repository.