merge from trunk

1 files changed, 67 insertions, 0 deletions

diff --git a/admin/notes/hydra b/admin/notes/hydra
new file mode 100644
index 00000000000..068bc70ee9c
--- /dev/null
+++ b/admin/notes/hydra
@@ -0,0 +1,67 @@
+-*- outline -*-
+
+Copyright (C) 2013 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
+
+A continuous build for Emacs trunk can be found at
+http://hydra.nixos.org/jobset/gnu/emacs-trunk
+
+* It builds (and runs ERT tests) on these platforms:
+i686-cygwin
+i686-freebsd
+i686-linux
+x86_64-darwin
+x86_64-linux
+
+* Mail notifications
+In addition to the web interface, Hydra can send notifications by
+email when the build status of a project changes—e.g., from
+`SUCCEEDED' to `FAILED'.  It sends notifications about build status in
+Emacs trunk to emacs-buildstatus@gnu.org.
+
+If you want to receive these notifications, please subscribe at
+http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
+
+* The Emacs jobset consists of the following jobs:
+
+** The `tarball' job
+which gets the source tree as input, and is just a `make dist' after
+some autoconf/-make or bootstrap script.
+
+** The `build' job
+which gets the result of the tarball job as input, together with
+system identifier, this job basically does a normal make and make install.
+
+** The 'coverage' job
+is now running `make check'.
+
+* Nix expressions
+The recipe for GNU Emacs are available via Git:
+http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
+
+To modify the build job, email the patch to hydra-users@gnu.org.  The
+build recipes are written in the Nix language.
+
+* Other Information
+For a list of other GNU packages that have a continuous build on
+Hydra, see http://hydra.nixos.org/project/gnu
+
+See http://www.gnu.org/software/devel.html#Hydra for more information.
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
+
+GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.