X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3b2942e671eadc31ca5cacf4c2965a1cac4edf04..ba7560e26bfa2f5a340545830d46e0437fcb701a:/bootstrap diff --git a/bootstrap b/bootstrap index 0cd3e410..07f2460a 100755 --- a/bootstrap +++ b/bootstrap @@ -29,6 +29,30 @@ nl=' LC_ALL=C export LC_ALL +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth dowloading + them again. + --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. + +If the file .bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} # Configuration. @@ -86,6 +110,13 @@ XGETTEXT_OPTIONS='\\\ # Files we don't want to import. excluded_files= +# 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 @@ -97,7 +128,7 @@ for option do case $option in --help) - echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]" + usage exit;; --gnulib-srcdir=*) GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; @@ -105,12 +136,21 @@ do CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;; --skip-po) SKIP_PO=t;; + --force) + CVS_only_file=;; + --copy) + copy=true;; *) echo >&2 "$0: $option: unknown option" exit 1;; esac done +if test -n "$CVS_only_file" && test ! -r "$CVS_only_file"; then + echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 + exit 1 +fi + echo "$0: Bootstrapping CVS $package..." cleanup_gnulib() { @@ -212,27 +252,102 @@ case $SKIP_PO in fi;; esac +symlink_to_gnulib() +{ + src=$GNULIB_SRCDIR/$1 + dst=${2-$1} + + test -f "$src" && { + 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 + } +} + cp_mark_as_generated() { cp_src=$1 cp_dst=$2 - case $cp_dst in - *.[ch]) c1='/* '; c2=' */';; - *.texi) c1='@c '; c2= ;; - *.m4|*/Make*|Make*) c1='# ' ; c2= ;; - *) c1= ; c2= ;; - esac - if test -z "$c1"; then - cp "$cp_src" "$cp_dst" - return + if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then + symlink_to_gnulib "$cp_dst" + else + case $cp_dst in + *.[ch]) c1='/* '; c2=' */';; + *.texi) c1='@c '; c2= ;; + *.m4|*/Make*|Make*) c1='# ' ; c2= ;; + *) c1= ; c2= ;; + esac + + 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" + } + else + # Copy the file first to get proper permissions if it + # doesn't already exist. Then overwrite the copy. + cp "$cp_src" "$cp_dst-t" && + ( + echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && + echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && + cat "$cp_src" + ) > $cp_dst-t && + if cmp -s "$cp_dst-t" "$cp_dst"; then + rm -f "$cp_dst-t" + else + echo "$0: cp $cp_src $cp_dst # with edits" && + mv -f "$cp_dst-t" "$cp_dst" + fi + fi fi +} - ( - echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" - echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" - cat "$cp_src" - ) >> "$cp_dst" +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() { @@ -245,13 +360,15 @@ slurp() { test "$dir/$file" = "$excluded_file" && continue 2 done if test $file = Makefile.am; then - copied=$copied${sep}gnulib.mk; sep=$nl - echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." && - rm -f $dir/gnulib.mk - sed '/^[^#].*\/intl/s/^/#/' $1/$dir/$file >$dir/gnulib.mk - elif test -r ${2-no/such/dir}/$dir/$file || - grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | - grep -q '^/[^/]*/[0-9]'; then + copied=$copied${sep}gnulib.mk; sep=$nl + remove_intl='/^[^#].*\/intl/s/^/#/' + 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 "$remove_intl" $1/$dir/$file >$dir/gnulib.mk + } + elif { test "${2+set}" = set && test -r $2/$dir/$file; } || + version_controlled_file $dir $file; then echo "$0: $dir/$file overrides $1/$dir/$file" else copied=$copied$sep$file; sep=$nl @@ -267,7 +384,6 @@ slurp() { AC_DEFUN([gl_LOCK_EARLY], []) ' $1/$dir/$file >$dir/$file else - rm -f $dir/$file cp_mark_as_generated $1/$dir/$file $dir/$file fi fi || exit @@ -300,15 +416,14 @@ gnulib_tool_options="\ --m4-base $bt/m4/\ --source-base $bt/lib/\ --tests-base $bt/tests\ + --local-dir gl\ " echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules && slurp $bt || exit for file in $gnulib_files; do - src=$GNULIB_SRCDIR/$file - echo "$0: cp -fp $src $file" && - cp -fp $src $file || exit + symlink_to_gnulib $file || exit done @@ -338,13 +453,11 @@ done # Get some extra files from gnulib, overriding existing files. for file in $gnulib_extra_files; do - src=$GNULIB_SRCDIR/$file case $file in - */INSTALL) dest=.;; - *) dest=$file;; + */INSTALL) dst=INSTALL;; + *) dst=$file;; esac - echo "$0: cp -fp $src $dest" && - cp -fp $src $dest || exit + symlink_to_gnulib $file $dst || exit done @@ -362,13 +475,18 @@ sed ' ' po/Makevars.template >po/Makevars if test -d runtime-po; then - # Likewise for runtime-po/Makevars, except also change a few other parameters. + # Similarly for runtime-po/Makevars, but not quite the same. rm -f runtime-po/Makevars sed ' - s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/ - s/^\(subdir\) *=.*/\1 = runtime-po/ - s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/ - ' runtime-po/Makevars + /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ + /^subdir *=.*/s/=.*/= runtime-po/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} + } + ' runtime-po/Makevars # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)