diff --git a/configure b/configure index 248f95fd..d8319852 100755 --- a/configure +++ b/configure @@ -15,47 +15,6 @@ function makeMakefile() for func in $(echo 'build' 'prebuilt' 'install' 'uninstall' 'uninstall-old' 'clean' 'clean-old' 'view'); do echo -e "$func"':\n\t./setup.py $(PARAMS) '"$func"'\n' done - - cat < "ttyponies/\$\$pony" ;\\ - git add "ttyponies/\$\$pony" ;\\ - else \\ - ln -sf \`readlink "ponies/\$\$pony"\` "ttyponies/\$\$pony" ;\\ - git add "ttyponies/\$\$pony" ;\\ - fi ;\\ - fi ;\\ - done - mkdir -p "extrattyponies" - for pony in \$\$(ls --color=no "extraponies/"); do \\ - if [ ! "\$\$pony" = '.info' ]; then \\ - echo "building extrattypony: \$\$pony" ;\\ - if [ "\`readlink "extraponies/\$\$pony"\`" = '' ]; then \\ - ponysay2ttyponysay < "extraponies/\$\$pony" | tty2colourfultty -c 1 > "extrattyponies/\$\$pony" ;\\ - git add "extrattyponies/\$\$pony" ;\\ - else \\ - ln -sf \`readlink "extraponies/\$\$pony"\` "extrattyponies/\$\$pony" ;\\ - git add "extrattyponies/\$\$pony" ;\\ - fi ;\\ - fi ;\\ - done - -pdfmanual: - texi2pdf "manuals/ponysay.texinfo" - git add "manuals/ponysay.texinfo" "ponysay.pdf" - for ext in \`echo aux cp cps fn ky log pg toc tp vr\`; do \\ - (if [ -f "ponysay.\$\$ext" ]; then unlink "ponysay.\$\$ext"; fi); \\ - done - if [ -d "ponysay.t2d" ]; then rm -r "ponysay.t2d"; fi - -EOF } diff --git a/dev/dist.sh b/dev/dist.sh new file mode 100755 index 00000000..321b0f39 --- /dev/null +++ b/dev/dist.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + + +ttyponies() +{ + mkdir -p "ttyponies" + for pony in $(ls --color=no "ponies/"); do + if [ ! "$pony" = '.info' ]; then + echo "building ttypony: $pony" + if [ "`readlink "ponies/$pony"`" = '' ]; then + ponysay2ttyponysay < "ponies/$pony" | tty2colourfultty -c 1 > "ttyponies/$pony" + git add "ttyponies/$pony" + else + ln -sf `readlink "ponies/$pony"` "ttyponies/$pony" + git add "ttyponies/$pony" + fi + fi + done + mkdir -p "extrattyponies" + for pony in $(ls --color=no "extraponies/"); do + if [ ! "$pony" = '.info' ]; then + echo "building extrattypony: $pony" + if [ "`readlink "extraponies/$pony"`" = '' ]; then + ponysay2ttyponysay < "extraponies/$pony" | tty2colourfultty -c 1 > "extrattyponies/$pony" + git add "extrattyponies/$pony" + else + ln -sf `readlink "extraponies/$pony"` "extrattyponies/$pony" + git add "extrattyponies/$pony" + fi + fi + done +} + + +pdfmanual() +{ + texi2pdf "manuals/ponysay.texinfo" + git add "manuals/ponysay.texinfo" "ponysay.pdf" + for ext in `echo aux cp cps fn ky log pg toc tp vr`; do + if [ -f "ponysay.\$\$ext" ]; then + unlink "ponysay.$ext" + fi + done + if [ -d "ponysay.t2d" ]; then + rm -r "ponysay.t2d"; + fi +} + + +[ "$1" = './dist.sh' ] && cd .. +"$@" diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 9e2703c8..e26d1f79 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -698,14 +698,13 @@ Used in the @command{./configure} script. (Optional) @cindex contributing @table @command -@item make -Required to run @command{make -B ttyponies}. -@item coreutils -@command{ln} and @command{readlink} are used in the @command{ttyponies} subscript. @item bash -Used in the ttyponies subscript. +Required to run @command{dev/dist.sh}. +@item coreutils +@command{ln} and @command{readlink} are used in the @command{ttyponies} subscript +of @command{dev/dist.sh}. @item util-say>=2 -Used by @command{make ttyponies} to build ttyponies from xterm ponies. +Used by @command{dev/dist.sh ttyponies} to build ttyponies from xterm ponies. It can be downloaded at @url{https://github.com/maandree/util-say}. @end table @@ -1435,12 +1434,12 @@ must not redefine the colours in the range 16 to 255 (inclusive). @cindex ttypony When a pony is added please also add a ttypony version, i.e. the pony files used in TTY, but if you don't please state so in the pull request so we do not miss the -create it; the simplest way to do this is to run @command{make -B ttyponies} after -adding the ponies to @file{ponies/}, running @command{make -B ttyponies} will build +create it; the simplest way to do this is to run @command{dev/dist.sh ttyponies} after +adding the ponies to @file{ponies/}, running @command{dev/dist.sh ttyponies} will build (or rebuild) all ttyponies with a pony present in @file{ponies/}, and creates all needed symlinks. -To be able to run @command{make -B ttyponies} you must have the packages listed under +To be able to run @command{dev/dist.sh ttyponies} you must have the packages listed under @ref{Dependencies for pony providers}. @cindex ponyquotes