summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-03 22:43:26 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-03 23:05:11 +0100
commitb49ffe2d678b5df4192fb9be4ad50bed9d6d5b7f (patch)
treeaabab3a816f2e5a98838d5ddcc9d37cab7d0cdac
parente05385192ca201d44d607af162f197ad39fd1987 (diff)
downloadpatches-b49ffe2d678b5df4192fb9be4ad50bed9d6d5b7f.tar
patches-b49ffe2d678b5df4192fb9be4ad50bed9d6d5b7f.tar.gz
build: Add `bootstrap' and `sync-with-upstream' scripts.
* bootstrap, nix/sync-with-upstream: New files. * Makefile.am (EXTRA_DIST): Add `bootstrap'. * daemon.am (EXTRA_DIST): Add `nix/sync-with-upstream'.
-rw-r--r--Makefile.am1
-rwxr-xr-xbootstrap16
-rw-r--r--daemon.am1
-rwxr-xr-xnix/sync-with-upstream64
4 files changed, 82 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 7e5be0be2a..147ba1949e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,6 +194,7 @@ EXTRA_DIST = \
srfi/srfi-64.upstream.scm \
tests/test.drv \
build-aux/config.rpath \
+ bootstrap \
release.nix \
$(TESTS)
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000000..e445af2f2c
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Import missing source files and create the build system.
+
+set -e -x
+
+top_srcdir="$PWD"
+export top_srcdir
+
+if [ ! -d nix-upstream ]
+then
+ git submodule init
+fi
+git submodule update
+
+exec autoreconf -vfi
diff --git a/daemon.am b/daemon.am
index e150e54d6b..79e2715c74 100644
--- a/daemon.am
+++ b/daemon.am
@@ -147,6 +147,7 @@ nix/libstore/schema.sql.hh: nix/libstore/schema.sql
(write (get-string-all in) out)))))"
EXTRA_DIST += \
+ nix/sync-with-upstream \
nix/libstore/schema.sql \
nix/AUTHORS \
nix/COPYING
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream
new file mode 100755
index 0000000000..324dcb27c9
--- /dev/null
+++ b/nix/sync-with-upstream
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
+# Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+#
+# This file is part of Guix.
+#
+# 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
+# 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 <http://www.gnu.org/licenses/>.
+
+#
+# Update the local copy of Nix source code needed to build the daemon.
+# Assume GNU Coreutils and Git are available.
+#
+
+top_srcdir="${top_srcdir:-..}"
+
+log()
+{
+ echo "sync-with-upstream: $@" >&2
+}
+
+# checked_in_p FILE
+checked_in_p()
+{
+ ( cd "$top_srcdir" ;
+ git ls-tree HEAD -- "nix/$1" | grep "$1" > /dev/null )
+}
+
+if [ ! -d "$top_srcdir/build-aux" ]
+then
+ log "\`$top_srcdir' is not the valid top-level source directory"
+ exit 1
+fi
+
+set -e
+for upstream_file in `cd "$top_srcdir/nix-upstream/src" ;
+ find . -name \*.c -or -name \*.h -or -name \*.cc -or -name \*.hh \
+ -or -name \*.cpp -or -name \*.hpp -or -name \*.sql`
+do
+ if grep "$upstream_file" "$top_srcdir/daemon.am" > /dev/null
+ then
+ if checked_in_p "$upstream_file"
+ then
+ log "skipping \`$upstream_file', which has a checked-in copy"
+ else
+ ( cd "$top_srcdir/nix-upstream/src" && \
+ cp -v --parents "$upstream_file" ../../nix )
+ fi
+ else
+ log "skipping \`$upstream_file', which is not used"
+ fi
+done
+
+cp -v "$top_srcdir/nix-upstream/"{COPYING,AUTHORS} "$top_srcdir/nix"