aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2021-01-28 13:16:11 -0300
committerEuAndreh <eu@euandre.org>2021-01-28 13:21:27 -0300
commit564fa08f4d5a794c58041844e705404dbd5d4768 (patch)
treee6dde7945604dc95643629e56733d9f2c2bcd1a0
parentfake-symlinks: manifest.scm: Bash package (diff)
downloaddotfiles-564fa08f4d5a794c58041844e705404dbd5d4768.tar.gz
dotfiles-564fa08f4d5a794c58041844e705404dbd5d4768.tar.xz
fake-symlinks: mv build-aux into aux, and other support folder into aux
Remove Guix channel files that are embedded in the repository.
-rw-r--r--Makefile6
-rwxr-xr-xaux/assert-nixfmt.sh (renamed from build-aux/assert-nixfmt.sh)0
-rwxr-xr-xaux/assert-shellcheck.sh (renamed from build-aux/assert-shellcheck.sh)0
-rwxr-xr-xaux/assert-todos.sh (renamed from build-aux/assert-todos.sh)2
-rwxr-xr-xaux/ci/ci-build.sh (renamed from sh/templates/build-aux/ci/ci-build.sh)4
-rwxr-xr-xaux/ci/git-post-receive.sh (renamed from build-aux/ci/git-post-receive.sh)0
-rwxr-xr-xaux/ci/git-pre-push.sh (renamed from build-aux/ci/git-pre-push.sh)4
-rw-r--r--build-aux/ci/git-pre-push.sh.in19
-rw-r--r--sh/fake-symlinks.sh99
l---------sh/templates/..git/hooks/pre-push2
-rw-r--r--sh/templates/.guix-authorizations4
-rw-r--r--sh/templates/.guix-channel4
-rwxr-xr-xsh/templates/aux/assert-docs-spelling.sh (renamed from sh/templates/build-aux/assert-docs-spelling.sh)0
-rwxr-xr-xsh/templates/aux/assert-shellcheck.sh (renamed from sh/templates/build-aux/assert-shellcheck.sh)0
-rw-r--r--sh/templates/aux/automake/default-extra-dist.am (renamed from sh/templates/build-aux/default-extra-dist.am)0
-rw-r--r--sh/templates/aux/automake/dev-checks.am (renamed from sh/templates/build-aux/dev-checks.am)0
-rw-r--r--sh/templates/aux/automake/git-notes-release.am (renamed from sh/templates/build-aux/git-notes-release.am)0
-rw-r--r--sh/templates/aux/automake/git-notes-release.sh (renamed from sh/templates/build-aux/git-notes-release.sh)0
-rw-r--r--sh/templates/aux/automake/guile.am (renamed from sh/templates/build-aux/guile.am)0
-rw-r--r--sh/templates/aux/automake/html-files-from-sources.am (renamed from sh/templates/build-aux/html-files-from-sources.am)0
-rw-r--r--sh/templates/aux/automake/rust.am (renamed from sh/templates/build-aux/rust.am)0
-rwxr-xr-xsh/templates/aux/ci/ci-build.sh (renamed from build-aux/ci/ci-build.sh)4
-rwxr-xr-xsh/templates/aux/ci/git-post-receive.sh (renamed from sh/templates/build-aux/ci/git-post-receive.sh)0
-rw-r--r--sh/templates/aux/ci/git-pre-push.sh (renamed from sh/templates/build-aux/ci/git-pre-push.sh)4
-rwxr-xr-xsh/templates/aux/compile-readme.sh (renamed from sh/templates/build-aux/compile-readme.sh)0
-rw-r--r--sh/templates/aux/docbook-xsl.tar.gz (renamed from sh/templates/build-aux/docbook-xsl.tar.gz)bin5181440 -> 5181440 bytes
-rw-r--r--sh/templates/aux/guix/manifest.scm (renamed from sh/templates/build-aux/guix/manifest.scm)0
-rw-r--r--sh/templates/aux/guix/pinned-channels.scm (renamed from sh/templates/build-aux/guix/pinned-channels.scm)0
-rwxr-xr-xsh/templates/aux/guix/with-container.sh4
-rw-r--r--sh/templates/aux/m4/guile.m4 (renamed from sh/templates/m4/guile.m4)0
-rw-r--r--sh/templates/aux/m4/programmer-mode.m4 (renamed from sh/templates/m4/programmer-mode.m4)0
-rwxr-xr-xsh/templates/aux/texinfo-build-web-assets.sh (renamed from sh/templates/build-aux/texinfo-build-web-assets.sh)0
-rwxr-xr-xsh/templates/aux/workflow/CHANGELOG.sh (renamed from sh/templates/build-aux/workflow/CHANGELOG.sh)0
-rwxr-xr-xsh/templates/aux/workflow/README.sh (renamed from sh/templates/build-aux/workflow/README.sh)0
-rwxr-xr-xsh/templates/aux/workflow/TODOs.sh (renamed from sh/templates/build-aux/workflow/TODOs.sh)4
-rwxr-xr-xsh/templates/aux/workflow/assert-todos.sh (renamed from sh/templates/build-aux/workflow/assert-todos.sh)2
-rw-r--r--sh/templates/aux/workflow/preamble.md (renamed from sh/templates/build-aux/workflow/preamble.md)0
-rw-r--r--sh/templates/aux/workflow/style.css (renamed from sh/templates/build-aux/workflow/style.css)0
-rwxr-xr-xsh/templates/build-aux/ci/git-pre-push.sh.in19
-rwxr-xr-xsh/templates/build-aux/guix/with-container.sh4
-rw-r--r--sh/templates/m4/links.m425
-rw-r--r--sh/templates/rename/basic-channel.scm.in72
42 files changed, 52 insertions, 230 deletions
diff --git a/Makefile b/Makefile
index 11422d23..ed32b4af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
.PHONY: check
check:
- sh build-aux/assert-nixfmt.sh
- sh build-aux/assert-shellcheck.sh
- sh build-aux/assert-todos.sh
+ sh aux/assert-nixfmt.sh
+ sh aux/assert-shellcheck.sh
+ sh aux/assert-todos.sh
.PHONY: clean
clean:
diff --git a/build-aux/assert-nixfmt.sh b/aux/assert-nixfmt.sh
index 19bd0a2a..19bd0a2a 100755
--- a/build-aux/assert-nixfmt.sh
+++ b/aux/assert-nixfmt.sh
diff --git a/build-aux/assert-shellcheck.sh b/aux/assert-shellcheck.sh
index 334a8750..334a8750 100755
--- a/build-aux/assert-shellcheck.sh
+++ b/aux/assert-shellcheck.sh
diff --git a/build-aux/assert-todos.sh b/aux/assert-todos.sh
index 27c5b0bc..c40c7187 100755
--- a/build-aux/assert-todos.sh
+++ b/aux/assert-todos.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
-EXCLUDE='(sh/templates/|build-aux/assert-todos.sh|scripts/pastebin.sh|scripts/post.sh|sh/util.sh|docbook-xsl.tar.gz)'
+EXCLUDE='(sh/templates/|aux/assert-todos.sh|scripts/pastebin.sh|scripts/post.sh|sh/util.sh|docbook-xsl.tar.gz)'
if git grep FIXME | grep -Ev "$EXCLUDE"; then
echo "Found dangling FIXME markers on the project."
echo "You should write them down properly on TODOs.org."
diff --git a/sh/templates/build-aux/ci/ci-build.sh b/aux/ci/ci-build.sh
index 0b792dfe..c891d3b8 100755
--- a/sh/templates/build-aux/ci/ci-build.sh
+++ b/aux/ci/ci-build.sh
@@ -35,8 +35,8 @@ EOF
git config --global user.email git@euandre.org
git config --global user.name 'EuAndreh CI'
- if [ -f build-aux/guix/with-container.sh ]; then
- RUNNER='./build-aux/guix/with-container.sh'
+ if [ -f aux/guix/with-container.sh ]; then
+ RUNNER='./aux/guix/with-container.sh'
else
RUNNER='sh -c'
fi
diff --git a/build-aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh
index 2f6e3c0b..2f6e3c0b 100755
--- a/build-aux/ci/git-post-receive.sh
+++ b/aux/ci/git-post-receive.sh
diff --git a/build-aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh
index 2d2bcb1a..30d28504 100755
--- a/build-aux/ci/git-pre-push.sh
+++ b/aux/ci/git-pre-push.sh
@@ -15,5 +15,5 @@ fi
scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description"
ssh git.euandreh.xyz mkdir -p "$LOGS_DIR"
-scp build-aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
-scp build-aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
+scp aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
+scp aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/build-aux/ci/git-pre-push.sh.in b/build-aux/ci/git-pre-push.sh.in
deleted file mode 100644
index 16428d6e..00000000
--- a/build-aux/ci/git-pre-push.sh.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -eux
-
-PACKAGE="$(basename "$PWD")"
-LOGS_DIR="/data/ci/$PACKAGE/logs"
-REMOTE_GIT_DIR="/data/git/$PACKAGE.git"
-
-DESCRIPTION="$(mktemp)"
-if [ -f description ]
-then
- cp description "$DESCRIPTION"
-else
- git config euandreh.description > "$DESCRIPTION"
-fi
-
-scp "$DESCRIPTION" "git.@TLD@:$REMOTE_GIT_DIR/description"
-ssh git.@TLD@ mkdir -p "$LOGS_DIR"
-scp build-aux/ci/ci-build.sh "git.@TLD@:$(dirname "$LOGS_DIR")/ci-build.sh"
-scp build-aux/ci/git-post-receive.sh "git.@TLD@:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/sh/fake-symlinks.sh b/sh/fake-symlinks.sh
index 11859841..d908543e 100644
--- a/sh/fake-symlinks.sh
+++ b/sh/fake-symlinks.sh
@@ -21,9 +21,6 @@ done
mkdir -p ~/archive/torrent/
find ~/dev/libre/website/ -type f -name '*.torrent' -exec cp {} ~/archive/torrent/ \;
-DEFAULT_TLD_SCRIPT='s/@TLD@/euandreh.xyz/g'
-sed -e "$DEFAULT_TLD_SCRIPT" < build-aux/ci/git-pre-push.sh.in > build-aux/ci/git-pre-push.sh
-
normalize_name() {
if [ -n "$RENAME_TO" ]; then
echo "$RENAME_TO"
@@ -150,12 +147,6 @@ ln_env() {
ENABLE_OVERWRITE_PINNED_CHANNELS=
fi
- if [ -n "${GUIX_PROJECT_NO_CHANNEL[$PROJECT]}" ]; then
- ENABLE_GUIX_PROJECT_CHANNEL=
- else
- ENABLE_GUIX_PROJECT_CHANNEL=1
- fi
-
if [ -f "$PREFIX/README.md" ]; then
ENABLE_README_SH=1
else
@@ -181,14 +172,13 @@ ln_init() {
ln_autotools() {
chmod +w "$PREFIX/INSTALL" 2> /dev/null ||:
- cp_all AUTHORS \
- bootstrap \
- ChangeLog \
- build-aux/dev-checks.am \
- build-aux/default-extra-dist.am \
- m4/links.m4 \
- m4/programmer-mode.m4 \
- build-aux/html-files-from-sources.am
+ cp_all AUTHORS \
+ bootstrap \
+ ChangeLog \
+ aux/automake/dev-checks.am \
+ aux/automake/default-extra-dist.am \
+ aux/automake/html-files-from-sources.am \
+ aux/m4/programmer-mode.m4
# dev-cheks.am: test maintainer mode
# https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html
@@ -203,18 +193,18 @@ ln_autotools() {
}
ln_build_aux() {
- cp_all build-aux/assert-shellcheck.sh \
- build-aux/workflow/assert-todos.sh \
- build-aux/workflow/TODOs.sh \
- build-aux/workflow/style.css \
- build-aux/workflow/preamble.md
+ cp_all aux/assert-shellcheck.sh \
+ aux/workflow/assert-todos.sh \
+ aux/workflow/TODOs.sh \
+ aux/workflow/style.css \
+ aux/workflow/preamble.md
if [ "$ENABLE_README_SH" ]; then
- cp_all build-aux/workflow/README.sh
+ cp_all aux/workflow/README.sh
fi
if [ "$ENABLE_CHANGELOG_SH" ]; then
- cp_all build-aux/workflow/CHANGELOG.sh
+ cp_all aux/workflow/CHANGELOG.sh
fi
cp_if_not TODOs.md
@@ -225,45 +215,32 @@ ln_agpl() {
}
ln_guix_files() {
- cp_all build-aux/guix/with-container.sh \
- build-aux/assert-shellcheck.sh
- cp_if_not build-aux/guix/manifest.scm
-
- if [ -n "$ENABLE_GUIX_PROJECT_CHANNEL" ]; then
- cp_all .guix-channel \
- .guix-authorizations \
- guix/channel/euandreh.key
- if [ ! -f "$PREFIX/guix/channel/xyz/euandreh/$PROJECT/channel.scm" ]; then
- RENAME_TO="guix/channel/xyz/euandreh/$PROJECT/channel.scm.in" cp_if_not rename/basic-channel.scm.in
- fi
- fi
+ cp_all aux/guix/with-container.sh \
+ aux/assert-shellcheck.sh
+ cp_if_not aux/guix/manifest.scm
if [ -n "$ENABLE_OVERWRITE_PINNED_CHANNELS" ]; then
- cp_all build-aux/guix/pinned-channels.scm
+ cp_all aux/guix/pinned-channels.scm
else
- cp_if_not build-aux/guix/pinned-channels.scm
+ cp_if_not aux/guix/pinned-channels.scm
fi
}
ln_ci() {
- rm "$PREFIX/.git/hooks/pre-push"
+ rm -f "$PREFIX/.git/hooks/pre-push"
if [ -n "$ENABLE_CI" ]; then
- if [ -n "$ENABLE_AUTOTOOLS" ]; then
- sed_all build-aux/ci/git-pre-push.sh.in
- else
- EXECUTABLE=1 sed_all build-aux/ci/git-pre-push.sh
- fi
- cp_all build-aux/assert-shellcheck.sh \
- build-aux/ci/ci-build.sh \
- build-aux/ci/git-post-receive.sh
- ln -s "$PREFIX/build-aux/ci/git-pre-push.sh" "$PREFIX/.git/hooks/pre-push"
+ EXECUTABLE=1 sed_all aux/ci/git-pre-push.sh
+ cp_all aux/assert-shellcheck.sh \
+ aux/ci/ci-build.sh \
+ aux/ci/git-post-receive.sh
+ ln -s "$PREFIX/aux/ci/git-pre-push.sh" "$PREFIX/.git/hooks/pre-push"
else
EXECUTABLE=1 sed_all ..git/hooks/pre-push
fi
}
ln_git_notes_release() {
- cp_all build-aux/git-notes-release.am build-aux/git-notes-release.sh
+ cp_all aux/automake/git-notes-release.am aux/automake/git-notes-release.sh
cp_if_not NEWS
}
@@ -271,13 +248,9 @@ ln_dicts() {
cp_if_not doc/dictionaries/international.txt doc/dictionaries/en.txt
}
-ln_pandoc_index() {
- cp_all build-aux/compile-readme.sh
-}
-
ln_web_assets_file() {
- mkdir -p "$PREFIX/build-aux/"
- cp "build-aux/$1-build-web-assets.sh" "$PREFIX/build-aux/build-web-assets.sh"
+ mkdir -p "$PREFIX/aux/"
+ cp "aux/$1-build-web-assets.sh" "$PREFIX/aux/build-web-assets.sh"
}
ln_scribble() {
@@ -297,7 +270,6 @@ ln_base_autotools_guix_project() {
ln_git_notes_release
ln_autotools
ln_generated_readme
- ln_pandoc_index
ln_agpl
ln_ci
@@ -305,11 +277,11 @@ ln_base_autotools_guix_project() {
ln_dicts
if [ -n "$ENABLE_GUILE" ]; then
- cp_all build-aux/guile.am m4/guile.m4
+ cp_all aux/automake/guile.am aux/m4/guile.m4
fi
if [ -n "$ENABLE_RUST" ]; then
- cp_all build-aux/rust.am
+ cp_all aux/automake/rust.am
fi
}
@@ -317,15 +289,14 @@ ln_texinfo_autotools_guix_project() {
ln_base_autotools_guix_project "$1"
RENAME_TO="doc/$PROJECT.texi" envsubst_if_not rename/empty-texinfo.texi
ln_web_assets_file texinfo
- cp_all build-aux/docbook-xsl.tar.gz
+ cp_all aux/docbook-xsl.tar.gz
}
ln_sphinx_autotools_guix_project() {
ln_base_autotools_guix_project "$1"
- cp_all build-aux/assert-docs-spelling.sh doc/_templates/footer.html doc/favicon.ico
+ cp_all aux/assert-docs-spelling.sh doc/_templates/footer.html doc/favicon.ico
envsubst_all doc/conf.py.in doc/_templates/layout.html
envsubst_if_not doc/index.rst
- # EXECUTABLE=1 sed_all build-aux/build-sphinx.sh
cp_if_not doc/i18n-pagenames.json doc/Makefile
}
@@ -417,12 +388,6 @@ declare -A RUST_PROJECT=(
[x-bindgen]=1
)
-declare -A GUIX_PROJECT_NO_CHANNEL=(
- [vps]=1
- [website]=1
- [remembering]=1
-)
-
ln_all() {
LN_FN="$1"
shift
diff --git a/sh/templates/..git/hooks/pre-push b/sh/templates/..git/hooks/pre-push
index a54ecd21..29785d24 120000
--- a/sh/templates/..git/hooks/pre-push
+++ b/sh/templates/..git/hooks/pre-push
@@ -1 +1 @@
-../../build-aux/ci/git-pre-push.sh.in \ No newline at end of file
+../../aux/ci/git-pre-push.sh \ No newline at end of file
diff --git a/sh/templates/.guix-authorizations b/sh/templates/.guix-authorizations
deleted file mode 100644
index 0221b5b3..00000000
--- a/sh/templates/.guix-authorizations
+++ /dev/null
@@ -1,4 +0,0 @@
-(authorizations
- (version 0)
- (("5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060"
- (name "euandreh"))))
diff --git a/sh/templates/.guix-channel b/sh/templates/.guix-channel
deleted file mode 100644
index d4d0f36a..00000000
--- a/sh/templates/.guix-channel
+++ /dev/null
@@ -1,4 +0,0 @@
-(channel
- (version 0)
- (directory "guix/channel")
- (keyring-reference "master"))
diff --git a/sh/templates/build-aux/assert-docs-spelling.sh b/sh/templates/aux/assert-docs-spelling.sh
index 5340319c..5340319c 100755
--- a/sh/templates/build-aux/assert-docs-spelling.sh
+++ b/sh/templates/aux/assert-docs-spelling.sh
diff --git a/sh/templates/build-aux/assert-shellcheck.sh b/sh/templates/aux/assert-shellcheck.sh
index 334a8750..334a8750 100755
--- a/sh/templates/build-aux/assert-shellcheck.sh
+++ b/sh/templates/aux/assert-shellcheck.sh
diff --git a/sh/templates/build-aux/default-extra-dist.am b/sh/templates/aux/automake/default-extra-dist.am
index c3f1242e..c3f1242e 100644
--- a/sh/templates/build-aux/default-extra-dist.am
+++ b/sh/templates/aux/automake/default-extra-dist.am
diff --git a/sh/templates/build-aux/dev-checks.am b/sh/templates/aux/automake/dev-checks.am
index ca1b9d8b..ca1b9d8b 100644
--- a/sh/templates/build-aux/dev-checks.am
+++ b/sh/templates/aux/automake/dev-checks.am
diff --git a/sh/templates/build-aux/git-notes-release.am b/sh/templates/aux/automake/git-notes-release.am
index 0d91e884..0d91e884 100644
--- a/sh/templates/build-aux/git-notes-release.am
+++ b/sh/templates/aux/automake/git-notes-release.am
diff --git a/sh/templates/build-aux/git-notes-release.sh b/sh/templates/aux/automake/git-notes-release.sh
index 4d55645d..4d55645d 100644
--- a/sh/templates/build-aux/git-notes-release.sh
+++ b/sh/templates/aux/automake/git-notes-release.sh
diff --git a/sh/templates/build-aux/guile.am b/sh/templates/aux/automake/guile.am
index e56b31fb..e56b31fb 100644
--- a/sh/templates/build-aux/guile.am
+++ b/sh/templates/aux/automake/guile.am
diff --git a/sh/templates/build-aux/html-files-from-sources.am b/sh/templates/aux/automake/html-files-from-sources.am
index db073f33..db073f33 100644
--- a/sh/templates/build-aux/html-files-from-sources.am
+++ b/sh/templates/aux/automake/html-files-from-sources.am
diff --git a/sh/templates/build-aux/rust.am b/sh/templates/aux/automake/rust.am
index f8f9b0f0..f8f9b0f0 100644
--- a/sh/templates/build-aux/rust.am
+++ b/sh/templates/aux/automake/rust.am
diff --git a/build-aux/ci/ci-build.sh b/sh/templates/aux/ci/ci-build.sh
index 0b792dfe..c891d3b8 100755
--- a/build-aux/ci/ci-build.sh
+++ b/sh/templates/aux/ci/ci-build.sh
@@ -35,8 +35,8 @@ EOF
git config --global user.email git@euandre.org
git config --global user.name 'EuAndreh CI'
- if [ -f build-aux/guix/with-container.sh ]; then
- RUNNER='./build-aux/guix/with-container.sh'
+ if [ -f aux/guix/with-container.sh ]; then
+ RUNNER='./aux/guix/with-container.sh'
else
RUNNER='sh -c'
fi
diff --git a/sh/templates/build-aux/ci/git-post-receive.sh b/sh/templates/aux/ci/git-post-receive.sh
index 2f6e3c0b..2f6e3c0b 100755
--- a/sh/templates/build-aux/ci/git-post-receive.sh
+++ b/sh/templates/aux/ci/git-post-receive.sh
diff --git a/sh/templates/build-aux/ci/git-pre-push.sh b/sh/templates/aux/ci/git-pre-push.sh
index 23839deb..dd1bbfd9 100644
--- a/sh/templates/build-aux/ci/git-pre-push.sh
+++ b/sh/templates/aux/ci/git-pre-push.sh
@@ -15,5 +15,5 @@ fi
scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description"
__ENABLE_CI__ ssh git.euandreh.xyz mkdir -p "$LOGS_DIR"
-__ENABLE_CI__ scp build-aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
-__ENABLE_CI__ scp build-aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
+__ENABLE_CI__ scp aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
+__ENABLE_CI__ scp aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/sh/templates/build-aux/compile-readme.sh b/sh/templates/aux/compile-readme.sh
index 91f60655..91f60655 100755
--- a/sh/templates/build-aux/compile-readme.sh
+++ b/sh/templates/aux/compile-readme.sh
diff --git a/sh/templates/build-aux/docbook-xsl.tar.gz b/sh/templates/aux/docbook-xsl.tar.gz
index a7a4ce62..a7a4ce62 100644
--- a/sh/templates/build-aux/docbook-xsl.tar.gz
+++ b/sh/templates/aux/docbook-xsl.tar.gz
Binary files differ
diff --git a/sh/templates/build-aux/guix/manifest.scm b/sh/templates/aux/guix/manifest.scm
index 7164e5cd..7164e5cd 100644
--- a/sh/templates/build-aux/guix/manifest.scm
+++ b/sh/templates/aux/guix/manifest.scm
diff --git a/sh/templates/build-aux/guix/pinned-channels.scm b/sh/templates/aux/guix/pinned-channels.scm
index 67b5a51c..67b5a51c 100644
--- a/sh/templates/build-aux/guix/pinned-channels.scm
+++ b/sh/templates/aux/guix/pinned-channels.scm
diff --git a/sh/templates/aux/guix/with-container.sh b/sh/templates/aux/guix/with-container.sh
new file mode 100755
index 00000000..db7b121c
--- /dev/null
+++ b/sh/templates/aux/guix/with-container.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eux
+
+guix time-machine -C aux/guix/pinned-channels.scm -- environment --pure -C -m aux/guix/manifest.scm -- sh -c "$@"
diff --git a/sh/templates/m4/guile.m4 b/sh/templates/aux/m4/guile.m4
index 69689736..69689736 100644
--- a/sh/templates/m4/guile.m4
+++ b/sh/templates/aux/m4/guile.m4
diff --git a/sh/templates/m4/programmer-mode.m4 b/sh/templates/aux/m4/programmer-mode.m4
index 876b8785..876b8785 100644
--- a/sh/templates/m4/programmer-mode.m4
+++ b/sh/templates/aux/m4/programmer-mode.m4
diff --git a/sh/templates/build-aux/texinfo-build-web-assets.sh b/sh/templates/aux/texinfo-build-web-assets.sh
index 241ebb8f..241ebb8f 100755
--- a/sh/templates/build-aux/texinfo-build-web-assets.sh
+++ b/sh/templates/aux/texinfo-build-web-assets.sh
diff --git a/sh/templates/build-aux/workflow/CHANGELOG.sh b/sh/templates/aux/workflow/CHANGELOG.sh
index 829cf5f1..829cf5f1 100755
--- a/sh/templates/build-aux/workflow/CHANGELOG.sh
+++ b/sh/templates/aux/workflow/CHANGELOG.sh
diff --git a/sh/templates/build-aux/workflow/README.sh b/sh/templates/aux/workflow/README.sh
index 49b1e8d0..49b1e8d0 100755
--- a/sh/templates/build-aux/workflow/README.sh
+++ b/sh/templates/aux/workflow/README.sh
diff --git a/sh/templates/build-aux/workflow/TODOs.sh b/sh/templates/aux/workflow/TODOs.sh
index 3f9fa4b8..ab458352 100755
--- a/sh/templates/build-aux/workflow/TODOs.sh
+++ b/sh/templates/aux/workflow/TODOs.sh
@@ -9,7 +9,7 @@ export MAILING_LIST="$3"
REGEX='s/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE) (.*) \{#(.*?)\}$/## <a href="#\3"><span class="\1">\1<\/span> \2<\/a>\n<span class="header-anchor" id="\3">#\3<\/span>\n/'
-envsubst < build-aux/workflow/preamble.md | \
+envsubst < aux/workflow/preamble.md | \
printf '%s\n\n%s' "$(cat -)" "$(perl -pe "$REGEX" TODOs.md)" | \
pandoc --toc \
--highlight-style pygments \
@@ -19,5 +19,5 @@ envsubst < build-aux/workflow/preamble.md | \
--metadata lang=en \
-r markdown \
-w html \
- -H build-aux/workflow/style.css \
+ -H aux/workflow/style.css \
> public/TODOs.html
diff --git a/sh/templates/build-aux/workflow/assert-todos.sh b/sh/templates/aux/workflow/assert-todos.sh
index 1d568cb3..203d465a 100755
--- a/sh/templates/build-aux/workflow/assert-todos.sh
+++ b/sh/templates/aux/workflow/assert-todos.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
-if git grep FIXME | grep -v '^TODOs.md' | grep -v '^build-aux/workflow/assert-todos.sh' | grep -v '^build-aux/docbook-xsl/'; then
+if git grep FIXME | grep -v '^TODOs.md' | grep -v '^aux/workflow/assert-todos.sh' | grep -v '^aux/docbook-xsl/'; then
echo "Found dangling FIXME markers on the project."
echo "You should write them down properly on TODOs.md."
exit 1
diff --git a/sh/templates/build-aux/workflow/preamble.md b/sh/templates/aux/workflow/preamble.md
index c6ae56e8..c6ae56e8 100644
--- a/sh/templates/build-aux/workflow/preamble.md
+++ b/sh/templates/aux/workflow/preamble.md
diff --git a/sh/templates/build-aux/workflow/style.css b/sh/templates/aux/workflow/style.css
index ac0144c5..ac0144c5 100644
--- a/sh/templates/build-aux/workflow/style.css
+++ b/sh/templates/aux/workflow/style.css
diff --git a/sh/templates/build-aux/ci/git-pre-push.sh.in b/sh/templates/build-aux/ci/git-pre-push.sh.in
deleted file mode 100755
index dbadd1c7..00000000
--- a/sh/templates/build-aux/ci/git-pre-push.sh.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -eux
-
-PACKAGE="$(basename "$PWD")"
-__ENABLE_CI__ LOGS_DIR="/data/ci/$PACKAGE/logs"
-REMOTE_GIT_DIR="/data/git/$PACKAGE.git"
-
-DESCRIPTION="$(mktemp)"
-if [ -f description ]
-then
- cp description "$DESCRIPTION"
-else
- git config euandreh.description > "$DESCRIPTION"
-fi
-
-scp "$DESCRIPTION" "git.@TLD@:$REMOTE_GIT_DIR/description"
-__ENABLE_CI__ ssh git.@TLD@ mkdir -p "$LOGS_DIR"
-__ENABLE_CI__ scp build-aux/ci/ci-build.sh "git.@TLD@:$(dirname "$LOGS_DIR")/ci-build.sh"
-__ENABLE_CI__ scp build-aux/ci/git-post-receive.sh "git.@TLD@:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/sh/templates/build-aux/guix/with-container.sh b/sh/templates/build-aux/guix/with-container.sh
deleted file mode 100755
index 5969d38b..00000000
--- a/sh/templates/build-aux/guix/with-container.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eux
-
-guix time-machine -C build-aux/guix/pinned-channels.scm -- environment --pure -C -m build-aux/guix/manifest.scm -- sh -c "$@"
diff --git a/sh/templates/m4/links.m4 b/sh/templates/m4/links.m4
deleted file mode 100644
index a96fb5ff..00000000
--- a/sh/templates/m4/links.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_DEFUN([EU_LINKS], [
- AC_SUBST([TLD])
-
- PACKAGE_VERSION_NUMBERS="`echo $PACKAGE_VERSION | cut -c2-`"
- AC_SUBST([PACKAGE_VERSION_NUMBERS])
-
- PACKAGE_DESCRIPTION="`awk '{print substr(@S|@0, 1, length(@S|@0)-1)}' $srcdir/description`"
- AC_SUBST([PACKAGE_DESCRIPTION])
-
- PACKAGE_CHANNEL_URL="git://git.$TLD/$PACKAGE/"
- AC_SUBST([PACKAGE_CHANNEL_URL])
-
- PACKAGE_GIT_URL="https://git.$TLD/$PACKAGE/"
- AC_SUBST([PACKAGE_GIT_URL])
-
- PACKAGE_CI_URL="https://ci.$TLD/"
- AC_SUBST([PACKAGE_CI_URL])
-
- PACKAGE_DOC_URL="https://$PACKAGE.$TLD/en/master/"
- AC_SUBST([PACKAGE_DOC_URL])
-
- if test "$PACKAGE_URL" != "https://$PACKAGE.$TLD"; then
- AC_MSG_ERROR(['TLD' variable is out of sync with 'PACKAGE_URL': https://$PACKAGE.$TLD != $PACKAGE_URL])
- fi
-])
diff --git a/sh/templates/rename/basic-channel.scm.in b/sh/templates/rename/basic-channel.scm.in
deleted file mode 100644
index 024d085c..00000000
--- a/sh/templates/rename/basic-channel.scm.in
+++ /dev/null
@@ -1,72 +0,0 @@
-(define-module (xyz euandreh @PACKAGE@ channel)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix transformations)
- #:use-module (guix gexp)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix git-download)
- #:use-module (guix utils)
- #:use-module (guix build-system gnu)
- #:use-module (gnu packages)
- #:use-module (gnu packages autotools)
- #:use-module (gnu packages gnupg)
- #:use-module (gnu packages guile)
- #:use-module (gnu packages guile-xyz)
- #:use-module (gnu packages mail)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages texinfo))
-
-(define-public @PACKAGE@
- (package
- (name "@PACKAGE@")
- (version (car
- (string-split (substring "@VERSION@" 1)
- #\-)))
- (source (origin
- (method url-fetch)
- (file-name (string-append name "-" version ".tar.gz"))
- ;; URI available via:
- ;; $ git fetch origin refs/notes/tarballs
- ;; $ printf '@PACKAGE_GIT_URL@blob?id=%s' $(git notes --ref=refs/notes/tarballs list @VERSION@)
- (uri "@PACKAGE_GIT_URL@blob?id=b6a3b84537adb5cdeccb43bd9e00956f8b55d359")
- (sha256
- (base32 "1mraz2d85hgalkdml92x78br31rlbz298r8hf75fcsdlrf7n3d0p"))))
- (build-system gnu-build-system)
- (inputs
- `())
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (synopsis "@PACKAGE_DESCRIPTION@")
- (description "@PACKAGE_LONG_DESCRIPTION@")
- (home-page "@PACKAGE_URL@")
- (license license:agpl3+)))
-
-(define @PACKAGE@-master
- (let ((@PACKAGE@-from-master
- ((options->transformation
- '((with-git-url . "@PACKAGE@=@PACKAGE_CHANNEL_URL@")))
- @PACKAGE@)))
- (package
- (inherit @PACKAGE@-from-master)
- (name "@PACKAGE@-master")
- (native-inputs
- (append
- (package-native-inputs @PACKAGE@)
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("texinfo" ,texinfo)))))))
-
-(define repository-root
- (canonicalize-path
- (string-append (current-source-directory)
- "/../../../../..")))
-
-(define @PACKAGE@-dev
- (package
- (inherit @PACKAGE@-master)
- (source (local-file repository-root
- #:recursive? #t
- #:select? (git-predicate repository-root)))))
-
-@PACKAGE@-dev
-@PACKAGE@-master