Chez Scheme: avoid hard-coded paths for utilities in build scripts

These changes facilitate building Chez Scheme in environments where
utility commands are not available at their usual absolute paths,
such as Nix and GNU Guix.

Specific changes:
  - `cc` -> `$(CC)`
  - `/bin/rm` -> `rm`
  - `/bin/ln` -> `ln`
  - `/bin/cp` -> `cp`
  - `/bin/echo` -> `echo`
  - in `makefiles/installsh`, add a case to find `true`
    at an unusual path or as a shell builtin

Related to https://github.com/racket/racket/issues/3707
This commit is contained in:
Philip McGrath 2021-03-02 14:07:52 -05:00 committed by Matthew Flatt
parent 5114fec2c7
commit fdb2ad7892
37 changed files with 97 additions and 85 deletions

View File

@ -2179,3 +2179,14 @@
wininstall/ta6nt.wxs wininstall/ti3nt.wxs wininstall/ta6nt.wxs wininstall/ti3nt.wxs
- newrelease no longer logs as updated files with no actual changes - newrelease no longer logs as updated files with no actual changes
newrelease newrelease
- avoid hard-coded paths for utilities in build scripts
csug/gifs/Makefile csug/math/Makefile examples/Makefile
makefiles/Makefile-csug.in makefiles/Makefile-release_notes.in
makefiles/Mf-install.in makefiles/installsh mats/6.ms mats/Mf-a6fb
mats/Mf-a6le mats/Mf-a6nb mats/Mf-a6ob mats/Mf-a6osx mats/Mf-arm32le
mats/Mf-arm64le mats/Mf-arm64osx mats/Mf-i3fb mats/Mf-i3le mats/Mf-i3nb
mats/Mf-i3ob mats/Mf-i3osx mats/Mf-i3qnx mats/Mf-ppc32le mats/Mf-ppc32osx
mats/unix.ms newrelease pkg/Makefile release_notes/gifs/Makefile
release_notes/math/Makefile s/Mf-base stex/Makefile stex/Mf-stex
stex/gifs/Makefile stex/math/Makefile workarea
zlib/contrib/minizip/Makefile

View File

@ -18,7 +18,7 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log *.aux rm -f $*.dvi $*.log *.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
# translate ps file to gif w/o transparent white background # translate ps file to gif w/o transparent white background
@ -28,7 +28,7 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif > $*.gif ppmtogif > $*.gif
/bin/rm -f $*.dvi $*.log *.aux rm -f $*.dvi $*.log *.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
@ -57,7 +57,7 @@ ghostRightarrow.gif: Rightarrow.tex
giftrans -g '#000000=#ffffff' |\ giftrans -g '#000000=#ffffff' |\
giftopnm |\ giftopnm |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
clean: ; /bin/rm -f *.gif Make.out clean: ; rm -f *.gif Make.out

View File

@ -15,11 +15,11 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log $*.aux rm -f $*.dvi $*.log $*.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
${gifs}: mathmacros ${gifs}: mathmacros
clean: ; /bin/rm -f *.gif Make.out clean: ; rm -f *.gif Make.out

View File

@ -25,4 +25,4 @@ needed: ${obj}
all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme} all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme}
clean: ; /bin/rm -f $(obj) expr.md clean: ; rm -f $(obj) expr.md

View File

@ -30,7 +30,7 @@ install: target
# thrice is not enough when starting from scratch # thrice is not enough when starting from scratch
logcheck1: $(x).thirdrun logcheck1: $(x).thirdrun
@if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\ @if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\
/bin/rm -f $(x).thirdrun ;\ rm -f $(x).thirdrun ;\
$(MAKE) $(x).thirdrun;\ $(MAKE) $(x).thirdrun;\
fi fi
@ -82,7 +82,7 @@ endif
$(texsrc): $(moresrc) $(texsrc): $(moresrc)
$(srcdir)/title.tex $(srcdir)/contents.tex $(srcdir)/bibliography.tex: $(srcdir)/title.tex $(srcdir)/contents.tex $(srcdir)/bibliography.tex:
/bin/rm -f $*.tex rm -f $*.tex
echo "%%% DO NOT EDIT THIS FILE" > $*.tex echo "%%% DO NOT EDIT THIS FILE" > $*.tex
echo "%%% Edit the .stex version instead" >> $*.tex echo "%%% Edit the .stex version instead" >> $*.tex
echo "" >> $*.tex echo "" >> $*.tex
@ -174,7 +174,7 @@ code: $(stexsrc)
echo '(load "code" pretty-print)' | $(Scheme) -q echo '(load "code" pretty-print)' | $(Scheme) -q
$(x).clean: $(x).clean:
-/bin/rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ -rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\
$(x).prethirdrun $(x).ans\ $(x).prethirdrun $(x).ans\
$(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\ $(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\
tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\ tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\

View File

@ -38,7 +38,7 @@ install: $x.pdf $x.html
$(INSTALL) -m 2755 -d $(installdir)/gifs $(INSTALL) -m 2755 -d $(installdir)/gifs
$(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs $(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs
$(INSTALL) -m 2755 -d $(installdir)/math $(INSTALL) -m 2755 -d $(installdir)/math
-/bin/rm -rf $(installdir)/$(mathdir) -rm -rf $(installdir)/$(mathdir)
$(INSTALL) -m 2755 -d $(installdir)/$(mathdir) $(INSTALL) -m 2755 -d $(installdir)/$(mathdir)
if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi

View File

@ -114,12 +114,12 @@ bininstall: ${Bin}
libbininstall: ${LibBin} libbininstall: ${LibBin}
$I -m 444 ${PetiteBoot} ${LibBin}/petite.boot $I -m 444 ${PetiteBoot} ${LibBin}/petite.boot
if [ "${InstallPetiteName}" != "petite" ]; then\ if [ "${InstallPetiteName}" != "petite" ]; then\
/bin/rm -f ${LibBin}/${InstallPetiteName}.boot;\ rm -f ${LibBin}/${InstallPetiteName}.boot;\
ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\ ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\
fi fi
$I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\ $I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\
if [ "${InstallSchemeName}" != "scheme" ]; then\ if [ "${InstallSchemeName}" != "scheme" ]; then\
/bin/rm -f ${LibBin}/${InstallSchemeName}.boot;\ rm -f ${LibBin}/${InstallSchemeName}.boot;\
ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\ ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\
fi fi
ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot; ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot;

View File

@ -1,7 +1,8 @@
#! /bin/sh #! /bin/sh
if [ -x /bin/true ]; then TRUE=/bin/true; if [ -x /bin/true ]; then TRUE=/bin/true;
elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true; elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true;
else echo "Can't find /bin/true or /usr/bin/true" ; exit 1; elif command -v true &> /dev/null; then TRUE=true;
else echo "Can't find /bin/true or /usr/bin/true and no true command" ; exit 1;
fi fi
while ${TRUE} ; do while ${TRUE} ; do

View File

@ -2756,7 +2756,7 @@
(begin (begin
(system "ln -s ../examples .") (system "ln -s ../examples .")
(load "examples/fatfib.ss" compile) (load "examples/fatfib.ss" compile)
(system "/bin/rm examples") (system "rm examples")
#t)) #t))
(or (windows?) (embedded?) (or (windows?) (embedded?)
(equal? (equal?

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m64 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -m64 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -8,7 +8,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -21,7 +21,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -8,7 +8,7 @@ fobj = foreign1.so
include Mf-base include Mf-base
foreign1.so: ${fsrc} ../boot/$m/scheme.h foreign1.so: ${fsrc} ../boot/$m/scheme.h
cc -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
cat_flush: cat_flush.c cat_flush: cat_flush.c
cc -o cat_flush cat_flush.c $(CC) -o cat_flush cat_flush.c

View File

@ -72,8 +72,8 @@
(mat system (mat system
(eqv? (with-output-to-file "testfile.ss" void '(replace)) (void)) (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void))
(begin (begin
(system (format "~:[~;/pkg~]/bin/rm testfile.ss" (embedded?))) (system (format "~:[~;/pkg~]rm testfile.ss" (embedded?)))
(system (format "~:[~;/pkg~]/bin/echo hello > testfile.ss" (embedded?))) (system (format "~:[~;/pkg~]echo hello > testfile.ss" (embedded?)))
(let ([p (open-input-file "testfile.ss")]) (let ([p (open-input-file "testfile.ss")])
(and (eq? (read p) 'hello) (and (eq? (read p) 'hello)
(begin (close-input-port p) #t)))) (begin (close-input-port p) #t))))

View File

@ -75,13 +75,13 @@ if ($status != 0) exit 1
cd $W cd $W
/bin/rm -f BUILDING rm -f BUILDING
sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \
-e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \
../BUILDING > BUILDING ../BUILDING > BUILDING
set maybeupdatedfiles = ($maybeupdatedfiles BUILDING) set maybeupdatedfiles = ($maybeupdatedfiles BUILDING)
/bin/rm -f NOTICE rm -f NOTICE
sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \
-e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \
../NOTICE > NOTICE ../NOTICE > NOTICE
@ -92,19 +92,19 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef
sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in
set maybeupdatedfiles = ($maybeupdatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in) set maybeupdatedfiles = ($maybeupdatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in)
/bin/rm scheme.1.in rm scheme.1.in
sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \ sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \
-e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \ -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \
../scheme.1.in > scheme.1.in ../scheme.1.in > scheme.1.in
set maybeupdatedfiles = ($maybeupdatedfiles scheme.1.in) set maybeupdatedfiles = ($maybeupdatedfiles scheme.1.in)
/bin/rm -f c/Makefile.{,t}{i3,a6}nt rm -f c/Makefile.{,t}{i3,a6}nt
foreach fn (c/Makefile.{,t}{a6,i3}nt) foreach fn (c/Makefile.{,t}{a6,i3}nt)
set maybeupdatedfiles = ($maybeupdatedfiles $fn) set maybeupdatedfiles = ($maybeupdatedfiles $fn)
sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn
end end
/bin/rm -f mats/Mf-{,t}{i3,a6}nt rm -f mats/Mf-{,t}{i3,a6}nt
foreach fn (mats/Mf-{,t}{a6,i3}nt) foreach fn (mats/Mf-{,t}{a6,i3}nt)
set maybeupdatedfiles = ($maybeupdatedfiles $fn) set maybeupdatedfiles = ($maybeupdatedfiles $fn)
sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn
@ -123,11 +123,11 @@ sed -e "s/FILEVERSION .*/FILEVERSION $RCVERSION/"\
-e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc -e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc
set maybeupdatedfiles = ($maybeupdatedfiles c/scheme.rc) set maybeupdatedfiles = ($maybeupdatedfiles c/scheme.rc)
/bin/rm -f s/7.ss rm -f s/7.ss
sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss
set maybeupdatedfiles = ($maybeupdatedfiles s/7.ss) set maybeupdatedfiles = ($maybeupdatedfiles s/7.ss)
/bin/rm -f s/cmacros.ss rm -f s/cmacros.ss
set VNUM = `printf "%04x%02x%02x" $MR $mR $bR` set VNUM = `printf "%04x%02x%02x" $MR $mR $bR`
sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss
set maybeupdatedfiles = ($maybeupdatedfiles s/cmacros.ss) set maybeupdatedfiles = ($maybeupdatedfiles s/cmacros.ss)
@ -145,17 +145,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*<br>/Revised\1for Chez Schem
../csug/csug.stex > csug/csug.stex ../csug/csug.stex > csug/csug.stex
set maybeupdatedfiles = ($maybeupdatedfiles csug/copyright.stex csug/csug.stex) set maybeupdatedfiles = ($maybeupdatedfiles csug/copyright.stex csug/csug.stex)
/bin/rm bintar/Makefile rm bintar/Makefile
sed -e "s/^version = .*/version = $R/" \ sed -e "s/^version = .*/version = $R/" \
-e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \ -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \
../bintar/Makefile > bintar/Makefile ../bintar/Makefile > bintar/Makefile
set maybeupdatedfiles = ($maybeupdatedfiles bintar/Makefile) set maybeupdatedfiles = ($maybeupdatedfiles bintar/Makefile)
/bin/rm rpm/Makefile rm rpm/Makefile
sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile
set maybeupdatedfiles = ($maybeupdatedfiles rpm/Makefile) set maybeupdatedfiles = ($maybeupdatedfiles rpm/Makefile)
/bin/rm pkg/Makefile rm pkg/Makefile
sed -e "s/^version = .*/version = $R/" \ sed -e "s/^version = .*/version = $R/" \
-e "s/&copy; .* Cisco Systems/\&copy; `date +%Y` Cisco Systems/" \ -e "s/&copy; .* Cisco Systems/\&copy; `date +%Y` Cisco Systems/" \
../pkg/Makefile > pkg/Makefile ../pkg/Makefile > pkg/Makefile
@ -174,7 +174,7 @@ foreach x ($maybeupdatedfiles)
cmp -s ../$x $x || set updatedfiles = ($updatedfiles $x) cmp -s ../$x $x || set updatedfiles = ($updatedfiles $x)
end end
/bin/rm LOG rm LOG
cat ../LOG > LOG cat ../LOG > LOG
echo "" >> LOG echo "" >> LOG
echo "$R changes:" >> LOG echo "$R changes:" >> LOG

View File

@ -39,7 +39,7 @@ $(PKG): $(BUILDROOT)/$(PKG)
--package-path $(BUILDROOT)\ --package-path $(BUILDROOT)\
$(PKG) $(PKG)
sudo chown $(DOTUSER):$(DOTGROUP) $(PKG) sudo chown $(DOTUSER):$(DOTGROUP) $(PKG)
sudo /bin/rm -rf $(RELEASE) $(BUILDROOT) sudo rm -rf $(RELEASE) $(BUILDROOT)
$(BUILDROOT)/$(PKG): $(PKGCONTENT) $(BUILDROOT)/$(PKG): $(PKGCONTENT)
sudo /usr/bin/pkgbuild\ sudo /usr/bin/pkgbuild\

View File

@ -15,7 +15,7 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log *.aux rm -f $*.dvi $*.log *.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex
giftrans -g '#000000=#ffffff' |\ giftrans -g '#000000=#ffffff' |\
giftopnm |\ giftopnm |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
clean: ; /bin/rm -f *.gif Make.out clean: ; rm -f *.gif Make.out

View File

@ -16,11 +16,11 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log $*.aux rm -f $*.dvi $*.log $*.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
${gifs}: mathmacros ${gifs}: mathmacros
clean: ; /bin/rm -f *.gif Make.out clean: ; rm -f *.gif Make.out

View File

@ -214,7 +214,7 @@ profiled:
$(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot $(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot
$(MAKE) prettyclean $(MAKE) prettyclean
$(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot" $(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot"
/bin/rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot
$(MAKE) prettyclean $(MAKE) prettyclean
$(MAKE) all loadspd=t loadbpd=t $(MAKE) all loadspd=t loadbpd=t

View File

@ -49,10 +49,10 @@ install: $(exec)
(umask 022; sed -e 's;include ~/stex/Mf-stex;include $(LIB)/Mf-stex;' Makefile.template > $(LIB)/Makefile.template) (umask 022; sed -e 's;include ~/stex/Mf-stex;include $(LIB)/Mf-stex;' Makefile.template > $(LIB)/Makefile.template)
uninstall: uninstall:
/bin/rm -rf $(LIB) rm -rf $(LIB)
clean: clean:
/bin/rm -f Make.out rm -f Make.out
distclean: clean distclean: clean
/bin/rm -rf $m rm -rf $m

View File

@ -139,12 +139,12 @@ $(x).spell: $(x).bbl $(x).tex
latexspell $(x).tex latexspell $(x).tex
clean: $(x).clean clean: $(x).clean
-/bin/rm -f *.log *.dvi *.aux *.out *.toc *.tmp *.idx *.ilg *.ind *.blg *.bbl *.rfm *.sfm *.firstrun *.secondrun *.thirdrun -rm -f *.log *.dvi *.aux *.out *.toc *.tmp *.idx *.ilg *.ind *.blg *.bbl *.rfm *.sfm *.firstrun *.secondrun *.thirdrun
-/bin/rm -f *.haux *.htoc *.hidx *.hfirstrun *.hsecondrun *.hthirdrun *.mathrun -rm -f *.haux *.htoc *.hidx *.hfirstrun *.hsecondrun *.hthirdrun *.mathrun
-/bin/rm -f *.tex -rm -f *.tex
reallyclean: clean $(x).reallyclean reallyclean: clean $(x).reallyclean
-/bin/rm -f *.html *.ps *.pdf *.png -rm -f *.html *.ps *.pdf *.png
reallyreallyclean: reallyclean $(x).reallyreallyclean reallyreallyclean: reallyclean $(x).reallyreallyclean
-/bin/rm -rf $(mathdir) -rm -rf $(mathdir)

View File

@ -15,7 +15,7 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log *.aux rm -f $*.dvi $*.log *.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex
giftrans -g '#000000=#ffffff' |\ giftrans -g '#000000=#ffffff' |\
giftopnm |\ giftopnm |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
clean: clean:

View File

@ -16,11 +16,11 @@ density=-r90x90
${density} - |\ ${density} - |\
pnmcrop |\ pnmcrop |\
ppmtogif -transparent white > $*.gif ppmtogif -transparent white > $*.gif
/bin/rm -f $*.dvi $*.log $*.aux rm -f $*.dvi $*.log $*.aux
test -f $*.gif && chmod 644 $*.gif test -f $*.gif && chmod 644 $*.gif
all: ${gifs} all: ${gifs}
${gifs}: mathmacros ${gifs}: mathmacros
clean: ; /bin/rm -f *.gif Make.out clean: ; rm -f *.gif Make.out

View File

@ -130,9 +130,9 @@ esac
if [ "$OS" = "Windows_NT" ] if [ "$OS" = "Windows_NT" ]
then then
ln="/bin/cp -R" ln="cp -R"
else else
ln="/bin/ln -s" ln="ln -s"
fi fi
# This shell script creates a workarea for local modifications to the # This shell script creates a workarea for local modifications to the
@ -183,7 +183,7 @@ workln()
forceworkln() forceworkln()
{ {
if [ ! -e $2 ] ; then if [ ! -e $2 ] ; then
/bin/ln -s "$1" $2 2> /dev/null ln -s "$1" $2 2> /dev/null
fi fi
} }
@ -278,13 +278,13 @@ linkeach unicode
# deep copy submodules where builds occur so changes don't propagate through symlinks # deep copy submodules where builds occur so changes don't propagate through symlinks
for dir in `echo zlib` ; do for dir in `echo zlib` ; do
if [ ! -e $W/$dir ] ; then if [ ! -e $W/$dir ] ; then
/bin/cp -R "$srcdir"/$dir $W/$dir cp -R "$srcdir"/$dir $W/$dir
fi fi
done done
for dir in `echo lz4` ; do for dir in `echo lz4` ; do
if [ ! -e $W/$dir ] ; then if [ ! -e $W/$dir ] ; then
/bin/cp -R "$srcdir"/$dir $W/$dir cp -R "$srcdir"/$dir $W/$dir
fi fi
done done

View File

@ -22,4 +22,4 @@ test: miniunz minizip
./miniunz test.zip ./miniunz test.zip
clean: clean:
/bin/rm -f *.o *~ minizip miniunz rm -f *.o *~ minizip miniunz