--- ray/src/px/SConscript 2004/10/21 15:47:12 1.7 +++ ray/src/px/SConscript 2008/12/23 15:04:00 1.19 @@ -13,47 +13,37 @@ def radlib(name): return os.path.join('$RAD_BUILDLIB', warp3d = env.Object(source="warp3d.c") clrtab = env.Object(source="clrtab.c") neuclrtab = env.Object(source="neuclrtab.c") -ciq = env.Object(source="ciq.c") -cut = env.Object(source="cut.c") -closest = env.Object(source="closest.c") # standard targets PROGS = ( -# name files libs +# name files libs ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d], - ['rtpic','rtproc','rtpath','rtio','rtargs','rtcont','rtmem','rterror']), + ['rtpic','rtproc','rtpath','rtargs','rtio','rtcont','rtmem','rterror']), ('pcond', Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d], - ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']), + ['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']), ('pfilt', Split('pfilt.c pf2.c pf3.c'), - ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']), -('pcwarp', ['pcwarp.c', warp3d], + ['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']), +('pcwarp', ['pcwarp.c', warp3d], ['rtpic','rtio','rtcont','rtmem','rterror']), -('pvalue', ['pvalue.c'], ['rtpic','rtio','rtargs','rtmath']), +('pvalue', ['pvalue.c'], ['rtpic','rtargs','rtio','rtmath']), ('pcompos', ['pcompos.c'], ['rtpic','rtproc','rtpath','rtio','rterror']), ('psign', ['psign.c'], - ['rtpic','rtscene','rtio','rtpath','rtargs','rtcont','rtmem','rterror']), + ['rtpic','rtscene','rtpath','rtargs','rtio','rtcont','rtmem','rterror']), ('protate', ['protate.c'], ['rtpic','rtio']), ('pextrem', ['pextrem.c'], ['rtpic','rtio']), ('pflip', ['pflip.c'], ['rtpic','rtio']), ('pcomb', ['pcomb.c'], - ['rtpic','rtproc','rtpath','rtio','rtfunc','rtargs','rtmath','rtcont','rtmem']), + ['rtpic','rtproc','rtpath','rtfunc','rtargs','rtio','rtmath','rtcont','rtmem']), ('pinterp', ['pinterp.c'], - ['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']), + ['rtproc','rtpic','rtpath','rtargs','rtio','rtmath','rtmem','rterror']), -('oki20c', ['oki20c.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']), -('oki20', ['oki20.c'], ['rtpic','rtproc','rtpath','rtio','rtmem','rterror']), - ('ra_gif', ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']), -('ra_pr', Split('ra_pr.c biq.c')+ [ciq, cut, closest], - ['rtpic','rtio','rtmem']), -('ra_pr24', ['ra_pr24.c'], ['rtpic','rtio','rtmem']), -('ra_avs', ['ra_avs.c'], ['rtpic','rtio','rtmem']), -('ra_ps', ['ra_ps.c'], ['rtpic','rtio','rtargs','rtmem']), +('ra_ps', ['ra_ps.c'], ['rtpic','rtargs','rtio','rtmem']), ('ra_ppm', ['ra_ppm.c'], ['rtpic','rtio','rtmem']), -('ra_bmp', ['ra_bmp.c'], ['rtpic','rtio','rtmem']), +('ra_bmp', ['ra_bmp.c'], + ['rtpic','rtproc','rterror','rtpath','rtio','rtmem']), ('ra_t8', ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']), ('ra_t16', ['ra_t16.c'], ['rtpic','rtio','rtmem']), -('ra_bn', ['ra_bn.c'], ['rtpic','rtio','rtmem']), ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']), ('ra_pict', ['ra_pict.c'], ['rtpic','rtio','rtmem']), ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']), @@ -67,91 +57,81 @@ for p in PROGS: progs.append(prog) -# special targets not normally built -SPECIAL = ( -# name files libs -('psum', ['psum.c'], ['rtpic','rtio']), -#('panim', ['panim.c'], ['client','rpcsvc']),# missing externals +# tiff library (building it is unix-specific for the moment) +# If we haven't found one supporting LogLuv installed, build our own. +libtiff_fn = radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']) +if os.name == 'posix' and not env.get('TIFFLIB_INSTALLED'): + cwd = os.getcwd() + upperdir = os.path.split(cwd)[0] + libtiff = env.Command(libtiff_fn, None, + [('cd "%(tiffdir)s"; ' + 'env CC="$CC" ' + './configure -C ' + '"libdir=%(upperdir)s/lib" ' + '--enable-static --disable-shared --disable-cxx ' + '--enable-logluv --disable-jpeg --disable-zlib --disable-pixarlog; ' + 'cd %(portdir)s; make all;' + 'cd %(libtiffdir)s; make install-exec;' # don't install headers + ) % { + 'upperdir':upperdir, + 'tiffdir':os.path.join(cwd, 'tiff'), + 'portdir':os.path.join(cwd, 'tiff', 'port'), + 'libtiffdir':os.path.join(cwd, 'tiff', 'libtiff') + } + ]) -('ra_im', ['ra_im.c'], ['rtproc','rtpath','rtio','rterror']), + env['TIFFLIB_INSTALLED'] = 1 -#('aedimage', Split('aedimage.c')+[ciq, cut, closest],[]),# missing externals -('t4027', ['t4027.c'], ['rtpic']), -('paintjet', ['paintjet.c'], ['rtpic','rtio','rtmem']), -('mt160r', ['mt160r.c'], ['rtpic','rtio','rtmem']), -('greyscale', ['greyscale.c'], ['rtpic']), -('colorscale', ['colorscale.c'], ['rtpic']), -('d48c', ['d48c.c'], ['rtpic']), -) -specprogs = [] -specinst = [] -for p in SPECIAL: - prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib) - specprogs.append(prog) - specinst.append(env.Install('$RAD_BINDIR', prog)) -env.Alias('px_special', specprogs) -env.Alias('px_special_install', specinst) +if os.name == 'posix': # cleanup action for a previously built tifflib + Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')]) - -# tiff library (unix-specific for the moment) -if os.name == 'posix': - cwd = os.getcwd() - libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']), - 'tiff/config.local', - [('cd "%s"; ' - 'sh ./configure -quiet -noninteractive ' - '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; ' - 'cd libtiff; ' - 'make install;') % os.path.join(cwd, 'tiff')]) - +if env.get('TIFFLIB_INSTALLED'): # tiff programs - ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'), + tiffi = env.get('RAD_TIFFINCLUDE') + if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', []) + else: tiffincl = env.get('CPPPATH', []) + tiffl = env.get('RAD_TIFFLIB') + if tiffl: tifflib = [tiffl] + env.get('LIBPATH', []) + else: tifflib = env.get('LIBPATH', []) + + ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'], + CPPPATH = tiffincl, LIBPATH=tifflib, LIBS=['tiff','rtpic','rtio','rtmem'] + mlib) progs.append(ra_tiff) - normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'), + normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'], + CPPPATH = tiffincl, LIBPATH=tifflib, LIBS=['tiff','rtpic','rtio','rtmem'] + mlib) progs.append(normtiff) -# pixar format requires extra lib -if env.has_key('PIXAR_LIB'): - ra_pixar = env.Program(radbin('ra_pixar'), source='ra_pixar.c', - LIBS=['rtpic', '$PIXAR_LIB']) - progs.append(ra_pixar) - - # X11 targets if env.has_key('X11LIB'): - xincl = env.get('CPPPATH', []) + ['$X11INCLUDE'] - xlibp = env.get('LIBPATH', []) + ['$X11LIB'] - xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem'] - x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice - CPPPATH=xincl) + xincl = env.get('CPPPATH', []) + ['$X11INCLUDE'] + xlibp = env.get('LIBPATH', []) + ['$X11LIB'] + xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem'] + env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic + CPPPATH=xincl) - ximage = env.Program(target=radbin('ximage'), - source=Split('x11image.c x11raster.c')+[clrtab], - CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib) - progs.append(ximage) + ximage = env.Program(target=radbin('ximage'), + source=Split('x11image.c x11raster.c')+[clrtab], + CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib) + progs.append(ximage) - xshowtrace = env.Program(target=radbin('xshowtrace'), - source=Split('xshowtrace.c') + [x11findwind], - CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib) - progs.append(xshowtrace) + xshowtrace = env.Program(target=radbin('xshowtrace'), + source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic + CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib) + progs.append(xshowtrace) -# NeWS ?!? -# if env.has_key('OGL'): -# glimage = env.Program(target=radbin('glimage'), -# CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']], -# source=Split('glimage.c'), -# LIBS=['gl_s']+env['LIBS'],) -# progs.append(glimage) - - if os.name == 'posix': # XXX ignoring trad.wsh - for s in Split('''normpat falsecolor pdfblur - pmblur xyzimage phisto pdelta pgblur'''): + for s in Split('''normpat falsecolor pdfblur pmblur pmdblur pbilat + xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''): Default(env.InstallCsh(radbin(s), s + '.csh')) +# XXX probably needs fixing +#else: +# for s in Split('''falsecolor'''): +# Default(env.InstallCsh(radbin(s), s + '.csh')) +# ignored by Rmakefile: pacuity phisteq psquish pveil vlpic Default('#src/px') env.Install('$RAD_BINDIR', progs)