--- ray/makeall 2003/04/29 15:27:49 1.4 +++ ray/makeall 2005/09/21 17:17:23 1.21 @@ -1,9 +1,6 @@ #!/bin/csh -f -# RCSid $Id: makeall,v 1.4 2003/04/29 15:27:49 greg Exp $ +# RCSid $Id: makeall,v 1.21 2005/09/21 17:17:23 greg Exp $ # -#Added macosX 2001-04-11 by Jean Brange -#Deleted obsolete systems 2001-04-18 by Greg Ward -# # Make all the Radiance programs # if ( $#argv < 1 ) then @@ -14,17 +11,18 @@ if ( $#argv < 1 ) then endif if ( "$1" == library ) then source installib + cp -f src/*/*.{cal,tab,hex} $ldir echo "" echo "Set the environment variable RAYPATH=.:$ldir" echo 'For C-shell users, put the following into ~/.cshrc' echo " setenv RAYPATH .:$ldir" - echo 'For Bourne shell users, put the following into $HOME/profile' + echo 'For Bourne shell users, put the following into $HOME/.profile' echo " RAYPATH=.:$ldir" echo " export RAYPATH" echo "" exit 0 endif -set srcdirs=( common meta cv gen ot rt px hd util cal ) +set srcdirs=( common rt meta cv gen ot px hd util cal ) if ( "$1" == install ) then cat << _EOF_ @@ -74,55 +72,29 @@ if ( ! -d $idir/dev ) then goto again1 endif endif +set inpath=0 +foreach i ( $path ) + if ( "$i" == "$idir" ) then + set inpath=1 + break + endif +end set rmake=$idir/rmake if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then goto gotrmake endif set newrmake -goto skiplicense -cat << _EOF_ - - RADIANCE LICENSE AGREEMENT - -Radiance is a registered copyright of The Regents of the University of -California ("The Regents"). The Regents grant to you a nonexclusive, -nontransferable license ("License") to use Radiance source code without -fee. You may not sell or distribute Radiance to others without the -prior express written permission of The Regents. You may compile and -use this software on any machines to which you have personal access, -and may share its use with others who have access to the same machines. - -NEITHER THE UNITED STATES NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY -OF THEIR EMPLOYEES, MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY -LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS -OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS -THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS. By downloading, using -or copying this software, you agree to abide by the intellectual property laws -and all other applicable laws of the United States, and by the terms of this -License Agreement. Ownership of the software shall remain solely in The -Regents. The Regents shall have the right to terminate this License -immediately by written notice upon your breach of, or noncompliance with, any -of its terms. You shall be liable for any infringement or damages resulting -from your failure to abide by the terms of this License Agreement. - -_EOF_ +more src/common/copyright.h echo -n "Do you understand and accept the terms of this agreement [n]? " set ans="$<" if ( "$ans" !~ [yY]* ) exit -echo -n "Are you a new Radiance user or with a new address [y]? " -set ans="$<" -if ( "$ans" !~ [nN]* ) then - csh -f newuser -else - echo `cat src/rt/VERSION` compiled by `whoami` | mail radiance-request@floyd.lbl.gov -endif -skiplicense: set special= set arch= set opt= set mach= set compat= set extras= +set esuffix= cat << _EOF_ Please select your system type from the following list: @@ -133,9 +105,10 @@ Please select your system type from the following list 4) AIX (RS/6000) 5) BSDI BSD/386 6) Linux - 7) MacOS X + 7) MacOS X 8) FreeBSD - 9) Other + 9) Cygwin + 10) Other _EOF_ echo -n "Choice? " @@ -144,13 +117,13 @@ switch ("$arch") case 1: # SPARC Station set arch=sun set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO" - set opt="-O -DSPEED=80" - set compat="bmalloc.o strcmp.o getpagesize.o" + set opt="-O" + set compat="strcmp.o" breaksw case 2: # HP workstation set mach="" - set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE" - set compat="bmalloc.o getpagesize.o strcmp.o" + set opt="-O -Aa -D_HPUX_SOURCE" + set compat="strcmp.o" set arch=hpux breaksw case 3: # Silicon Graphics @@ -158,66 +131,75 @@ case 3: # Silicon Graphics switch (`uname -r`) case 3.*: set mach="-noprototypes" - set opt="-O -DSPEED=80" + set opt="-O" set special="sgi" - set compat="malloc.o strcmp.o" + set compat="strcmp.o" breaksw case 4.*: set mach="" - set opt="-O2 -DSPEED=100" - set compat="malloc.o strcmp.o" + set opt="-O2" + set compat="strcmp.o" set extras='"MLIB=-lfastm -lm"' breaksw default: # 5.x or later ln -s `which wish` $idir/wish4.0 set path=($idir $path) set mach="-w" - set opt="-O2 -DSPEED=200" + set opt="-O2" set special="ogl" - set compat="bmalloc.o strcmp.o" + set compat="strcmp.o" breaksw endsw breaksw case 4: # AIX - set mach="-Dvoid=char -D_NO_PROTO -DINCL_SEL_H" set opt="-O" - set compat="bmalloc.o erf.o" + set compat="erf.o strcmp.o" + set arch=PowerPC breaksw case 5: # BSDI BSD/386 set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include" - set opt="-O -DSPEED=100" + set opt="-O" set arch=IBMPC - set compat="malloc.o erf.o strcmp.o" + set compat="erf.o strcmp.o" breaksw case 6: # Linux - set mach="-Dlinux -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO" - set opt="-O2 -DSPEED=200" + set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -Dfseeko=fseek -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO" + set opt="-O2" set arch=IBMPC - set compat="bmalloc.o erf.o getpagesize.o" + set compat="erf.o" set extras=CC=gcc breaksw -case 7: # MacOS X - set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib" - set opt="-O2 -DSPEED=200" - set arch=PowerPC - set compat="bmalloc.o" - set extras="CC=cc CONFIGURE_ARCH=powerpc" +case 7: # MacOS X + set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib" + set opt="-O2" + set arch=PowerPC + set extras="CC=cc CONFIGURE_ARCH=powerpc" set special="ogl" - breaksw + breaksw case 8: # FreeBSD - set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib" - set opt="-O -DSPEED=200" - set compat="bmalloc.o erf.o" - set extras="CC=cc" + set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib" + set opt="-O" + set compat="erf.o" + set extras='CC=cc MLIB="-lcompat -lm"' set arch=IBMPC - breaksw -case 9: # Other + breaksw +case 9: # Cygwin + set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO" + set opt="-O2" + set arch=IBMPC + set compat="erf.o" + set extras="CC=gcc" + set special="ogl" + set esuffix=".exe" + breaksw +case 10: # Other set opt="-O" - set compat="bmalloc.o erf.o strcmp.o" + set compat="erf.o strcmp.o" echo -n "Are you using the GNU C compiler [n]? " if ( "$<" =~ [yY]* ) then set extras="CC=gcc" endif + set arch=other breaksw default: echo "Illegal choice\!" @@ -225,36 +207,6 @@ default: exit 1 breaksw endsw -# We don't seem to have any more cramped machines out there, so... -set mem="-DBIGMEM" -if ( $?mem ) then - set mach="$mach $mem" -else - echo -n "Does the target machine have more than 24 Mbytes of RAM? " - set ans="$<" - if ( "$ans" =~ [yY]* ) then - echo -n "More than 96 Mbytes? " - set ans="$<" - if ( "$ans" =~ [yY]* ) then - set mach="$mach -DBIGMEM" - set sizemod="huge models (100,000+ surfaces)" - else - set sizemod="very large models (30,000+ surfaces)" - endif - else - set sizemod="large models (10,000+ surfaces)" - endif -endif -# echo "Do you expect to be rendering $sizemod?" -# echo -n '(Answering "yes" may adversly affect rendering time and geometric accuracy) ' -# set ans="$<" -# if ( "$ans" =~ [yY]* ) then -# set opt="$opt -DSMLFLT" -# endif -# echo -n "Do you have X10 support [n]? " -# if ( "$<" =~ [yY]* ) then -# set special="$special x10" -# endif source installib sed 's/[ ]*$//' > $rmake << _EOF_ #!/bin/sh @@ -264,6 +216,7 @@ exec make "SPECIAL=$special" \ ARCH=$arch "COMPAT=$compat" \ INSTDIR=$idir \ LIBDIR=$ldir \ + ESUFFIX=$esuffix \ $extras "\$@" -f Rmakefile _EOF_ chmod 755 $rmake @@ -302,13 +255,14 @@ else echo "Done." endif cd .. -if (! -d /usr/tmp) then - ln -s /tmp /usr/tmp - if ($status) then - echo "" - echo "IMPORTANT: Execute 'sudo ln -s /tmp /usr/tmp'" - echo "" - endif +if (! $inpath ) then + echo "" + echo "Add $idir to the beginning of your execution path:" + echo 'For C-shell users, put the following into ~/.cshrc' + echo " set path=( $idir "'$path )' + echo 'For Bourne shell users, put the following into $HOME/.profile' + echo " PATH=$idir"':$PATH' + echo " export PATH" endif else cd src @@ -318,13 +272,13 @@ foreach i ( $srcdirs ) make -f Rmakefile $* popd end -echo "Done." cd .. -endif foreach i ( $* ) if ( "$i" == clean ) then echo "Removing library archives..." - rm -f src/lib/*.[ao] + rm -f src/lib/*.{a,o,la} endif end +echo "Done." +endif exit 0