~technomancy/fennel-lang.org

c32e745914fe42458dce8b16bdfc8429b679f857 — Phil Hagelberg 1 year, 3 months ago 496033b
Moving repositories for Fennel itself.
7 files changed, 23 insertions(+), 23 deletions(-)

M .gitmodules
M README.md
M conf/2019.fnl
M conf/2020.fnl
M fennel
M main.fnl
M makefile
M .gitmodules => .gitmodules +1 -1
@@ 1,3 1,3 @@
[submodule "fennel"]
	path = fennel
	url = https://github.com/bakpakin/Fennel
	url = https://git.sr.ht/~technomancy/fennel

M README.md => README.md +4 -4
@@ 1,9 1,9 @@
# fennel-lang.org

The [web site](https://fennel-lang.org) for the [Fennel programming language](https://github.com/bakpakin/Fennel).
The [web site](https://fennel-lang.org) for the Fennel programming language.

The documentation comes from the markdown files in the main Fennel
repository pulled in via a submodule.
The documentation comes from the markdown files in the [main Fennel
repository](https://git.sr.ht/~technomancy/fennel) pulled in via a submodule.

If you want to contribute to the project, please send patches to the
[mailing list](https://lists.sr.ht/%7Etechnomancy/fennel) or open a


@@ 20,7 20,7 @@ The `conf/` subdirectory contains the code for various years of the
The HTML for the site is
[built and uploaded in the CI](https://builds.sr.ht/~technomancy/fennel-lang.org).

Copyright © 2018-2019 Phil Hagelberg and contributors
Copyright © 2018-2020 Phil Hagelberg and contributors

Released under the MIT/X11 license; same as Fennel


M conf/2019.fnl => conf/2019.fnl +2 -3
@@ 48,10 48,9 @@
      [:hr {}]
      [:p {} "The "
       [:a {:href
            "https://github.com/bakpakin/Fennel/blob/master/CODE-OF-CONDUCT.md"}
            "https://git.sr.ht/~technomancy/fennel/tree/main/CODE-OF-CONDUCT.md"}
        "code of conduct"] " for Fennel applies at FennelConf."]
      [:p {} [:a {:href (.. "https://github.com/technomancy/"
                            "fennel-lang.org/tree/master/conf")}
      [:p {} [:a {:href "https://git.sr.ht/~technomancy/fennel-lang.org/tree/main/conf"}
              "source"]]]]
    (html)
    (print))

M conf/2020.fnl => conf/2020.fnl +2 -2
@@ 13,10 13,10 @@
      [:hr {}]
      [:p {} "The "
       [:a {:href
            "https://github.com/bakpakin/Fennel/blob/master/CODE-OF-CONDUCT.md"}
            "https://git.sr.ht/~technomancy/fennel/tree/main/CODE-OF-CONDUCT.md"}
        "code of conduct"] " for Fennel applies at FennelConf."]
      [:p {} [:a {:href (.. "https://git.sr.ht/~technomancy/fennel-lang.org/"
                            "tree/master/conf/2020.fnl"
                            "tree/main/conf/2020.fnl"
                            )}
              "source"]]]]
    (html)

M fennel => fennel +1 -1
@@ 1,1 1,1 @@
Subproject commit 336b0ecbda38c26d8bc68820748376f2f0e3a99a
Subproject commit 1afeb388963f4a0aeca29343702b10670afb2c98

M main.fnl => main.fnl +6 -5
@@ 104,7 104,7 @@

               [:h2 {} "Development"]
               [:p {} "Fennel's repository is on "
                [:a {:href "https://github.com/bakpakin/Fennel"} "GitHub"]
                [:a {:href "https://git.sr.ht/~technomancy/fennel"} "Sourcehut"]
                ", and discussion occurs on "
                [:a {:href "https://lists.sr.ht/%7Etechnomancy/fennel"}
                 "the mailing list"]


@@ 113,16 113,17 @@
                " and "
                [:a {:href "https://matrix.to/#/!rnpLWzzTijEUDhhtjW:matrix.org"}
                 "on Matrix"] "."
                [:a {:href "https://github.com/bakpakin/Fennel/issues"}
                 "Bug reports"] "are tracked in the GitHub issue system."]
                ;; [:a {:href "https://todo.sr.ht/~technomancy/fennel"}
                ;;  "Bug reports"] "are tracked in Sourcehut."
                ]
               [:p {} "There is also"
                [:a {:href "https://github.com/bakpakin/Fennel/wiki"} "a wiki"]
                " for collecting ideas."]

               [:hr {}]
               [:p {} "Fennel is copyright © 2016-2020 Calvin Rose and "
                [:a {:href "https://github.com/bakpakin/Fennel/graphs/contributors"}
                [:a {:href "https://git.sr.ht/~technomancy/fennel/contributors"}
                 "contributors."] "released under the MIT/X11 license. "
                "This website is under the same terms and also stored on"
                [:a {:href "https://git.sr.ht/~technomancy/fennel-lang.org"}
                 "sourcehut."]]]]))
                 "Sourcehut."]]]]))

M makefile => makefile +7 -7
@@ 1,7 1,7 @@
.DEFAULT_GOAL := build

TAGS := $(shell git --git-dir=./fennel/.git tag -l | grep '^[0-9]' | grep -v - | tac)
TAGDIRS := master $(foreach tag, $(TAGS), v${tag})
TAGDIRS := main $(foreach tag, $(TAGS), v${tag})

# which fennel/$.md files build a tag index
TAGSOURCES := changelog reference api


@@ 22,7 22,7 @@ index.html: main.fnl sample.html fennel/fennel

%.html: fennel/%.md ; $(PANDOC) --toc -o $@ $^

# TODO: for now all master and tags are generated the same;
# TODO: for now all main and tags are generated the same;
# there might be time, when we have "generations" of fennel

%/tag-intro.md: fennel/fennel ; fennel/fennel tag-intro.fnl $@ > $@


@@ 37,17 37,17 @@ v%/fennel:
	make -C $(@D) fennel
	touch setup.md # not all tags have this

master/fennel:
	git clone --branch master fennel $@
main/fennel:
	git clone --branch main fennel $@
	make -C $(@D) fennel

v%/index.html: v%/tag-intro.md v%/repl.md $(foreach md, $(TAGSOURCES), \
		v%/fennel/${md}.md)
	$(PANDOC) -o $@ $^

master/index.html: master/tag-intro.md master/repl.md \
		$(foreach md, $(TAGSOURCES), master/fennel/${md}.md)
	$(PANDOC) -o $@ $^ && rm master/tag-intro.md
main/index.html: main/tag-intro.md main/repl.md \
		$(foreach md, $(TAGSOURCES), main/fennel/${md}.md)
	$(PANDOC) -o $@ $^ && rm main/tag-intro.md

tagdirs: ; $(foreach tagdir, $(TAGDIRSS), mkdir -p ${tagdir})
cleantagdirs: ; $(foreach tagdir, $(TAGDIRS), rm -rf ${tagdir})