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.25 by greg, Mon Nov 29 17:22:44 2010 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 134 | Line 100 | cat << _EOF_
100   Please select your system type from the following list:
101  
102          1)      Sun Solaris
103 <        2)      HP workstation
104 <        3)      Silicon Graphics
105 <        4)      AIX (RS/6000)
106 <        5)      BSDI BSD/386
107 <        6)      Linux
142 <        7)      MacOS X
143 <        8)      FreeBSD
144 <        9)      Cygwin
145 <        10)     Other
103 >        2)      Linux
104 >        3)      MacOS X
105 >        4)      FreeBSD
106 >        5)      Cygwin
107 >        6)      Other
108  
109   _EOF_
110   echo -n "Choice? "
# Line 151 | Line 113 | switch ("$arch")
113   case 1:                 # SPARC Station
114          set arch=sun
115          set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
154        set opt="-O -DSPEED=80"
155        set compat="bmalloc.o strcmp.o getpagesize.o"
156        breaksw
157 case 2:                 # HP workstation
158        set mach=""
159        set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
160        set compat="bmalloc.o getpagesize.o strcmp.o"
161        set arch=hpux
162        breaksw
163 case 3:                 # Silicon Graphics
164        set arch=sgi
165        switch (`uname -r`)
166        case 3.*:
167                set mach="-noprototypes"
168                set opt="-O -DSPEED=80"
169                set special="sgi"
170                set compat="malloc.o strcmp.o"
171                breaksw
172        case 4.*:
173                set mach=""
174                set opt="-O2 -DSPEED=100"
175                set compat="malloc.o strcmp.o"
176                set extras='"MLIB=-lfastm -lm"'
177                breaksw
178        default:        # 5.x or later
179                ln -s `which wish` $idir/wish4.0
180                set path=($idir $path)
181                set mach="-w"
182                set opt="-O2 -DSPEED=200"
183                set special="ogl"
184                set compat="bmalloc.o strcmp.o"
185                breaksw
186        endsw
187        breaksw
188 case 4:                 # AIX
116          set opt="-O"
117 <        set compat="bmalloc.o erf.o strcmp.o"
191 <        set arch=PowerPC
117 >        set compat="strcmp.o timegm.o"
118          breaksw
119 < case 5:                 # BSDI BSD/386
194 <        set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
195 <        set opt="-O -DSPEED=100"
196 <        set arch=IBMPC
197 <        set compat="malloc.o erf.o strcmp.o"
198 <        breaksw
199 < case 6:                 # Linux
119 > case 2:                 # Linux
120          set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
121 <        set opt="-O2 -DSPEED=200"
121 >        set opt="-O2"
122          set arch=IBMPC
123 <        set compat="bmalloc.o erf.o getpagesize.o"
123 >        set compat="erf.o"
124          set extras=CC=gcc
125          breaksw
126 < case 7:                 # MacOS X
126 > case 3:                 # MacOS X
127          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
128 <        set opt="-O2 -DSPEED=200"
129 <        set arch=PowerPC
130 <        set compat="bmalloc.o"
211 <        set extras="CC=cc CONFIGURE_ARCH=powerpc"
128 >        set opt="-O2"
129 >        set arch=Intel
130 >        set extras="CC=cc CONFIGURE_ARCH=i386"
131          set special="ogl"
132          breaksw
133 < case 8:                 # FreeBSD
133 > case 4:                 # FreeBSD
134          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
135 <        set opt="-O -DSPEED=200"
136 <        set compat="bmalloc.o erf.o"
137 <        set extras="CC=cc"
135 >        set opt="-O"
136 >        set compat="erf.o"
137 >        set extras='CC=cc MLIB="-lcompat -lm"'
138          set arch=IBMPC
139          breaksw
140 < case 9:                 # Cygwin
140 > case 5:                 # Cygwin
141          set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
142 <        set opt="-O2 -DSPEED=200"
142 >        set opt="-O2"
143          set arch=IBMPC
144 <        set compat="bmalloc.o erf.o getpagesize.o"
144 >        set compat="erf.o"
145          set extras="CC=gcc"
146          set special="ogl"
147          set esuffix=".exe"
148          breaksw
149 < case 10:                        # Other
149 > case 6:                 # Other
150          set opt="-O"
151 <        set compat="bmalloc.o erf.o strcmp.o"
151 >        set compat="erf.o strcmp.o"
152          echo -n "Are you using the GNU C compiler [n]? "
153          if ( "$<" =~ [yY]* ) then
154                  set extras="CC=gcc"
155 +        else
156 +                set compat="$compat timegm.o"
157          endif
158          set arch=other
159          breaksw
# Line 295 | Line 216 | if (! $inpath ) then
216          echo "Add $idir to the beginning of your execution path:"
217          echo 'For C-shell users, put the following into ~/.cshrc'
218          echo "  set path=( $idir "'$path )'
219 <        echo 'For Bourne shell users, put the following into $HOME/profile'
219 >        echo 'For Bourne shell users, put the following into $HOME/.profile'
220          echo "  PATH=$idir"':$PATH'
221          echo "  export PATH"
222   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
223   else
224   cd src
225   foreach i ( $srcdirs )
# Line 318 | Line 232 | cd ..
232   foreach i ( $* )
233          if ( "$i" == clean ) then
234                  echo "Removing library archives..."
235 <                rm -f src/lib/*.[ao]
235 >                rm -f src/lib/*.{a,o,la}
236          endif
237   end
238   echo "Done."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines