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

Comparing ray/src/px/SConscript (file contents):
Revision 1.23 by schorsch, Thu Mar 10 21:43:23 2016 UTC vs.
Revision 1.24 by schorsch, Mon Jan 8 13:38:37 2018 UTC

# Line 1 | Line 1
1 + from __future__ import division, print_function, unicode_literals
2 +
3   import os
4  
5   Import('env') # inherit from parent
# Line 28 | Line 30 | PROGS = (
30   ('pflip',    ['pflip.c'],     ['rtrad']),
31   ('pcomb',    ['pcomb.c'],     ['rtrad']),
32   ('pinterp',  ['pinterp.c'],   ['rtrad']),
33 + ('psketch',  ['psketch.c'],   ['rtrad']),
34  
35   ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtrad']),
36   ('ra_ps',    ['ra_ps.c'],     ['rtrad']),
# Line 103 | Line 106 | if env.has_key('X11LIB'):
106          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
107          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
108          xlibs = ['X11','rtrad']
109 <        env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
109 >        env.x11findwind = env.Object(source='../common/x11findwind.c',
110                  CPPPATH=xincl)
111  
112          ximage = env.Program(target=radbin('ximage'),
# Line 112 | Line 115 | if env.has_key('X11LIB'):
115          progs.append(ximage)
116  
117          xshowtrace = env.Program(target=radbin('xshowtrace'),
118 <                source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic
118 >                source=Split('xshowtrace.c') + [env.x11findwind],
119                  CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
120          progs.append(xshowtrace)
121  
122 + pyscripts = Split('''falsecolor phisto''')
123   if os.name == 'posix': # XXX ignoring trad.wsh
124          for s in Split('''normpat pdfblur pmblur pmdblur
125 <                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''):
125 >                        xyzimage pgblur ra_pfm ran2tiff pbilat'''):
126                  Default(env.InstallScript(radbin(s), s + '.csh'))
127 <        for s in Split('''falsecolor'''):
128 <                Default(env.InstallScript(radbin(s), s + '.pl'))
129 < # XXX probably needs fixing
130 < #else:
131 < #       for s in Split('''falsecolor'''):
132 < #               Default(env.InstallScript(radbin(s), s + '.pl'))
127 >        for s in pyscripts:
128 >                Default(env.InstallScript(radbin(s), s + '.py'))
129 > else:
130 >        for s in pyscripts:
131 >                Default(env.InstallScript(radbin(s + '.py'), s + '.py'))
132 >        
133 >
134   # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
135  
136   Default('#src/px')
137   env.Install('$RAD_BINDIR', progs)
138  
139   # vim: set syntax=python:
140 + # vi: set ts=4 sw=4 :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines