diff --git a/checkin_notes b/checkin_notes index 32c8b173aa..3b999e7c83 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7916,3 +7916,13 @@ David 18 Sept 2009 client/ pers_file_xfer.cpp + +David 18 Sept 2009 + - Unix build: delete some unused files + + removed: + export-tarball + mkinstalldirs + fix-repository-20040202 + nightly-tarball + install-sh diff --git a/export-tarball b/export-tarball deleted file mode 100755 index 2956a27cde..0000000000 --- a/export-tarball +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -## $Id$ - -# Create a tarball from CVS or SVN export. - -# example usage: - -# CVSROOT=/usr/local/warez/cvsroot \ -# CHECKOUT='cvs export -r HEAD boinc' \ -# DIR='boinc' \ -# FILENAME_TGZ="boinc-cvs-TODAY.tar.gz" \ -# FILENAME_ZIP="boinc-cvs-TODAY.zip" \ -# DESTINATION="/disks/milkyway/a/users/anderson/boinc/doc/source/nightly/" \ -# /disks/philmor/a/users/quarl/bin/export-tarball - -# CHECKOUT='svn export http://svn.quarl.org/repos/coursesurvey/trunk/coursesurvey' \ -# DIR=coursesurvey \ -# FILENAME_TGZ="coursesurvey-rSVNREVISION.tar.gz" \ -# FILENAME_ZIP="coursesurvey-rSVNREVISION.zip" \ -# DESTINATION="ftp://upload.sourceforge.net/incoming" \ -# /home/quarl/bin/export-tarball - -# Note: requires GNU tar (if you want to use other tar need to separate gzip -# step) - -die() -{ - echo "ERROR in $0 on `hostname`:" - echo "$1" - [ "$2" ] && cat "$2" - exit 1 -} - -reqeval() -{ - test -n "$VERBOSE" && echo "Executing: $1" - eval "$1" || die "error executing: $1" -} - -reqeval_log() -{ - test -n "$VERBOSE" && echo "Executing: $1" - eval "$1" > $2 2>&1 || die "error executing: $1" $2 -} - -upload() -{ - if echo "$DESTINATION" | grep '^ftp://' >/dev/null ; then - ftp_upload "$1" - else - file_upload "$1" - fi -} - -file_upload() -{ - test -n "$VERBOSE" && echo "Putting $1 in $DESTINATION" - reqeval "mv $1 $DESTINATION" -} - -ftp_upload() -{ - SERVER=`echo "$DESTINATION" | sed 's,^ftp://,,' | sed 's,/.*,,'` - DIRECTORY=`echo "$DESTINATION" | sed 's,^ftp://[^/]*',,` - - test -n "$VERBOSE" && echo "Uploading $1 to ftp site $SERVER $DIRECTORY" - reqeval "ncftpput $SERVER $DIRECTORY $1" -} - -if [ -z "$USER" ]; then - USER=$LOGNAME -fi - -if ttyo 2>/dev/null ; then - VERBOSE=1 -fi - -test -n "$CHECKOUT" || die "No CHECKOUT specified" -test -n "$DIR" || die "No DIR specified" -test -n "$FILENAME_TGZ" -o -n "$FILENAME_ZIP" || die "No FILENAME_TGZ nor FILENAME_ZIP specified" -test -n "$DESTINATION" || die "No DESTINATION specified" - -TMPDIR=/tmp/export-tarball-$$ - -reqeval "rm -rf $TMPDIR" -reqeval "mkdir -p $TMPDIR" -reqeval "cd $TMPDIR" -reqeval_log "$CHECKOUT" checkout.log - -test -d "$DIR" || die "No DIR $DIR after CHECKOUT" - -TODAY=`date +%Y-%m-%d` -# SVNREVISION=`svnlastchangedversion "$DIR" 2>/dev/null` - -FILENAME_TGZ=`echo "$FILENAME_TGZ" | sed "s/TODAY/$TODAY/"` -FILENAME_ZIP=`echo "$FILENAME_ZIP" | sed "s/TODAY/$TODAY/"` - -# FILENAME_TGZ=`echo "$FILENAME_TGZ" | sed "s/SVNREVISION/$SVNREVISION/"` -# FILENAME_ZIP=`echo "$FILENAME_ZIP" | sed "s/SVNREVISION/$SVNREVISION/"` - -test -n "$FILENAME_TGZ" && reqeval_log "tar czvf $FILENAME_TGZ $DIR" tar.log -test -n "$FILENAME_ZIP" && reqeval_log "zip -r9 $FILENAME_ZIP $DIR" zip.log -upload $FILENAME_TGZ -upload $FILENAME_ZIP - -reqeval "rm -rf $TMPDIR" diff --git a/fix-repository-20040202 b/fix-repository-20040202 deleted file mode 100755 index b37dd42cf7..0000000000 --- a/fix-repository-20040202 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - - -# on 2004-02-02 we made a repository change that requires you to run this script in any working copies checked out before then (otherwise you will continue to see "html_user not found" messages - - -cat CVS/Entries | grep -v D/html_user | grep -v D/html_ops | grep -v D/MacBoinc > CVS/Entries - diff --git a/install-sh b/install-sh deleted file mode 100755 index 0ec27bcd48..0000000000 --- a/install-sh +++ /dev/null @@ -1,294 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift - - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi - - pathcomp=$pathcomp/ -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. - - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - -fi && - -# The final little trick to "correctly" pass the exit status to the exit trap. - -{ - (exit 0); exit -} diff --git a/mkinstalldirs b/mkinstalldirs deleted file mode 100755 index d2d5f21b61..0000000000 --- a/mkinstalldirs +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here diff --git a/nightly-tarball b/nightly-tarball deleted file mode 100755 index 71e345f839..0000000000 --- a/nightly-tarball +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -## $Id$ - -# Create a nightly tarball from CVS export - -# need to set PATH because we might be running from a cron job. -# on our Solaris servers, cvs is in /opt/misc/bin - -cd $HOME/boinc - -if [ -d /disks/asimov ]; then - PATH=/disks/philmor/a/users/quarl/local/Node-SOLARIS/bin:/disks/philmor/a/users/quarl/local/bin:/disks/philmor/a/users/quarl/bin:/usr/ccs/bin:/usr/local/cygnus:/disks/milkyway/a/users/anderson/seti/bin:/opt/misc/bin:/usr/ucb:/usr/bin:/usr/local/bin - export PATH -fi - - CVS_RSH=/usr/bin/ssh \ - CVSROOT=:ext:boincadm@milkyway.ssl.berkeley.edu:/usr/local/warez/cvsroot \ - CHECKOUT='cvs export -r HEAD boinc && (cd boinc && ./_autosetup)' \ - DIR=boinc \ - FILENAME_TGZ="boinc-cvs-TODAY.tar.gz" \ - FILENAME_ZIP="boinc-cvs-TODAY.zip" \ - DESTINATION="/home/boincadm/boinc/doc/source/nightly/" \ - ./export-tarball - - CVS_RSH=/usr/bin/ssh \ - CVSROOT=:ext:boincadm@milkyway.ssl.berkeley.edu:/usr/local/warez/cvsroot \ - CHECKOUT='cvs export -r stable boinc && (cd boinc && ./_autosetup)' \ - DIR=boinc \ - FILENAME_TGZ="boinc_stable-cvs-TODAY.tar.gz" \ - FILENAME_ZIP="boinc_stable-cvs-TODAY.zip" \ - DESTINATION="/home/boincadm/boinc/doc/source/nightly/" \ - ./export-tarball