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

Comparing ray/makeall (file contents):
Revision 1.6 by greg, Thu May 29 17:46:35 2003 UTC vs.
Revision 1.10 by greg, Tue Nov 25 18:23:11 2003 UTC

# Line 1 | Line 1
1   #!/bin/csh -f
2   # RCSid $Id$
3   #
4 – #Added macosX 2001-04-11 by Jean Brange
5 – #Deleted obsolete systems 2001-04-18 by Greg Ward
6 – #
4   # Make all the Radiance programs
5   #
6   if ( $#argv < 1 ) then
# Line 14 | Line 11 | if ( $#argv < 1 ) then
11   endif
12   if ( "$1" == library ) then
13          source installib
14 +        cp -f src/*/*.{cal,tab,hex} $ldir
15          echo ""
16          echo "Set the environment variable RAYPATH=.:$ldir"
17          echo 'For C-shell users, put the following into ~/.cshrc'
# Line 74 | Line 72 | if ( ! -d $idir/dev ) then
72                  goto again1
73          endif
74   endif
75 + set inpath=0
76 + foreach i ( $path )
77 +        if ( "$i" == "$idir" ) then
78 +                set inpath=1
79 +                break
80 +        endif
81 + end
82   set rmake=$idir/rmake
83   if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then
84          goto gotrmake
# Line 123 | Line 128 | set opt=
128   set mach=
129   set compat=
130   set extras=
131 + set esuffix=
132   cat << _EOF_
133  
134   Please select your system type from the following list:
# Line 133 | Line 139 | Please select your system type from the following list
139          4)      AIX (RS/6000)
140          5)      BSDI BSD/386
141          6)      Linux
142 <        7)      MacOS X
142 >        7)      MacOS X
143          8)      FreeBSD
144 <        9)      Other
144 >        9)      Cygwin
145 >        10)     Other
146  
147   _EOF_
148   echo -n "Choice? "
# Line 190 | Line 197 | case 5:                        # BSDI BSD/386
197          set compat="malloc.o erf.o strcmp.o"
198          breaksw
199   case 6:                 # Linux
200 <        set mach="-Dlinux -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
200 >        set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
201          set opt="-O2 -DSPEED=200"
202          set arch=IBMPC
203          set compat="bmalloc.o erf.o getpagesize.o"
204          set extras=CC=gcc
205          breaksw
206 < case 7:                # MacOS X
207 <        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
208 <        set opt="-O2 -DSPEED=200"
209 <        set arch=PowerPC
210 <        set compat="bmalloc.o"
211 <        set extras="CC=cc CONFIGURE_ARCH=powerpc"
206 > case 7:                 # MacOS X
207 >        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
208 >        set opt="-O2 -DSPEED=200"
209 >        set arch=PowerPC
210 >        set compat="bmalloc.o"
211 >        set extras="CC=cc CONFIGURE_ARCH=powerpc"
212          set special="ogl"
213 <        breaksw
213 >        breaksw
214   case 8:                 # FreeBSD
215 <        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
216 <        set opt="-O -DSPEED=200"
217 <        set compat="bmalloc.o erf.o"
218 <        set extras="CC=cc"
215 >        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
216 >        set opt="-O -DSPEED=200"
217 >        set compat="bmalloc.o erf.o"
218 >        set extras="CC=cc"
219          set arch=IBMPC
220 <        breaksw
221 < case 9:                 # Other
220 >        breaksw
221 > case 9:                 # Cygwin
222 >        set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
223 >        set opt="-O2 -DSPEED=200"
224 >        set arch=IBMPC
225 >        set compat="bmalloc.o erf.o getpagesize.o"
226 >        set extras="CC=gcc"
227 >        set special="ogl"
228 >        set esuffix=".exe"
229 >        breaksw
230 > case 10:                        # Other
231          set opt="-O"
232          set compat="bmalloc.o erf.o strcmp.o"
233          echo -n "Are you using the GNU C compiler [n]? "
# Line 235 | Line 251 | exec make "SPECIAL=$special" \
251          ARCH=$arch "COMPAT=$compat" \
252          INSTDIR=$idir \
253          LIBDIR=$ldir \
254 +        ESUFFIX=$esuffix \
255          $extras "\$@" -f Rmakefile
256   _EOF_
257   chmod 755 $rmake
# Line 273 | Line 290 | else
290          echo "Done."
291   endif
292   cd ..
293 + if (! $inpath ) then
294 +        echo ""
295 +        echo "Add $idir to the beginning of your execution path:"
296 +        echo 'For C-shell users, put the following into ~/.cshrc'
297 +        echo "  set path=( $idir "'$path )'
298 +        echo 'For Bourne shell users, put the following into $HOME/profile'
299 +        echo "  PATH=$idir"':$PATH'
300 +        echo "  export PATH"
301 + 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'"
281 –                echo ""
307          endif
308   endif
309   else
# Line 289 | Line 314 | foreach i ( $srcdirs )
314          make -f Rmakefile $*
315          popd
316   end
292 – echo "Done."
317   cd ..
294 – endif
318   foreach i ( $* )
319          if ( "$i" == clean ) then
320                  echo "Removing library archives..."
321                  rm -f src/lib/*.[ao]
322          endif
323   end
324 + echo "Done."
325 + endif
326   exit 0

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)