ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/makeall
(Generate patch)

Comparing ray/makeall (file contents):
Revision 1.10 by greg, Tue Nov 25 18:23:11 2003 UTC vs.
Revision 1.21 by greg, Wed Sep 21 17:17:23 2005 UTC

# Line 16 | Line 16 | if ( "$1" == library ) then
16          echo "Set the environment variable RAYPATH=.:$ldir"
17          echo 'For C-shell users, put the following into ~/.cshrc'
18          echo "  setenv RAYPATH .:$ldir"
19 <        echo 'For Bourne shell users, put the following into $HOME/profile'
19 >        echo 'For Bourne shell users, put the following into $HOME/.profile'
20          echo "  RAYPATH=.:$ldir"
21          echo "  export RAYPATH"
22          echo ""
23          exit 0
24   endif
25 < set srcdirs=( common meta cv gen ot rt px hd util cal )
25 > set srcdirs=( common rt meta cv gen ot px hd util cal )
26   if ( "$1" == install ) then
27          cat << _EOF_
28  
# Line 84 | Line 84 | if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then
84          goto gotrmake
85   endif
86   set newrmake
87 < goto skiplicense
88 < cat << _EOF_
89 <
90 <                     RADIANCE LICENSE AGREEMENT
91 <
92 < Radiance is a registered copyright of The Regents of the University of
93 < California ("The Regents"). The Regents grant to you a nonexclusive,
94 < nontransferable license ("License") to use Radiance source code without
95 < fee.  You may not sell or distribute Radiance to others without the
96 < prior express written permission of The Regents.  You may compile and
97 < use this software on any machines to which you have personal access,
98 < and may share its use with others who have access to the same machines.
99 <
100 < NEITHER THE UNITED STATES NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY
101 < OF THEIR EMPLOYEES, MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY
102 < LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS
103 < OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
104 < THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.  By downloading, using
105 < or copying this software, you agree to abide by the intellectual property laws
106 < and all other applicable laws of the United States, and by the terms of this
107 < License Agreement. Ownership of the software shall remain solely in The
108 < Regents.  The Regents shall have the right to terminate this License
109 < immediately by written notice upon your breach of, or noncompliance with, any
110 < of its terms.  You shall be liable for any infringement or damages resulting
111 < from your failure to abide by the terms of this License Agreement.
112 <
113 < _EOF_
87 > more src/common/copyright.h
88   echo -n "Do you understand and accept the terms of this agreement [n]? "
89   set ans="$<"
90   if ( "$ans" !~ [yY]* ) exit
117 echo -n "Are you a new Radiance user or with a new address [y]? "
118 set ans="$<"
119 if ( "$ans" !~ [nN]* ) then
120        csh -f newuser
121 else
122        echo `cat src/rt/VERSION` compiled by `whoami` | mail [email protected]
123 endif
124 skiplicense:
91   set special=
92   set arch=
93   set opt=
# Line 151 | Line 117 | switch ("$arch")
117   case 1:                 # SPARC Station
118          set arch=sun
119          set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
120 <        set opt="-O -DSPEED=80"
121 <        set compat="bmalloc.o strcmp.o getpagesize.o"
120 >        set opt="-O"
121 >        set compat="strcmp.o"
122          breaksw
123   case 2:                 # HP workstation
124          set mach=""
125 <        set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
126 <        set compat="bmalloc.o getpagesize.o strcmp.o"
125 >        set opt="-O -Aa -D_HPUX_SOURCE"
126 >        set compat="strcmp.o"
127          set arch=hpux
128          breaksw
129   case 3:                 # Silicon Graphics
# Line 165 | Line 131 | case 3:                        # Silicon Graphics
131          switch (`uname -r`)
132          case 3.*:
133                  set mach="-noprototypes"
134 <                set opt="-O -DSPEED=80"
134 >                set opt="-O"
135                  set special="sgi"
136 <                set compat="malloc.o strcmp.o"
136 >                set compat="strcmp.o"
137                  breaksw
138          case 4.*:
139                  set mach=""
140 <                set opt="-O2 -DSPEED=100"
141 <                set compat="malloc.o strcmp.o"
140 >                set opt="-O2"
141 >                set compat="strcmp.o"
142                  set extras='"MLIB=-lfastm -lm"'
143                  breaksw
144          default:        # 5.x or later
145                  ln -s `which wish` $idir/wish4.0
146                  set path=($idir $path)
147                  set mach="-w"
148 <                set opt="-O2 -DSPEED=200"
148 >                set opt="-O2"
149                  set special="ogl"
150 <                set compat="bmalloc.o strcmp.o"
150 >                set compat="strcmp.o"
151                  breaksw
152          endsw
153          breaksw
154   case 4:                 # AIX
155          set opt="-O"
156 <        set compat="bmalloc.o erf.o strcmp.o"
156 >        set compat="erf.o strcmp.o"
157          set arch=PowerPC
158          breaksw
159   case 5:                 # BSDI BSD/386
160          set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
161 <        set opt="-O -DSPEED=100"
161 >        set opt="-O"
162          set arch=IBMPC
163 <        set compat="malloc.o erf.o strcmp.o"
163 >        set compat="erf.o strcmp.o"
164          breaksw
165   case 6:                 # Linux
166 <        set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
167 <        set opt="-O2 -DSPEED=200"
166 >        set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -Dfseeko=fseek -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
167 >        set opt="-O2"
168          set arch=IBMPC
169 <        set compat="bmalloc.o erf.o getpagesize.o"
169 >        set compat="erf.o"
170          set extras=CC=gcc
171          breaksw
172   case 7:                 # MacOS X
173          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
174 <        set opt="-O2 -DSPEED=200"
174 >        set opt="-O2"
175          set arch=PowerPC
210        set compat="bmalloc.o"
176          set extras="CC=cc CONFIGURE_ARCH=powerpc"
177          set special="ogl"
178          breaksw
179   case 8:                 # FreeBSD
180          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
181 <        set opt="-O -DSPEED=200"
182 <        set compat="bmalloc.o erf.o"
183 <        set extras="CC=cc"
181 >        set opt="-O"
182 >        set compat="erf.o"
183 >        set extras='CC=cc MLIB="-lcompat -lm"'
184          set arch=IBMPC
185          breaksw
186   case 9:                 # Cygwin
187          set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
188 <        set opt="-O2 -DSPEED=200"
188 >        set opt="-O2"
189          set arch=IBMPC
190 <        set compat="bmalloc.o erf.o getpagesize.o"
190 >        set compat="erf.o"
191          set extras="CC=gcc"
192          set special="ogl"
193          set esuffix=".exe"
194          breaksw
195   case 10:                        # Other
196          set opt="-O"
197 <        set compat="bmalloc.o erf.o strcmp.o"
197 >        set compat="erf.o strcmp.o"
198          echo -n "Are you using the GNU C compiler [n]? "
199          if ( "$<" =~ [yY]* ) then
200                  set extras="CC=gcc"
# Line 295 | Line 260 | if (! $inpath ) then
260          echo "Add $idir to the beginning of your execution path:"
261          echo 'For C-shell users, put the following into ~/.cshrc'
262          echo "  set path=( $idir "'$path )'
263 <        echo 'For Bourne shell users, put the following into $HOME/profile'
263 >        echo 'For Bourne shell users, put the following into $HOME/.profile'
264          echo "  PATH=$idir"':$PATH'
265          echo "  export PATH"
266   endif
302 if (! -d /usr/tmp) then
303        ln -s /tmp /usr/tmp
304        if ($status) then
305                echo ""
306                echo "IMPORTANT: Execute 'sudo ln -s /tmp /usr/tmp'"
307        endif
308 endif
267   else
268   cd src
269   foreach i ( $srcdirs )
# Line 318 | Line 276 | cd ..
276   foreach i ( $* )
277          if ( "$i" == clean ) then
278                  echo "Removing library archives..."
279 <                rm -f src/lib/*.[ao]
279 >                rm -f src/lib/*.{a,o,la}
280          endif
281   end
282   echo "Done."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines