X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/f5c82e15e0e76b855bc4cc88ffb79331b7083f39..1c74da213706bb3c855811222ff3ce281c3315ad:/daemon.am diff --git a/daemon.am b/daemon.am index f5d58ea275..f2cb0a499e 100644 --- a/daemon.am +++ b/daemon.am @@ -1,40 +1,40 @@ -# Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -# Copyright (C) 2012 Ludovic Courtès +# GNU Guix --- Functional package management for GNU +# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès # -# This file is part of Guix. +# This file is part of GNU Guix. # -# Guix is free software; you can redistribute it and/or modify it +# GNU Guix 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. # -# Guix is distributed in the hope that it will be useful, but +# GNU Guix 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 Guix. If not, see . +# along with GNU Guix. If not, see . # # Integration of the `guix-daemon' code taken from upstream Nix. # -BUILT_SOURCES = nix/libstore/schema.sql.hh -CLEANFILES += $(BUILT_SOURCES) +BUILT_SOURCES += nix/libstore/schema.sql.hh +CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service noinst_LIBRARIES = libformat.a libutil.a libstore.a +# Use '-std=c++11' for 'std::shared_ptr', 'auto', lambdas, and more. +AM_CXXFLAGS = -Wall -std=c++11 + libformat_a_SOURCES = \ nix/boost/format/free_funcs.cc \ nix/boost/format/parsing.cc \ nix/boost/format/format_implementation.cc libformat_headers = \ - nix/boost/weak_ptr.hpp \ nix/boost/throw_exception.hpp \ - nix/boost/checked_delete.hpp \ - nix/boost/shared_ptr.hpp \ nix/boost/format.hpp \ nix/boost/assert.hpp \ nix/boost/format/macros_default.hpp \ @@ -44,25 +44,22 @@ libformat_headers = \ nix/boost/format/group.hpp \ nix/boost/format/feed_args.hpp \ nix/boost/format/internals_fwd.hpp \ - nix/boost/format/internals.hpp \ - nix/boost/detail/workaround.hpp \ - nix/boost/detail/shared_count.hpp \ - nix/boost/enable_shared_from_this.hpp + nix/boost/format/internals.hpp libformat_a_CPPFLAGS = \ -I$(top_srcdir)/nix libutil_a_SOURCES = \ nix/libutil/archive.cc \ + nix/libutil/affinity.cc \ nix/libutil/serialise.cc \ - nix/libutil/immutable.cc \ nix/libutil/util.cc \ nix/libutil/xml-writer.cc \ nix/libutil/hash.cc \ nix/libutil/gcrypt-hash.cc libutil_headers = \ - nix/libutil/immutable.hh \ + nix/libutil/affinity.hh \ nix/libutil/hash.hh \ nix/libutil/serialise.hh \ nix/libutil/xml-writer.hh \ @@ -96,7 +93,6 @@ libstore_headers = \ nix/libstore/references.hh \ nix/libstore/pathlocks.hh \ nix/libstore/globals.hh \ - nix/libstore/schema.sql.hh \ nix/libstore/worker-protocol.hh \ nix/libstore/remote-store.hh \ nix/libstore/derivations.hh \ @@ -107,25 +103,29 @@ libstore_headers = \ libstore_a_CPPFLAGS = \ $(libutil_a_CPPFLAGS) \ -I$(top_srcdir)/nix/libstore \ + -I$(top_builddir)/nix/libstore \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ - -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ - -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ - -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ + -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ + -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \ + -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ - -DOPENSSL_PATH="\"FIXME--no OpenSSL support\"" + -DOPENSSL_PATH="\"guix-authenticate\"" \ + -DDEFAULT_CHROOT_DIRS="\"\"" -libstore_a_CFLAGS = \ +libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \ $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) bin_PROGRAMS = guix-daemon +sbin_PROGRAMS = guix-register guix_daemon_SOURCES = \ nix/nix-daemon/nix-daemon.cc \ nix/nix-daemon/guix-daemon.cc guix_daemon_CPPFLAGS = \ + -DLOCALEDIR=\"$(localedir)\" \ $(libutil_a_CPPFLAGS) \ -I$(top_srcdir)/nix/libstore @@ -133,9 +133,27 @@ guix_daemon_LDADD = \ libstore.a libutil.a libformat.a -lbz2 \ $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) +guix_daemon_headers = \ + nix/nix-daemon/shared.hh + + +guix_register_SOURCES = \ + nix/guix-register/guix-register.cc + +guix_register_CPPFLAGS = \ + $(libutil_a_CPPFLAGS) \ + $(libstore_a_CPPFLAGS) \ + -I$(top_srcdir)/nix/libstore + +# XXX: Should we start using shared libs? +guix_register_LDADD = \ + libstore.a libutil.a libformat.a -lbz2 \ + $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) + noinst_HEADERS = \ - $(libformat_headers) $(libutil_headers) $(libstore_headers) + $(libformat_headers) $(libutil_headers) $(libstore_headers) \ + $(guix_daemon_headers) nix/libstore/schema.sql.hh: nix/libstore/schema.sql $(GUILE) --no-auto-compile -c \ @@ -147,23 +165,46 @@ nix/libstore/schema.sql.hh: nix/libstore/schema.sql (write (get-string-all in) out)))))" nodist_pkglibexec_SCRIPTS = \ - nix/scripts/list-runtime-roots + nix/scripts/list-runtime-roots \ + nix/scripts/substitute + +if BUILD_DAEMON_OFFLOAD + +nodist_pkglibexec_SCRIPTS += \ + nix/scripts/offload + +endif BUILD_DAEMON_OFFLOAD + + +# XXX: It'd be better to hide it in $(pkglibexecdir). +nodist_libexec_SCRIPTS = \ + nix/scripts/guix-authenticate + +# The '.service' file for systemd. +systemdservicedir = $(libdir)/systemd/system +nodist_systemdservice_DATA = etc/guix-daemon.service + +etc/guix-daemon.service: etc/guix-daemon.service.in \ + $(top_builddir)/config.status + $(MKDIR_P) "`dirname "$@"`" + $(SED) -e 's|@''bindir''@|$(bindir)|' < \ + "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp" + mv "$@.tmp" "$@" EXTRA_DIST += \ - nix/sync-with-upstream \ nix/libstore/schema.sql \ nix/AUTHORS \ - nix/COPYING - -# Temporary directory used to store the daemon's data. -test_root = $(abs_top_builddir)/test-tmp + nix/COPYING \ + etc/guix-daemon.service.in AM_TESTS_ENVIRONMENT += \ - top_builddir="$(abs_top_builddir)" \ - TEST_ROOT="$(test_root)" + top_builddir="$(abs_top_builddir)" TESTS += \ tests/guix-daemon.sh clean-local: - -rm -rf "$(test_root)" + -if test -d "$(GUIX_TEST_ROOT)"; then \ + find "$(GUIX_TEST_ROOT)" | xargs chmod +w; \ + fi + -rm -rf "$(GUIX_TEST_ROOT)"