diff --git a/configure.ac b/configure.ac index 4d2ceed9..e496e205 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,6 @@ guile/mu/Makefile guile/examples/Makefile guile/tests/Makefile guile/scripts/Makefile -guile/scripts/stats/Makefile toys/Makefile toys/mug/Makefile toys/msg2pdf/Makefile diff --git a/guile/scripts/Makefile.am b/guile/scripts/Makefile.am index 643cda9f..47ffa65f 100644 --- a/guile/scripts/Makefile.am +++ b/guile/scripts/Makefile.am @@ -16,4 +16,12 @@ include $(top_srcdir)/gtest.mk -SUBDIRS=stats +EXTRA_DIST= \ + msgs-per-year.scm \ + msgs-per-hour.scm \ + msgs-per-month.scm \ + msgs-per-day.scm \ + msgs-per-year-month.scm + +muguiledistscriptdir = $(pkgdatadir)/scripts/ +muguiledistscript_SCRIPTS = $(EXTRA_DIST) diff --git a/guile/scripts/stats/msgs-per-day.scm b/guile/scripts/msgs-per-day.scm similarity index 82% rename from guile/scripts/stats/msgs-per-day.scm rename to guile/scripts/msgs-per-day.scm index fcaad6bc..838c09f3 100755 --- a/guile/scripts/stats/msgs-per-day.scm +++ b/guile/scripts/msgs-per-day.scm @@ -19,7 +19,11 @@ exec guile -e main -s $0 $@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; DESCRIPTION: number of messages per weekday +;; DESCRIPTION: graph the number of messages per day +;; DESCRIPTION: options: +;; DESCRIPTION: --query=: limit to messages matching query +;; DESCRIPTION: --muhome=: path to mu home dir +;; DESCRIPTION: --textonly: output in text-only format (use-modules (mu) (mu script) (mu stats) (mu plot)) @@ -37,7 +41,7 @@ display, otherwise, use a graphical window." "Day" "Messages" text-only)) (define (main args) - (mu:run args per-day)) + (mu:run-stats args per-day)) ;; Local Variables: ;; mode: scheme diff --git a/guile/scripts/stats/msgs-per-hour.scm b/guile/scripts/msgs-per-hour.scm similarity index 82% rename from guile/scripts/stats/msgs-per-hour.scm rename to guile/scripts/msgs-per-hour.scm index 928d1910..7f0df0a0 100755 --- a/guile/scripts/stats/msgs-per-hour.scm +++ b/guile/scripts/msgs-per-hour.scm @@ -19,11 +19,14 @@ exec guile -e main -s $0 $@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; DESCRIPTION: number of messages per hour of the day +;; DESCRIPTION: graph the number of messages per hour +;; DESCRIPTION: options: +;; DESCRIPTION: --query=: limit to messages matching query +;; DESCRIPTION: --muhome=: path to mu home dir +;; DESCRIPTION: --textonly: output in text-only format (use-modules (mu) (mu script) (mu stats) (mu plot)) - (define (per-hour expr text-only) "Count the total number of messages for each weekday (0-6 for Sun..Sat) that match EXPR. If PLAIN-TEXT is true, use a plain-text @@ -37,9 +40,8 @@ display, otherwise, use a graphical window." (format #f "Messages per hour matching ~a" expr) "Hour" "Messages" text-only)) - (define (main args) - (mu:run args per-hour)) + (mu:run-stats args per-hour)) ;; Local Variables: ;; mode: scheme diff --git a/guile/scripts/stats/msgs-per-month.scm b/guile/scripts/msgs-per-month.scm similarity index 82% rename from guile/scripts/stats/msgs-per-month.scm rename to guile/scripts/msgs-per-month.scm index a4e7eeab..d4f1cd8d 100755 --- a/guile/scripts/stats/msgs-per-month.scm +++ b/guile/scripts/msgs-per-month.scm @@ -19,7 +19,11 @@ exec guile -e main -s $0 $@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; DESCRIPTION: number of messages per month +;; DESCRIPTION: graph the number of messages per month +;; DESCRIPTION: options: +;; DESCRIPTION: --query=: limit to messages matching query +;; DESCRIPTION: --muhome=: path to mu home dir +;; DESCRIPTION: --textonly: output in text-only format (use-modules (mu) (mu script) (mu stats) (mu plot)) @@ -38,7 +42,7 @@ display, otherwise, use a graphical window." "Month" "Messages" text-only)) (define (main args) - (mu:run args per-month)) + (mu:run-stats args per-month)) ;; Local Variables: ;; mode: scheme diff --git a/guile/scripts/stats/msgs-per-year-month.scm b/guile/scripts/msgs-per-year-month.scm similarity index 82% rename from guile/scripts/stats/msgs-per-year-month.scm rename to guile/scripts/msgs-per-year-month.scm index 0a6d2f27..f702446f 100755 --- a/guile/scripts/stats/msgs-per-year-month.scm +++ b/guile/scripts/msgs-per-year-month.scm @@ -19,7 +19,11 @@ exec guile -e main -s $0 $@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; DESCRIPTION: number of messages per year-month +;; DESCRIPTION: graph the number of messages per year-month +;; DESCRIPTION: options: +;; DESCRIPTION: --query=: limit to messages matching query +;; DESCRIPTION: --muhome=: path to mu home dir +;; DESCRIPTION: --textonly: output in text-only format (use-modules (mu) (mu script) (mu stats) (mu plot)) @@ -40,7 +44,7 @@ display, otherwise, use a graphical window." "Year/Month" "Messages" text-only)) (define (main args) - (mu:run args per-year-month)) + (mu:run-stats args per-year-month)) ;; Local Variables: ;; mode: scheme diff --git a/guile/scripts/stats/msgs-per-year.scm b/guile/scripts/msgs-per-year.scm similarity index 82% rename from guile/scripts/stats/msgs-per-year.scm rename to guile/scripts/msgs-per-year.scm index e175019a..17534c87 100755 --- a/guile/scripts/stats/msgs-per-year.scm +++ b/guile/scripts/msgs-per-year.scm @@ -19,7 +19,11 @@ exec guile -e main -s $0 $@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;; DESCRIPTION: number of messages per year +;; DESCRIPTION: graph the number of messages per year +;; DESCRIPTION: options: +;; DESCRIPTION: --query=: limit to messages matching query +;; DESCRIPTION: --muhome=: path to mu home dir +;; DESCRIPTION: --textonly: output in text-only format (use-modules (mu) (mu script) (mu stats) (mu plot)) @@ -35,9 +39,8 @@ display, otherwise, use a graphical window." (format #f "Messages per year matching ~a" expr) "Year" "Messages" text-only)) - (define (main args) - (mu:run args per-year)) + (mu:run-stats args per-year)) ;; Local Variables: ;; mode: scheme diff --git a/guile/scripts/stats/Makefile.am b/guile/scripts/stats/Makefile.am deleted file mode 100644 index 72b6296f..00000000 --- a/guile/scripts/stats/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Copyright (C) 2012 Dirk-Jan C. Binnema -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software Foundation, -## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -include $(top_srcdir)/gtest.mk - -EXTRA_DIST= \ - msgs-per-year.scm \ - msgs-per-hour.scm \ - msgs-per-month.scm \ - msgs-per-day.scm \ - msgs-per-year-month.scm - -muguiledistscriptdir = $(pkgdatadir)/scripts/stats -muguiledistscript_SCRIPTS = $(EXTRA_DIST)