Browse Source

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'.
gn-latest-20200428
Ludovic Courtès 8 years ago
parent
commit
b49ffe2d67
4 changed files with 82 additions and 0 deletions
  1. +1
    -0
      Makefile.am
  2. +16
    -0
      bootstrap
  3. +1
    -0
      daemon.am
  4. +64
    -0
      nix/sync-with-upstream

+ 1
- 0
Makefile.am View File

@@ -194,6 +194,7 @@ EXTRA_DIST = \
srfi/srfi-64.upstream.scm \
tests/test.drv \
build-aux/config.rpath \
bootstrap \
release.nix \
$(TESTS)



+ 16
- 0
bootstrap View File

@@ -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

+ 1
- 0
daemon.am View File

@@ -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

+ 64
- 0
nix/sync-with-upstream View File

@@ -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"

Loading…
Cancel
Save