aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-08-26 18:04:35 +0200
committerMattias Andrée <maandree@operamail.com>2012-08-26 18:04:35 +0200
commit87232a4c389489ae7ed4e25bc56cc96628a25fde (patch)
treeaa31fe82273e8ad99614ff45e9a43eb74670d89f
parentbea10d0e5474c2a042c25f3e9bf01da9d9ef75fa (diff)
downloadponysay-87232a4c389489ae7ed4e25bc56cc96628a25fde.tar.gz
ponysay-87232a4c389489ae7ed4e25bc56cc96628a25fde.tar.bz2
ponysay-87232a4c389489ae7ed4e25bc56cc96628a25fde.zip
`dev/dist.sh ttyponies` is used instead of `make -B ttyponies` + same for `make pdfmanual`
-rwxr-xr-xconfigure41
-rwxr-xr-xdev/dist.sh51
-rw-r--r--manuals/ponysay.texinfo17
3 files changed, 59 insertions, 50 deletions
diff --git a/configure b/configure
index 248f95f..d831985 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 <<EOF
-## Scripts for maintainers
-
-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
-
-EOF
}
diff --git a/dev/dist.sh b/dev/dist.sh
new file mode 100755
index 0000000..321b0f3
--- /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 9e2703c..e26d1f7 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