Commit graph

106 commits

Author SHA1 Message Date
Mathieu Lirzin
a3051133c0
maint: Generate version number.
* build-aux/git-version-gen: New script.
* configure.ac (AC_INIT): Use it.
(AC_REQUIRE_AUX_FILE): Distribute it.
* Makefile.am (.version): New target.
(BUILT_SOURCES, EXTRA_DIST): Add it.
(dist-hook): Generate ".tarball-version".
* .gitignore: Update.
2016-12-28 23:06:03 +01:00
Mathieu Lirzin
5e6233a58d
base: find-next-jobs: Use functional style.
* src/mcron/base.scm (find-next-jobs): Rewrite it using functional
style.  Add docstring.
2016-12-28 22:19:04 +01:00
Mathieu Lirzin
c1d2c765ef
vixie-specification: Do not use 'and-let*'.
* src/mcron/vixie-specification.scm (parse-vixie-environment): Use
'and=>' instead of 'and-let*'
2016-12-28 22:19:04 +01:00
Mathieu Lirzin
4d518fd3f1
all: Gather module imports.
* src/mcron/base.scm: Gather module imports.
* src/mcron/redirect.scm: Likewise.
* src/mcron/vixie-specification.scm: Likewise.
* src/mcron/vixie-time.scm: Likewise.
2016-12-28 22:19:04 +01:00
Mathieu Lirzin
d4b4ac5708
utils: Remove unneeded 'stdin->string' procedure.
* src/mcron/utils.scm: Re-export 'read-string'.
(stdin->string): Delete.
* src/mcron/scripts/crontab.scm (main): Use 'read-string' instead.
* src/mcron/scripts/mcron.scm (process-user-file): Likewise.
2016-12-28 22:19:04 +01:00
Mathieu Lirzin
2d6c072b47
utils: for-each-file: Use named let.
* src/mcron/utils.scm (for-each-file): Use named 'let' instead of 'do'.
2016-12-28 22:19:03 +01:00
Mathieu Lirzin
61f85be19d
build: Rename (mcron main) to (mcron utils).
* src/mcron/main.scm: Rename to ...
* src/mcron/utils.scm: ... this.
* src/mcron/scripts/cron.scm: Adapt.
* src/mcron/scripts/crontab.scm: Likewise.
* src/mcron/scripts/mcron.scm: Likewise.
* Makefile.am (dist_mcronmodule_DATA): Likewise.
2016-12-28 22:19:03 +01:00
Mathieu Lirzin
2c9139f623
maint: Delete BUGS.
* BUGS: Delete.
* Makefile.am (EXTRA_DIST): Adapt.
* README: Likewise.
2016-12-28 22:19:03 +01:00
Mathieu Lirzin
6a91b6fb3e
maint: Update AUTHORS.
* AUTHORS: Add 'Sergey Poznyakoff' and 'Mathieu Lirzin'.
2016-12-28 22:19:03 +01:00
Mathieu Lirzin
2cdd544a56
maint: Reformat copyright notices and copying permission statements. 2016-12-28 22:19:03 +01:00
Mathieu Lirzin
19d68f7dd6
build: Rename 'mcron.c' to 'wrapper.c'.
* src/mcron.c: Rename to ...
* src/wrapper.c: ... this.
* Makefile.am (mcron_SOURCES, cron_SOURCES, crontab_SOURCES): Adapt to it.
* configure.ac (AC_CONFIG_SRCDIR): Likewise.
2016-12-28 22:19:03 +01:00
Mathieu Lirzin
74babba80e
base: Rewrite 'run-job-loop'.
* src/mcron/base.scm (run-job-loop): Use #:optional keyword argument, and
'match'.
2016-12-28 22:19:02 +01:00
Mathieu Lirzin
913e3c65e4
job-specifier: Use #:optional keyword argument.
* src/mcron/job-specifier.scm (next-year, next-year-from, next-month)
(next-month-from, next-day, next-day-from, next-hour, next-hour-from)
(next-minute, next-minute-from, next-second, next-second-from): Use #:optional
keyword argument.
(maybe-args): Remove unneeded procedure.
2016-12-28 22:19:02 +01:00
Mathieu Lirzin
109555a9dd
job-specifier: Add %current-action-time parameter object.
* src/mcron/job-specifier.scm (current-action-time): Rename to ...
(%current-action-time): ... this.  Make it a parameter object.
(job, maybe-args): Adapt.
2016-12-28 22:19:02 +01:00
Mathieu Lirzin
ea2058f14a
job-specifier: Rewrite 'bump-time'.
* src/mcron/job-specifier.scm (bump-time): Use 'match'.
2016-12-28 22:18:54 +01:00
Mathieu Lirzin
ae6deb8ea2
job-specifier: Use 'inf' thunk.
* src/mcron/job-specifier.scm (%find-best-next): Call 'inf' thunk
instead of defining an arbitrary high integer.
(bump-time): Adapt to it.
2016-12-01 00:15:56 +01:00
Mathieu Lirzin
245413041c
build: Define PACKAGE_LOAD_PATH in Makefile.
Previously PACKAGE_LOAD_PATH was set in config header which wasn't correctly
expanded due to the presence of ${prefix} in ${moduledir}.  Let 'make' handle
the expansion.

* Makefile.am (AM_CPPFLAGS): New variable.
(cron_CPPFLAGS, crontab_CPPFLAGS, mcron_CPPFLAGS): Use it.
* configure.ac (PACKAGE_LOAD_PATH): Undefine it.
(AC_CONFIG_HEADER): Remove macro.
* src/mcron.c: Adapt to it.
2016-12-01 00:15:56 +01:00
Mathieu Lirzin
6a82b53ddd
build: Silence 'guild compile' output.
* Makefile.am (devnull_verbose, devnull_verbose_, devnull_verbose_0):
New variables
(.scm.go): Use $(devnull_verbose).
2016-12-01 00:15:56 +01:00
Mathieu Lirzin
10c9f31c6c
build: Use Automake warnings.
* configure.ac (AM_INIT_AUTOMAKE): Add more warnings.
* Makefile.am (AM_V_GUILEC, AM_V_GUILEC_, AM_V_GUILEC_0): Rename to ...
(guilec_verbose, guilec_verbose_, guilec_verbose_0): ... these.  Make them
more portable.  This follows an example from Automake manual.
2016-12-01 00:15:56 +01:00
Mathieu Lirzin
4a56db1609
doc: Generate a man page for every program.
* Makefile.am (dist_man_MANS): Add 'cron' and 'crontab' man page.
Generate man pages in $(srcdir).
(MAINTAINERCLEANFILES, gen_man): New variables.
(AM_V_HELP2MAN, AM_V_HELP2MAN_, AM_V_HELP2MAN_0): Delete unneeded variables.
($(srcdir)/doc/crontab.1, $(srcdir)/doc/cron.8): New targets.
(doc/mcron.1): Rename to ...
($(srcdir)/doc/mcron.1)): ... this.
2016-12-01 00:15:56 +01:00
Mathieu Lirzin
e9fde01d27
environment: modify-environment: Add tests.
* tests/environment.scm: New test.
* Makefile.am (TESTS): Add it.
2016-12-01 00:15:55 +01:00
Mathieu Lirzin
9d173e23bc
job-specifier: range: Add tests.
* build-aux/test-driver.scm: New script.
* configure.ac (AC_REQUIRE_AUX_FILE): Add it.
* tests/job-specifier.scm: New test.
* Makefile.am (TEST_EXTENSIONS, AM_TESTS_ENVIRONMENT, SCM_LOG_DRIVER)
(TESTS): New variables.
(EXTRA_DIST): Update.
* .gitignore: Likewise.
2016-12-01 00:15:55 +01:00
Mathieu Lirzin
c9064dde98
build: Fix prerequisite for mcron man page.
* Makefile.am (doc/mcron.1): Depend on the Guile script instead of the C
wrapper.
2016-12-01 00:15:55 +01:00
Mathieu Lirzin
c87c643ca1
all: Separate programs in different executables.
This improves readability and complies with the GNU Coding Standards by
making the behavior of the programs independent of the name used to
invoke them.

* src/mcron/scripts/cron.scm: New file.
* src/mcron/scripts/crontab.scm: Likewise.
* src/mcron/scripts/mcron.scm: Likewise.
* Makefile.am (dist_mcronmodule_DATA): Remove 'src/mcron/crontab.scm'.
(bin_PROGRAMS): Add 'crontab'.
(sbin_PROGRAMS): Add 'cron'.
(mcron_CFLAGS, mcron_LDADD): Rename to ...
(AM_CFLAGS, LDADD): ... these.
(cron_SOURCES, cron_CPPFLAGS, cron_DEPENDENCIES)
(crontab_SOURCES, crontab_CPPFLAGS, crontab_DEPENDENCIES)
(mcron_CPPFLAGS, mcronscriptdir, dist_mcronscript_DATA): New variables.
(modules): Redefine it in terms of other '_DATA' variables.
* src/mcron/crontab.scm: Remove file.
* src/mcron/main.scm (parse-args): New procedure.
(command-name, command-type, options): Remove.
(show-version): Adapt.
(show-help, process-files-in-system-directory, cron-file-descriptors)
(main, process-user-file, process-files-in-user-directory): Move
procedures in the new files.
* src/mcron.c (inner_main): Define the current module at compile time.
* TODO: Update.
* .gitignore: Likewise.
2016-12-01 00:15:43 +01:00
Mathieu Lirzin
73b2294650
build: Install 'config.scm' file.
* Makefile.am (mcronmodule_DATA): Add 'src/mcron/config.scm'.
(CLEANFILES): Don't clean it.
2016-11-14 17:10:01 +01:00
Mathieu Lirzin
31baff1a51 job-specifier: job: Add #:user keyword argument.
* src/mcron/job-specifier.scm (job): Add #:user keyword argument.
* doc/mcron.texi (Job specification): Document it.
2016-05-07 23:38:53 +02:00
Ludovic Courtès
45b062490a base: run-jobs: Ensure that the child process always terminates.
* src/mcron/base.scm (run-jobs): Use 'dynamic-wind' instead of 'begin'.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
0d91ec1b97 build: Use lowercase names for local variables.
This helps distinguish variable names with a special Automake semantic.

* Makefile.am (MODULES): Rename to ...
(modules): ... this.
(mcronmodule_DATA, dist_mcronmodule_DATA): Adapt to it.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
bca16da451 build: Remove GOBJECTS and GEN_MODULES variables.
* Makefile.am (GOBJECTS, GEN_MODULES): Remove variables.
(mcronmodule_DATA, DISTCLEANFILES): Inline their contents.
(mcron_DEPENDENCIES, CLEANFILES): Use 'mcronmodule_DATA'.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
418b81e1af base: Rename (mcron core) module to (mcron base).
The 'configure' script deletes the 'core.*' files.  Having a file named
'base.scm' instead of 'core.scm' simplifies the build process without
changing the semantics.

* src/mcron/mcron-core.scm: Rename to ...
* src/mcron/base.scm: ... this.
All module users changed.
* Makefile.am (MODULES): Add 'src/mcron/base.scm'.
(CP): Remove variable.
(src/mcron/core.scm): Remove target.
(GEN_MODULES): Remove 'src/mcron/core.scm'.
(dist_mcronmodule_DATA): Remove 'src/mcron/mcron-core.scm'
* doc/mcron.texi: Adapt to name change.
* .gitignore: Update.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
52364699ed build: Use AC_CONFIG_SRCDIR safety check.
* configure.ac (AC_CONFIG_SCRDIR): Set it to 'src/mcron.c'.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
995bc9ca6e all: Rename 'scm' directory to 'src'.
* scm/mcron/config.scm.in: Rename to ...
* src/mcron/config.scm.in: ... this.
* scm/mcron/crontab.scm: Rename to ...
* src/mcron/crontab.scm: ... this.
* scm/mcron/environment.scm: Rename to ...
* src/mcron/environment.scm: ... this.
* scm/mcron/job-specifier.scm: Rename to ...
* src/mcron/job-specifier.scm: ... this.
* scm/mcron/main.scm: Rename to ...
* src/mcron/main.scm: ... this.
* scm/mcron/mcron-core.scm: Rename to ...
* src/mcron/mcron-core.scm: ... this.
* scm/mcron/redirect.scm: Rename to ...
* src/mcron/redirect.scm: ... this.
* scm/mcron/vixie-specification.scm: Rename to ...
* src/mcron/vixie-specification.scm: ... this.
* scm/mcron/vixie-time.scm: Rename to ...
* src/mcron/vixie-time.scm: ... this.
* mcron.c: Rename to ...
* src/mcron.c: ... this.
* Makefile.am: Adapt to them.
* build-aux/pre-inst-env.in: Likewise.
* configure.ac (AC_CONFIG_FILES): Likewise.
(AC_CONFIG_HEADER): Set to 'src/config.h'.
* .gitignore: Update.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
bb8703b679 build: Do not auto-compile 'guild'.
* Makefile.am (.scm.go): Set GUILE_AUTO_COMPILE to 0.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
5097e30bab job-specifier: Add '%find-best-next' procedure.
* scm/mcron/job-specifier.scm (find-best-next): Rename to ...
(%find-best-next): ... this.  Rewrite it using a functional style.
All callers changed.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
5da0024b93 job-specifier: Rewrite 'range' procedure.
* scm/mcron/job-specifier.scm (range): Use 'unfold'.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
ce0d72ec83 build: Fix 'distcheck' target failures.
* Makefile.am (TEXI2DVI, DISTCLEANFILES, doc_mcron_TEXINFOS)
(nodist_doc_mcron_TEXINFOS): New variables.  This fixes the build of the
dvi/pdf documentation.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
8952d2dc44 build: Support VPATH builds.
This allows using 'mcron' before it is installed without hardcoding the
local build environment in the executable.

* build-aux/pre-inst-env.in: New script.
* configure.ac (AC_CONFIG_FILES): Create it.
(AC_CONFIG_HEADER): Add 'config.h'.
(moduledir): New variable.
(PACKAGE_LOAD_PATH): new C preprocessor macro.
* mcron.c: Include "config.h".
(main): Don't overwrite Guile load paths.
(inner_main): Prepend Mcron modules load paths.
* Makefile.am (.scm.go, doc/mcron.1): Use 'pre-inst-env'.
(mcron_CFLAGS): Remove GUILE_LOAD_PATH macro.
(noinst_SCRIPTS): New variable.
* .gitignore: Update.
2016-05-07 23:38:53 +02:00
Mathieu Lirzin
b59f2f5ea6 build: Use a non-recursive makefile.
* configure.ac (AM_INIT_AUTOMAKE): Use 'subdir-objects' option.
(AC_CONFIG_FILES): Remove 'scm/mcron/makefile' and 'makefile'.  Add
'Makefile'.
* makefile.am: Delete file.  Move its content into ...
* scm/mcron/makefile.am: Likewise.
* Makefile.am: ... this.  New file.
* .gitignore: Update.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
589d5ff8d1 core: Use SRFI-9 records for the job data structure.
* scm/mcron/mcron-core.scm <job>: New record type.  This Replaces a
vector data structure.  All consumers changed.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
fdbaa674a7 main: Remove 'valid-user' procedure.
* scm/mcron/main.scm (valid-user): Delete procedure.
(process-files-in-system-directory): Adjust accordingly by using a local
definition.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
4da7aec83b main: Add 'for-each-file' procedure.
* scm/mcron/main.scm (for-each-file): New procedure.
(process-files-in-user-directory, process-files-in-system-directory):
Use it.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
f2c56d355f all: Add a custom indentation rule for 'mcron-error'.
* .dir-locals.el: Define a custom indentation rule for 'mcron-error'.
* scm/mcron/crontab.scm: Use it.
* scm/mcron/job-specifier.scm: Likewise.
* scm/mcron/main.scm: Likewise.
* scm/mcron/vixie-specification.scm: Likewise.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
b2718d2cc9 maint: Define directory-local variables for Emacs.
This configures Emacs automatically.

* .dir-locals.el: New file.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
c2a1d931a6 environment: Redefine 'modify-environment'.
* scm/mcron/environment.scm (modify-environment): Add docstring.
Compute 'passwd:dir' and 'passwd:name' only once.
(impose-default-environment): Merge it into 'modify-environment'.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
960f6e1817 main: Remove unused 'regular-file?' procedure.
* scm/mcron/main.scm (regular-file?): Delete procedure.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
805c04fb90 main: Improve 'process-user-file' definition.
* scm/mcron/main.scm (process-user-file): Rename parameters 'file-path'
to 'file-name' and 'assume-guile' to 'guile-syntax?'.  Capture
'guile-regexp' and 'vixie-regexp' bindings in the procedure scope.
(guile-file-regexp, vixie-file-regexp): Delete variables.
2016-05-07 16:17:52 +02:00
Mathieu Lirzin
831b14d980 mcron: Mark local functions as static.
* mcron.c (inner_main, react_to_terminal_signal, set_cron_signals):
Declare static.
2016-05-07 16:16:56 +02:00
Mathieu Lirzin
8be6babb3f mcron: Rework comments.
* mcron.c: Rework comments.
2016-05-07 11:42:11 +02:00
Mathieu Lirzin
6cd941e061 mcron: Use symbolic constants.
* mcron.c (main, react_to_terminal_signal): Use EXIT_SUCCESS and
EXIT_FAILURE macros instead of magic numbers.
2016-05-07 11:42:11 +02:00
Mathieu Lirzin
ba6613fe96 mcron: Add forward declarations.
* mcron.c: Reorder function definitions sequentially.
2016-05-07 11:42:11 +02:00