HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: Add guile-sqlite3.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a9c281d..8fd1c1b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ nodist_noinst_SCRIPTS =                               \
   pre-inst-env                                 \
   test-env
 
-include gnu-system.am
+include gnu/local.mk
 
 MODULES =                                      \
   guix/base32.scm                              \
@@ -38,10 +38,12 @@ MODULES =                                   \
   guix/hash.scm                                        \
   guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
+  guix/combinators.scm                         \
   guix/utils.scm                               \
   guix/sets.scm                                        \
   guix/download.scm                            \
   guix/git-download.scm                                \
+  guix/hg-download.scm                         \
   guix/monads.scm                              \
   guix/monad-repl.scm                          \
   guix/gexp.scm                                        \
@@ -81,6 +83,7 @@ MODULES =                                     \
   guix/build/cmake-build-system.scm            \
   guix/build/emacs-build-system.scm            \
   guix/build/git.scm                           \
+  guix/build/hg.scm                            \
   guix/build/glib-or-gtk-build-system.scm      \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
@@ -173,8 +176,8 @@ dist_noinst_DATA = guix/tests.scm
 
 # Linux-Libre configurations.
 KCONFIGS =                                     \
-  gnu/packages/linux-libre-4.5-i686.conf       \
-  gnu/packages/linux-libre-4.5-x86_64.conf     \
+  gnu/packages/linux-libre-4.6-i686.conf       \
+  gnu/packages/linux-libre-4.6-x86_64.conf     \
   gnu/packages/linux-libre-4.4-i686.conf       \
   gnu/packages/linux-libre-4.4-x86_64.conf     \
   gnu/packages/linux-libre-4.1-i686.conf       \
@@ -183,7 +186,8 @@ KCONFIGS =                                  \
 # Templates, examples.
 EXAMPLES =                                     \
   gnu/system/examples/bare-bones.tmpl          \
-  gnu/system/examples/desktop.tmpl
+  gnu/system/examples/desktop.tmpl             \
+  gnu/system/examples/lightweight-desktop.tmpl
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
 
@@ -230,6 +234,7 @@ SCM_TESTS =                                 \
   tests/ui.scm                                 \
   tests/records.scm                            \
   tests/upstream.scm                           \
+  tests/combinators.scm                                \
   tests/utils.scm                              \
   tests/build-utils.scm                                \
   tests/packages.scm                           \
@@ -245,6 +250,7 @@ SCM_TESTS =                                 \
   tests/profiles.scm                           \
   tests/syscalls.scm                           \
   tests/gremlin.scm                            \
+  tests/bournish.scm                           \
   tests/lint.scm                               \
   tests/publish.scm                            \
   tests/scripts.scm                            \
@@ -292,10 +298,14 @@ endif BUILD_DAEMON
 
 TESTS = $(SCM_TESTS) $(SH_TESTS)
 
-AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
+AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0
 
-SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
-AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
+SCM_LOG_DRIVER =                               \
+  $(top_builddir)/test-env --quiet-stderr      \
+  $(GUILE) --no-auto-compile -e main           \
+      $(top_srcdir)/build-aux/test-driver.scm
+
+AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
 
 SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
 AM_SH_LOG_FLAGS = -x -e
@@ -323,6 +333,13 @@ check-local:
 
 endif !CAN_RUN_TESTS
 
+check-system: $(GOBJECTS)
+       $(AM_V_at)echo "Running system tests..."
+       $(AM_V_at)$(top_builddir)/pre-inst-env                  \
+          $(GUILE) --no-auto-compile                           \
+          -e '(@@ (run-system-tests) run-system-tests)'        \
+          $(top_srcdir)/build-aux/run-system-tests.scm
+
 # Public key used to sign substitutes from hydra.gnu.org.
 dist_pkgdata_DATA = hydra.gnu.org.pub
 
@@ -337,6 +354,7 @@ EXTRA_DIST =                                                \
   .dir-locals.el                                       \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
+  build-aux/hydra/evaluate.scm                         \
   build-aux/hydra/gnu-system.scm                       \
   build-aux/hydra/demo-os.scm                          \
   build-aux/hydra/guix.scm                             \
@@ -345,6 +363,8 @@ EXTRA_DIST =                                                \
   build-aux/download.scm                               \
   build-aux/make-binary-tarball.scm                    \
   build-aux/generate-authors.scm                       \
+  build-aux/test-driver.scm                            \
+  build-aux/run-system-tests.scm                       \
   srfi/srfi-37.scm.in                                  \
   srfi/srfi-64.scm                                     \
   srfi/srfi-64.upstream.scm                            \
@@ -412,11 +432,11 @@ install-data-hook: set-bootstrap-executable-permissions
 SUBDIRS = po/guix po/packages
 BUILT_SOURCES =
 
-include doc.am
+include doc/local.mk
 
 if BUILD_DAEMON
 
-include daemon.am
+include nix/local.mk
 
 endif BUILD_DAEMON
 
@@ -433,7 +453,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                      \
 
 dist_emacsui_DATA = emacs/guix-main.scm
 nodist_emacsui_DATA = emacs/guix-helper.scm
-include emacs.am
+include emacs/local.mk
 
 # The self-contained tarball.
 guix-binary.%.tar.xz:
@@ -477,15 +497,23 @@ assert-no-store-file-names:
        fi
 
 # Make sure hydra.gnu.org has the important binaries.
-assert-binaries-available:
+assert-binaries-available: $(GOBJECTS)
        $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"                       \
          "$(top_srcdir)/build-aux/check-available-binaries.scm"
 
 # Make sure the final inputs don't refer to bootstrap tools.
-assert-final-inputs-self-contained:
+assert-final-inputs-self-contained: $(GOBJECTS)
        $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"                       \
          "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
 
+# Compute the Hydra jobs and write them in the target file.
+hydra-jobs.scm: $(GOBJECTS)
+       $(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
+       $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"              \
+         "$(top_srcdir)/build-aux/hydra/evaluate.scm"                  \
+         "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
+       $(AM_V_at)mv "$@.tmp" "$@"
+
 .PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
jackhill's copy of GNU Guix: https://guix.gnu.org/