Changeset 4916


Ignore:
Timestamp:
Jan 2, 2015 7:44:52 PM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4915 r4916  
    121121tkimg = tkimg1.4
    122122tls = tls1.6
    123 VTK_VERSION =           6.0
    124123vtk = vtk-6.0.0
    125124zlib = zlib
     
    948947
    949948packages_flags =        \
    950         --enable-shared \
    951949        $(common_flags)
    952950
     
    15771575define install_vtk
    15781576        $(MAKE) -C $(vtk) install
     1577        $(INSTALL) -m 0444 $(vtk)/vtkConfig.sh $(libdir)
    15791578        $(RM) $(includedir)/vtk
    1580         (cd $(includedir); $(LN_S) vtk-$(VTK_VERSION) vtk)
     1579        (. $(libdir)/vtkConfig.sh ; cd $(includedir); $(LN_S) vtk-$${VTK_VERSION} vtk)
    15811580        $(RM) $(libdir)/tcltk/vtk
    1582         (cd $(libdir)/tcltk; $(LN_S) vtk-$(VTK_VERSION) vtk)
     1581        (. $(libdir)/vtkConfig.sh ; cd $(libdir)/tcltk; $(LN_S) vtk-$${VTK_VERSION} vtk)
    15831582endef
    15841583define touch_vtk
  • branches/r9/configure

    r4915 r4916  
    27292729RAPPTURE_VERSION=1.5
    27302730
     2731VTK_VERSION=6.0
    27312732WITH_R=yes
    27322733WITH_JAVA=yes
  • branches/r9/configure.in

    r4915 r4916  
    1313RAPPTURE_VERSION=Version
    1414
     15VTK_VERSION=6.0
    1516WITH_R=yes
    1617WITH_JAVA=yes
  • branches/r9/gui/pkgIndex.tcl.in

    r2117 r4916  
    88        variable library $dir
    99    }
    10     set ext [info sharedlibextension]
    11     load [file join $dir "RapptureGUI${version}${ext}"]
    1210    package provide RapptureGUI $version
    1311} $dir]
  • branches/r9/lang/tcl/src/Makefile.in

    r4914 r4916  
    1717CXX             = @CXX@
    1818INSTALL         = @INSTALL@
     19LIB_RUNTIME_DIR = $(libdir)
    1920LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    2021MKDIR_P         = @MKDIR_P@
     
    2223SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    2324SHLIB_LD        = @SHLIB_LD@
    24 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     25SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2526SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2627STLIB_LD        = @STLIB_LD@
  • branches/r9/pkgs/DicomToVtk/Makefile.in

    r4912 r4916  
    3030TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    3131TK_LIB_SPEC     = @TK_LIB_SPEC@
     32VTK_VERSION     = @VTK_VERSION@
     33HAVE_LIBVTKDICOM = @HAVE_LIBVTKDICOM@
     34
     35DEFINES =
     36VTK_LIBS        = \
     37                -lvtkIOCore-$(VTK_VERSION) \
     38                -lvtkIOLegacy-$(VTK_VERSION) \
     39                -lvtkIOImage-$(VTK_VERSION) \
     40                -lvtkCommonCore-$(VTK_VERSION)
     41
     42ifeq ($(HAVE_LIBVTKDICOM),yes)
     43  VTK_LIBS += -lvtkDICOM
     44  DEFINES += -DUSE_VTK_DICOM_PACKAGE
     45endif
    3246
    3347CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    3650INCLUDES =      \
    3751                -I$(srcdir) \
    38                 -I$(includedir)/vtk-6.0 \
     52                -I$(includedir)/vtk-$(VTK_VERSION) \
    3953                -I$(includedir)
    4054
     
    4256                $(TCL_LIB_SPEC) \
    4357                $(TK_LIB_SPEC) \
     58                $(VTK_LIBS) \
     59                -lstdc++
    4460
    4561version =       @RAPPTURE_VERSION@
  • branches/r9/pkgs/DicomToVtk/RpDicomToVtk.cc

    r4841 r4916  
    258258/*
    259259 * ------------------------------------------------------------------------
    260  *  RpDicomToVtk_Init --
     260 *  Rappture_dicom_to_vtk_Init --
    261261 *
    262262 *  Invoked when the Rappture GUI library is being initialized
     
    268268 */
    269269int
    270 RpDicomToVtk_Init(Tcl_Interp *interp)
     270Rappture_dicom_to_vtk_Init(Tcl_Interp *interp)
    271271{
    272272    /* install the widget command */
  • branches/r9/pkgs/DicomToVtk/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureDicomToVtk${version}${ext}"] RpDicomToVtk
     5    load [file join $dir "RapptureDicomToVtk${version}${ext}"] \
     6        Rappture_dicom_to_vtk
    67    package provide RapptureDicomToVtk $version
    78} $dir]
  • branches/r9/pkgs/DxToVtk/RpDxToVtk.c

    r4841 r4916  
    796796/*
    797797 * ------------------------------------------------------------------------
    798  *  RpDxToVtk_Init --
     798 *  Rappture_dx_to_vtk_Init --
    799799 *
    800800 *  Invoked when the Rappture GUI library is being initialized
     
    806806 */
    807807int
    808 RpDxToVtk_Init(Tcl_Interp *interp)
     808Rappture_dx_to_vtk_Init(Tcl_Interp *interp)
    809809{
    810810    /* install the widget command */
  • branches/r9/pkgs/DxToVtk/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureDxToVtk${version}${ext}"] RpDxToVtk
     5    load [file join $dir "RapptureDxToVtk${version}${ext}"] Rappture_dx_to_vtk
    66    package provide RapptureDxToVtk $version
    77} $dir]
  • branches/r9/pkgs/PdbToVtk/pdbToVtk.c

    r4841 r4916  
    724724/*
    725725 * ------------------------------------------------------------------------
    726  *  RpPdbToVtk_Init --
     726 *  Rappture_pdb_to_vtk_Init --
    727727 *
    728728 *  Invoked when the Rappture GUI library is being initialized
     
    734734 */
    735735int
    736 RpPdbToVtk_Init(Tcl_Interp *interp)
     736Rappture_pdb_to_vtk_Init(Tcl_Interp *interp)
    737737{
    738738    /* install the widget command */
  • branches/r9/pkgs/PdbToVtk/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RappturePdbToVtk${version}${ext}"] RpPdbToVtk
     5    load [file join $dir "RappturePdbToVtk${version}${ext}"] Rappture_pdb_to_vtk
    66    package provide RappturePdbToVtk $version
    77} $dir]
  • branches/r9/pkgs/configure

    r4912 r4916  
    666666LIB_SEARCH_DIRS
    667667INSTALL_PREFIX
     668HAVE_LIBNCURSES
     669HAVE_LIBVTKDICOM
    668670HAVE_INTTYPES_H
    669671LDFLAGS_DEFAULT
     
    53855387
    53865388
     5389HAVE_LIBNCURSES=no
    53875390{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clrtoeol in -lncurses" >&5
    53885391$as_echo_n "checking for clrtoeol in -lncurses... " >&6; }
     
    54225425$as_echo "$ac_cv_lib_ncurses_clrtoeol" >&6; }
    54235426if test "x$ac_cv_lib_ncurses_clrtoeol" = xyes; then :
    5424   cat >>confdefs.h <<_ACEOF
    5425 #define HAVE_LIBNCURSES 1
    5426 _ACEOF
    5427 
    5428   LIBS="-lncurses $LIBS"
    5429 
     5427  HAVE_LIBNCURSES=yes
    54305428else
    54315429  as_fn_error $? "ncurses library missing?" "$LINENO" 5
     
    59155913else
    59165914  HAVE_INTTYPES_H=0
     5915fi
     5916
     5917{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lvtkDICOM" >&5
     5918$as_echo_n "checking for main in -lvtkDICOM... " >&6; }
     5919if ${ac_cv_lib_vtkDICOM_main+:} false; then :
     5920  $as_echo_n "(cached) " >&6
     5921else
     5922  ac_check_lib_save_LIBS=$LIBS
     5923LIBS="-lvtkDICOM  $LIBS"
     5924cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5925/* end confdefs.h.  */
     5926
     5927
     5928int
     5929main ()
     5930{
     5931return main ();
     5932  ;
     5933  return 0;
     5934}
     5935_ACEOF
     5936if ac_fn_cxx_try_link "$LINENO"; then :
     5937  ac_cv_lib_vtkDICOM_main=yes
     5938else
     5939  ac_cv_lib_vtkDICOM_main=no
     5940fi
     5941rm -f core conftest.err conftest.$ac_objext \
     5942    conftest$ac_exeext conftest.$ac_ext
     5943LIBS=$ac_check_lib_save_LIBS
     5944fi
     5945{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vtkDICOM_main" >&5
     5946$as_echo "$ac_cv_lib_vtkDICOM_main" >&6; }
     5947if test "x$ac_cv_lib_vtkDICOM_main" = xyes; then :
     5948  HAVE_LIBVTKDICOM=yes
     5949else
     5950  HAVE_LIBVTKDICOM=no
    59175951fi
    59185952
     
    78117845
    78127846
     7847
     7848
    78137849MAKE=${make_command}
    78147850
  • branches/r9/pkgs/configure.in

    r4912 r4916  
    4949AC_CHECK_HEADERS(sys/sysinfo.h)
    5050
    51 AC_CHECK_LIB(ncurses, clrtoeol,,AC_MSG_ERROR([ncurses library missing?]))
     51HAVE_LIBNCURSES=no
     52AC_CHECK_LIB(ncurses, clrtoeol,HAVE_LIBNCURSES=yes,AC_MSG_ERROR([ncurses library missing?]))
    5253AC_CHECK_HEADERS(ncurses.h,,AC_MSG_WARN(ncurses headers missing ?))
    5354
     
    9091fi
    9192
     93AC_CHECK_LIB(vtkDICOM, main, HAVE_LIBVTKDICOM=yes, HAVE_LIBVTKDICOM=no)
    9294
    9395if test "$with_install" != "yes"; then
     
    120122AC_SUBST(CFLAGS_OPTIMIZE)
    121123AC_SUBST(HAVE_INTTYPES_H)
     124AC_SUBST(HAVE_LIBVTKDICOM)
     125AC_SUBST(HAVE_LIBNCURSES)
    122126AC_SUBST(INSTALL_PREFIX)
    123127AC_SUBST(LIB_SEARCH_DIRS)
  • branches/r9/pkgs/diffview/diffview.c

    r4852 r4916  
    27712771/*
    27722772 * ------------------------------------------------------------------------
    2773  *  RapptureDiffview_Init --
     2773 *  Rappture_diffview_Init --
    27742774 *
    27752775 *  Invoked when the Rappture GUI library is being initialized
     
    27812781 */
    27822782int
    2783 RapptureDiffview_Init(interp)
     2783Rappture_diffview_Init(interp)
    27842784    Tcl_Interp *interp;         /* interpreter being initialized */
    27852785{
  • branches/r9/pkgs/diffview/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureDiffView${version}${ext}"] \
    6         RapptureDiffView_Init
     5    load [file join $dir "RapptureDiffView${version}${ext}"] Rappture_diffview
    76    package provide RapptureDiffView $version
    87} $dir]
  • branches/r9/pkgs/hotspot/hotspot.c

    r4852 r4916  
    18271827/*
    18281828 * ------------------------------------------------------------------------
    1829  *  RapptureCanvasHotspot_Init --
     1829 *  Rappture_canvas_hotspot_Init --
    18301830 *
    18311831 *  Invoked when the Rappture GUI library is being initialized
     
    18371837 */
    18381838int
    1839 RapptureCanvasHotspot_Init(interp)
     1839Rappture_canvas_hotspot_Init(interp)
    18401840    Tcl_Interp *interp;         /* interpreter being initialized */
    18411841{
  • branches/r9/pkgs/hotspot/pkgIndex.tcl.in

    r4842 r4916  
    44    set ext [info sharedlibextension]
    55    load [file join $dir "RapptureCanvasHotspot${version}${ext}"] \
    6                 RpCanvHotspot_Init
     6                Rappture_canvas_hotspot
    77    package provide RapptureCanvasHotspot $version
    88} $dir]
  • branches/r9/pkgs/listbox/RpListbox.c

    r4852 r4916  
    582582/*
    583583 * ------------------------------------------------------------------------
    584  *  RpListbox_Init --
    585  *
    586  *  Invoked when the Rappture GUI library is being initialized
     584 *  Rappture_listbox_Init --
     585 *
     586 *  Invoked when the Rappture listbox library is being initialized
    587587 *  to install the Rappture "listbox" widget.
    588588 *
     
    592592 */
    593593int
    594 RpListbox_Init(interp)
     594Rappture_listbox_Init(interp)
    595595    Tcl_Interp *interp;         /* interpreter being initialized */
    596596{
  • branches/r9/pkgs/listbox/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureListbox${version}${ext}"] RpListbox_Init
     5    load [file join $dir "RapptureListbox${version}${ext}"] Rappture_listbox
    66    package provide RapptureListbox $version
    77} $dir]
  • branches/r9/pkgs/placard/pkgIndex.tcl.in

    r4843 r4916  
    44    set ext [info sharedlibextension]
    55    load [file join $dir "RapptureCanvasPlacard${version}${ext}"] \
    6         RapptureCanvasPlacard_Init
     6        Rappture_canvas_placard
    77    package provide RapptureCanvasPlacard $version
    88} $dir]
  • branches/r9/pkgs/placard/placard.c

    r4859 r4916  
    14401440/*
    14411441 * ------------------------------------------------------------------------
    1442  *  RapptureCanvasPlacard_Init --
     1442 *  Rappture_canvas_placard_Init --
    14431443 *
    14441444 *  Invoked when the Rappture GUI library is being initialized
     
    14501450 */
    14511451int
    1452 RapptureCanvasPlacard_Init(interp)
     1452Rappture_canvas_placard_Init(interp)
    14531453    Tcl_Interp *interp;         /* interpreter being initialized */
    14541454{
  • branches/r9/pkgs/readpoints/pkgIndex.tcl.in

    r4912 r4916  
    44    set ext [info sharedlibextension]
    55    load [file join $dir "RapptureReadPoints${version}${ext}"] \
    6         RapptureReadPoints_Init
     6        Rappture_readpoints
    77    package provide RapptureReadPoints $version
    88} $dir]
  • branches/r9/pkgs/readpoints/readPoints.c

    r4852 r4916  
    167167/*
    168168 * ------------------------------------------------------------------------
    169  *  RapptureReadPoints_Init --
     169 *  Rappture_readpoints_Init --
    170170 *
    171171 *  Invoked when the Rappture GUI library is being initialized
     
    177177 */
    178178int
    179 RapptureReadPoints_Init(Tcl_Interp *interp)
     179Rappture_readpoints_Init(Tcl_Interp *interp)
    180180{
    181181    /* install the widget command */
  • branches/r9/pkgs/squeezer/RpSqueezer.c

    r4852 r4916  
    207207 */
    208208int
    209 RapptureSqueezer_Init(interp)
     209Rappture_squeezer_Init(interp)
    210210    Tcl_Interp *interp;         /* interpreter being initialized */
    211211{
  • branches/r9/pkgs/squeezer/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureSqueezer${version}${ext}"] RapptureSqueezer
     5    load [file join $dir "RapptureSqueezer${version}${ext}"] Rappture_squeezer
    66    package provide RapptureSqueezer $version
    77} $dir]
  • branches/r9/pkgs/system/Makefile.in

    r4912 r4916  
    1717CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
    1818CXX             = @CXX@
    19 HAVE_NCURSES    = @HAVE_LIBNCURSES@
     19HAVE_LIBNCURSES = @HAVE_LIBNCURSES@
    2020INSTALL         = @INSTALL@
    2121LIB_RUNTIME_DIR = $(libdir)
    22 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    2322LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    2423MKDIR_P         = @MKDIR_P@
     
    4847DEFINES =       -DRAPPTURE_VERSION=\"$(version)\"
    4948
    50 
    5149CDEBUGFLAGS =   -g -Wall
    5250
    5351
    5452OBJS =          \
     53                daemon.o \
    5554                init.o \
    56                 daemon.o \
    5755                op.o \
    5856                rlimit.o \
     
    6664endif
    6765
    68 ifeq ($(HAVE_LIBCURSES),yes)
     66ifeq ($(HAVE_LIBNCURSES),yes)
    6967   OBJS += curses.o
    7068   LIBS += -lncurses
  • branches/r9/pkgs/system/curses.c

    r4852 r4916  
    2222 * ======================================================================
    2323 */
     24#include "config.h"
    2425#include "tcl.h"
    2526#include <string.h>
  • branches/r9/pkgs/system/init.c

    r4852 r4916  
    3535#endif
    3636int
    37 RapptureSystem_Init( Tcl_Interp * interp)
     37Rappture_system_Init( Tcl_Interp * interp)
    3838{
    3939#ifdef _WIN32
     
    5858        return TCL_ERROR;
    5959    }
     60#ifdef HAVE_LIBNCURSES
    6061    if (RpCurses_Init(interp) != TCL_OK) {
    6162        return TCL_ERROR;
    6263    }
     64#endif
    6365    return TCL_OK;
    6466}
  • branches/r9/pkgs/system/pkgIndex.tcl.in

    r4912 r4916  
    33    set version @PACKAGE_VERSION@
    44    set ext [info sharedlibextension]
    5     load [file join $dir "RapptureSystem${version}${ext}"] \
    6                 RapptureSystem_Init
     5    load [file join $dir "RapptureSystem${version}${ext}"] Rappture_system
    76    package provide RapptureSystem $version
    87} $dir]
     8
     9
  • branches/r9/rapptureConfig.sh.in

    r4915 r4916  
    2828WITH_TCL=@WITH_TCL@
    2929WITH_VTK=@WITH_VTK@
     30VTK_VERSION=@VTK_VERSION@
    3031
Note: See TracChangeset for help on using the changeset viewer.