--- ray/makeall 2003/11/25 18:23:11 1.10 +++ ray/makeall 2012/06/29 16:18:02 1.28 @@ -1,5 +1,5 @@ #!/bin/csh -f -# RCSid $Id: makeall,v 1.10 2003/11/25 18:23:11 greg Exp $ +# RCSid $Id: makeall,v 1.28 2012/06/29 16:18:02 greg Exp $ # # Make all the Radiance programs # @@ -11,18 +11,18 @@ if ( $#argv < 1 ) then endif if ( "$1" == library ) then source installib - cp -f src/*/*.{cal,tab,hex} $ldir + cp -f src/*/*.{cal,tab,hex,dat} $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_ @@ -65,13 +65,6 @@ if ( ! -d $idir ) then goto again1 endif endif -if ( ! -d $idir/dev ) then - mkdir $idir/dev - if ( $status ) then - echo "Cannot create subdirectory, please reenter" - goto again1 - endif -endif set inpath=0 foreach i ( $path ) if ( "$i" == "$idir" ) then @@ -84,44 +77,10 @@ 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 License.txt 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= @@ -134,15 +93,11 @@ cat << _EOF_ Please select your system type from the following list: 1) Sun Solaris - 2) HP workstation - 3) Silicon Graphics - 4) AIX (RS/6000) - 5) BSDI BSD/386 - 6) Linux - 7) MacOS X - 8) FreeBSD - 9) Cygwin - 10) Other + 2) Linux + 3) MacOS X + 4) FreeBSD + 5) Cygwin + 6) Other _EOF_ echo -n "Choice? " @@ -151,88 +106,47 @@ 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" - 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 arch=hpux - breaksw -case 3: # Silicon Graphics - set arch=sgi - switch (`uname -r`) - case 3.*: - set mach="-noprototypes" - set opt="-O -DSPEED=80" - set special="sgi" - set compat="malloc.o strcmp.o" - breaksw - case 4.*: - set mach="" - set opt="-O2 -DSPEED=100" - set compat="malloc.o 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 special="ogl" - set compat="bmalloc.o strcmp.o" - breaksw - endsw - breaksw -case 4: # AIX set opt="-O" - set compat="bmalloc.o erf.o strcmp.o" - set arch=PowerPC + set compat="strcmp.o timegm.o" breaksw -case 5: # BSDI BSD/386 - set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include" - set opt="-O -DSPEED=100" - set arch=IBMPC - set compat="malloc.o erf.o strcmp.o" - breaksw -case 6: # Linux +case 2: # Linux set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO" - set opt="-O2 -DSPEED=200" + 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 +case 3: # 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" + set opt="-O2" + set arch=Intel + set extras="CC=cc CONFIGURE_ARCH=i386" set special="ogl" breaksw -case 8: # FreeBSD +case 4: # 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 opt="-O" + set compat="erf.o" + set extras='CC=cc MLIB="-lcompat -lm"' set arch=IBMPC breaksw -case 9: # Cygwin +case 5: # Cygwin set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO" - set opt="-O2 -DSPEED=200" + set opt="-O2" set arch=IBMPC - set compat="bmalloc.o erf.o getpagesize.o" + set compat="erf.o" set extras="CC=gcc" set special="ogl" set esuffix=".exe" breaksw -case 10: # Other +case 6: # 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" + else + set compat="$compat timegm.o" endif set arch=other breaksw @@ -295,17 +209,10 @@ if (! $inpath ) then 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 'For Bourne shell users, put the following into $HOME/.profile' echo " PATH=$idir"':$PATH' echo " export PATH" endif -if (! -d /usr/tmp) then - ln -s /tmp /usr/tmp - if ($status) then - echo "" - echo "IMPORTANT: Execute 'sudo ln -s /tmp /usr/tmp'" - endif -endif else cd src foreach i ( $srcdirs ) @@ -318,7 +225,7 @@ cd .. 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."