X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e3ddc1e355923e9565e1ef66230389c7aa2954a3..c1d19e10c32844d17122b473840752003521d21b:/bootstrap diff --git a/bootstrap b/bootstrap index a9124017..33825b7a 100755 --- a/bootstrap +++ b/bootstrap @@ -2,7 +2,7 @@ # Bootstrap this package from CVS. -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ export LC_ALL usage() { echo >&2 "\ Usage: $0 [OPTION]... -Bootstrap this package from the CVS sources. +Bootstrap this package from the checked-out sources. Options: --gnulib-srcdir=DIRNAME Specify the local directory where gnulib @@ -40,7 +40,9 @@ Options: have gnulib sources on your machine, and do not want to waste your bandwidth dowloading them again. - --force Bootstrap even if the sources didn't come from CVS. + --copy Copy files instead of creating symbolic links. + --force Attempt to bootstrap even if the sources seem + not to have been checked out. --skip-po Do not download po files. --cvs-user=USERNAME Set the CVS username to be used when accessing the gnulib repository. @@ -85,6 +87,7 @@ package=`sed -n "$extract_package_name" configure.ac` || exit # Extra files from gnulib, which override files from other sources. gnulib_extra_files=' + build-aux/announce-gen build-aux/install-sh build-aux/missing build-aux/mdate-sh @@ -108,9 +111,12 @@ XGETTEXT_OPTIONS='\\\ # Files we don't want to import. excluded_files= -# File that should exist with CVS checkout, but not with -# the distributed version. -CVS_only_file=CVS +# File that should exist in the top directory of a checked out hierarchy, +# but not in a distribution tarball. +CVS_only_file=README-cvs + +# Whether to use copies instead of symlinks. +copy=false # Override the default configuration, if necessary. test -r bootstrap.conf && . ./bootstrap.conf @@ -133,6 +139,8 @@ do SKIP_PO=t;; --force) CVS_only_file=;; + --copy) + copy=true;; *) echo >&2 "$0: $option: unknown option" exit 1;; @@ -140,7 +148,7 @@ do done if test -n "$CVS_only_file" && test ! -r "$CVS_only_file"; then - echo "$0: Bootstrapping from a non-CVS distribution is a bit risky." >&2 + echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 exit 1 fi @@ -249,29 +257,43 @@ symlink_to_gnulib() { src=$GNULIB_SRCDIR/$1 dst=${2-$1} - dot_dots= - - case $src in - /*) ;; - *) - case /$dst/ in - *//* | */../* | */./* | /*/*/*/*/*/) - echo >&2 "$0: invalid symlink calculation: $src -> $dst" - exit 1;; - /*/*/*/*/) dot_dots=../../../;; - /*/*/*/) dot_dots=../../;; - /*/*/) dot_dots=../;; - esac;; - esac test -f "$src" && { - test -h "$dst" && - src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && - dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && - test "$src_i" = "$dst_i" || { - echo "$0: ln -fs $dot_dots$src $dst" && - ln -fs "$dot_dots$src" "$dst" - } + if $copy; then + { + test ! -h "$dst" || { + echo "$0: rm -f $dst" && + rm -f "$dst" + } + } && + test -f "$dst" && + cmp -s "$src" "$dst" || { + echo "$0: cp -fp $src $dst" && + cp -fp "$src" "$dst" + } + else + test -h "$dst" && + src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && + dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && + test "$src_i" = "$dst_i" || { + dot_dots= + case $src in + /*) ;; + *) + case /$dst/ in + *//* | */../* | */./* | /*/*/*/*/*/) + echo >&2 "$0: invalid symlink calculation: $src -> $dst" + exit 1;; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; + esac;; + esac + + echo "$0: ln -fs $dot_dots$src $dst" && + ln -fs "$dot_dots$src" "$dst" + } + fi } } @@ -293,7 +315,7 @@ cp_mark_as_generated() if test -z "$c1"; then cmp -s "$cp_src" "$cp_dst" || { echo "$0: cp -f $cp_src $cp_dst" && - cp -f "$cp_src" "$cp_dst" + sed 's/\.#bootmp\///g' "$cp_src" > "$cp_dst" } else # Copy the file first to get proper permissions if it @@ -302,7 +324,7 @@ cp_mark_as_generated() ( echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && - cat "$cp_src" + sed 's/\.#bootmp\///g' "$cp_src" ) > $cp_dst-t && if cmp -s "$cp_dst-t" "$cp_dst"; then rm -f "$cp_dst-t" @@ -314,6 +336,21 @@ cp_mark_as_generated() fi } +version_controlled_file() { + dir=$1 + file=$2 + found=no + if test -d CVS; then + grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null && found=yes + elif test -d .git; then + git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes + else + echo "$0: no version control for $dir/$file?" >&2 + fi + test $found = yes +} + slurp() { for dir in . `(cd $1 && find * -type d -print)`; do copied= @@ -326,17 +363,13 @@ slurp() { if test $file = Makefile.am; then copied=$copied${sep}gnulib.mk; sep=$nl remove_intl='/^[^#].*\/intl/s/^/#/' - no_dep=no-dependencies - remove_no_dep="/^AUTOMAKE_OPTIONS =.* $no_dep/s/ $no_dep//" - sed_xform="$remove_intl;$remove_no_dep" - sed "$sed_xform" $1/$dir/$file | cmp -s - $dir/gnulib.mk || { + sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || { echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." && rm -f $dir/gnulib.mk && - sed "$sed_xform" $1/$dir/$file >$dir/gnulib.mk + sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk } elif { test "${2+set}" = set && test -r $2/$dir/$file; } || - grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | - grep -q '^/[^/]*/[0-9]'; then + version_controlled_file $dir $file; then echo "$0: $dir/$file overrides $1/$dir/$file" else copied=$copied$sep$file; sep=$nl @@ -357,11 +390,13 @@ slurp() { fi || exit done - ig=$dir/.cvsignore - if test -n "$copied" && test -f $ig; then - echo "$copied" | sort -u - $ig | cmp -s - $ig || - echo "$copied" | sort -u - $ig -o $ig || exit - fi + for dot_ig in .cvsignore .gitignore; do + ig=$dir/$dot_ig + if test -n "$copied" && test -f $ig; then + echo "$copied" | sort -u - $ig | cmp -s - $ig || + echo "$copied" | sort -u - $ig -o $ig || exit + fi + done done }