Mercurial > jwe > octave
changeset 24090:04e17bfe7a00
use move-if-change from gnulib via symlink instead of copying the file
* bootstrap.conf (gnulib_files): New variable, include build-aux/move-if-change.
* build-aux/move-if-change: Delete.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 22 Sep 2017 18:59:22 -0700 |
| parents | 1909078be6c7 |
| children | 19d8d99152e9 |
| files | bootstrap.conf build-aux/move-if-change |
| diffstat | 2 files changed, 5 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap.conf Thu Sep 21 23:27:13 2017 -0700 +++ b/bootstrap.conf Fri Sep 22 18:59:22 2017 -0700 @@ -100,6 +100,11 @@ waitpid " +# Additional gnulib files and scripts used by Octave's buildsystem. +gnulib_files=" + build-aux/move-if-change +" + # Additional xgettext options to use. Use "\\\newline" to break lines. XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ --from-code=UTF-8\\\
--- a/build-aux/move-if-change Thu Sep 21 23:27:13 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -#!/bin/sh -# Like mv $1 $2, but if the files are the same, just delete $1. -# Status is zero if successful, nonzero otherwise. - -VERSION='2016-01-11 22:04'; # UTC -# The definition above must lie within the first 8 lines in order -# for the Emacs time-stamp write hook (at end) to update it. -# If you change this file with Emacs, please let the write hook -# do its job. Otherwise, update this string manually. - -# Copyright (C) 2002-2017 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. - -usage="usage: $0 SOURCE DEST" - -help="$usage - or: $0 OPTION -If SOURCE is different than DEST, then move it to DEST; else remove SOURCE. - - --help display this help and exit - --version output version information and exit - -The variable CMPPROG can be used to specify an alternative to 'cmp'. - -Report bugs to <bug-gnulib@gnu.org>." - -version=`expr "$VERSION" : '\([^ ]*\)'` -version="move-if-change (gnulib) $version -Copyright (C) 2011 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law." - -cmpprog=${CMPPROG-cmp} - -for arg -do - case $arg in - --help | --hel | --he | --h) - exec echo "$help" ;; - --version | --versio | --versi | --vers | --ver | --ve | --v) - exec echo "$version" ;; - --) - shift - break ;; - -*) - echo "$0: invalid option: $arg" >&2 - exit 1 ;; - *) - break ;; - esac -done - -test $# -eq 2 || { echo "$0: $usage" >&2; exit 1; } - -if test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null; then - rm -f -- "$1" -else - if mv -f -- "$1" "$2"; then :; else - # Ignore failure due to a concurrent move-if-change. - test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null && rm -f -- "$1" - fi -fi - -## Local Variables: -## eval: (add-hook 'write-file-hooks 'time-stamp) -## time-stamp-start: "VERSION='" -## time-stamp-format: "%:y-%02m-%02d %02H:%02M" -## time-stamp-time-zone: "UTC0" -## time-stamp-end: "'; # UTC" -## End: