Changeset 4057


Ignore:
Timestamp:
Nov 14, 2013, 9:01:50 PM (6 years ago)
Author:
ldelgass
Message:

Remove references to Rappture, as it isn't a dependency of geovis

Location:
trunk/packages/vizservers/geovis
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/geovis/CmdProc.cpp

    r3998 r4057  
    1111#include "CmdProc.h"
    1212
    13 using namespace Rappture;
     13using namespace GeoVis;
    1414
    1515/**
     
    116116 */
    117117Tcl_ObjCmdProc *
    118 Rappture::GetOpFromObj(Tcl_Interp *interp,      /* Interpreter to report errors to */
    119                        int nSpecs,              /* Number of specifications in array */
    120                        CmdSpec *specs,          /* Op specification array */
    121                        int operPos,             /* Position of operation in argument
     118GeoVis::GetOpFromObj(Tcl_Interp *interp,        /* Interpreter to report errors to */
     119                     int nSpecs,                /* Number of specifications in array */
     120                     CmdSpec *specs,            /* Op specification array */
     121                     int operPos,               /* Position of operation in argument
    122122                                                 * list. */
    123                        int objc,                /* Number of arguments in the argument
     123                     int objc,                  /* Number of arguments in the argument
    124124                                                 * vector.  This includes any prefixed
    125125                                                 * arguments */
    126                        Tcl_Obj *const *objv,    /* Argument vector */
    127                        int flags)
     126                     Tcl_Obj *const *objv,      /* Argument vector */
     127                     int flags)
    128128{
    129129    CmdSpec *specPtr;
  • trunk/packages/vizservers/geovis/CmdProc.h

    r3998 r4057  
    66 */
    77
    8 #ifndef RAPPTURE_CMDPROC_H
    9 #define RAPPTURE_CMDPROC_H
     8#ifndef GEOVIS_CMDPROC_H
     9#define GEOVIS_CMDPROC_H
    1010
    1111#include <tcl.h>
    1212
    13 namespace Rappture {
     13namespace GeoVis {
    1414
    1515/**
     
    4343             CmdSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags);
    4444
    45 #define NumCmdSpecs(s) (sizeof(s) / sizeof(Rappture::CmdSpec))
     45#define NumCmdSpecs(s) (sizeof(s) / sizeof(GeoVis::CmdSpec))
    4646
    4747}
  • trunk/packages/vizservers/geovis/RendererCmd.cpp

    r4054 r4057  
    232232}
    233233
    234 static Rappture::CmdSpec cameraOps[] = {
     234static CmdSpec cameraOps[] = {
    235235    {"orient", 1, CameraOrientOp, 6, 6, "qw qx qy qz"},
    236236    {"pan",    1, CameraPanOp, 4, 4, "panX panY"},
     
    248248    Tcl_ObjCmdProc *proc;
    249249
    250     proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,
    251                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     250    proc = GetOpFromObj(interp, nCameraOps, cameraOps,
     251                        CMDSPEC_ARG1, objc, objv, 0);
    252252    if (proc == NULL) {
    253253        return TCL_ERROR;
     
    365365}
    366366
    367 static Rappture::CmdSpec keyOps[] = {
     367static CmdSpec keyOps[] = {
    368368    {"press",    1, KeyPressOp,       3, 3, "key"},
    369369    {"release",  1, KeyReleaseOp,     3, 3, "key"},
     
    377377    Tcl_ObjCmdProc *proc;
    378378
    379     proc = Rappture::GetOpFromObj(interp, nKeyOps, keyOps,
    380                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     379    proc = GetOpFromObj(interp, nKeyOps, keyOps,
     380                        CMDSPEC_ARG1, objc, objv, 0);
    381381    if (proc == NULL) {
    382382        return TCL_ERROR;
     
    505505}
    506506
    507 static Rappture::CmdSpec mapLayerOps[] = {
     507static CmdSpec mapLayerOps[] = {
    508508    {"add",     1, MapLayerAddOp,       6, 6, "type url name"},
    509509    {"delete",  1, MapLayerDeleteOp,    3, 4, "?name?"},
     
    520520    Tcl_ObjCmdProc *proc;
    521521
    522     proc = Rappture::GetOpFromObj(interp, nMapLayerOps, mapLayerOps,
    523                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     522    proc = GetOpFromObj(interp, nMapLayerOps, mapLayerOps,
     523                        CMDSPEC_ARG2, objc, objv, 0);
    524524    if (proc == NULL) {
    525525        return TCL_ERROR;
     
    593593}
    594594
    595 static Rappture::CmdSpec mapOps[] = {
     595static CmdSpec mapOps[] = {
    596596    {"layer",    2, MapLayerOp,       3, 6, "op ?params...?"},
    597597    {"load",     2, MapLoadOp,        4, 5, "options"},
     
    606606    Tcl_ObjCmdProc *proc;
    607607
    608     proc = Rappture::GetOpFromObj(interp, nMapOps, mapOps,
    609                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     608    proc = GetOpFromObj(interp, nMapOps, mapOps,
     609                        CMDSPEC_ARG1, objc, objv, 0);
    610610    if (proc == NULL) {
    611611        return TCL_ERROR;
     
    719719}
    720720
    721 static Rappture::CmdSpec mouseOps[] = {
     721static CmdSpec mouseOps[] = {
    722722    {"click",    1, MouseClickOp,       5, 5, "button x y"},
    723723    {"dblclick", 2, MouseDoubleClickOp, 5, 5, "button x y"},
     
    735735    Tcl_ObjCmdProc *proc;
    736736
    737     proc = Rappture::GetOpFromObj(interp, nMouseOps, mouseOps,
    738                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     737    proc = GetOpFromObj(interp, nMouseOps, mouseOps,
     738                        CMDSPEC_ARG1, objc, objv, 0);
    739739    if (proc == NULL) {
    740740        return TCL_ERROR;
     
    751751}
    752752
    753 static Rappture::CmdSpec rendererOps[] = {
     753static CmdSpec rendererOps[] = {
    754754    {"render",     1, RendererRenderOp, 2, 2, ""},
    755755};
     
    762762    Tcl_ObjCmdProc *proc;
    763763
    764     proc = Rappture::GetOpFromObj(interp, nRendererOps, rendererOps,
    765                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     764    proc = GetOpFromObj(interp, nRendererOps, rendererOps,
     765                        CMDSPEC_ARG1, objc, objv, 0);
    766766    if (proc == NULL) {
    767767        return TCL_ERROR;
     
    801801}
    802802
    803 static Rappture::CmdSpec screenOps[] = {
     803static CmdSpec screenOps[] = {
    804804    {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b"},
    805805    {"size", 1, ScreenSizeOp, 4, 4, "width height"}
     
    813813    Tcl_ObjCmdProc *proc;
    814814
    815     proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,
    816                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     815    proc = GetOpFromObj(interp, nScreenOps, screenOps,
     816                        CMDSPEC_ARG1, objc, objv, 0);
    817817    if (proc == NULL) {
    818818        return TCL_ERROR;
  • trunk/packages/vizservers/geovis/configure

    r4024 r4057  
    636636SHLIB_LD
    637637SHLIB_CFLAGS
    638 RP_LIB_DIR
    639 RP_INC_SPEC
    640 RP_DIR
    641638LD_RPATH
    642639CFLAGS_OPTIMIZE
     
    705702enable_option_checking
    706703with_tcllib
    707 with_rappture
    708704with_osg_includes
    709705with_osg_libs
     
    13391335  --with-tcllib=DIR       location of Tcl binary library libtclstubs.a
    13401336                          [default=/usr/lib]
    1341   --with-rappture=DIR     location of rappture files lib/librappture.a and
    1342                           include/rappture.h [default=/usr]
    13431337  --with-osg-includes=DIR OSG include files are in DIR
    13441338  --with-osg-libs=DIR     OSG libraries are in DIR
     
    23042298
    23052299
    2306 # Check whether --with-rappture was given.
    2307 if test "${with_rappture+set}" = set; then :
    2308   withval=$with_rappture; with_rappture=$withval
    2309 else
    2310   with_rappture=yes
    2311 fi
    2312 
    2313 
    2314 
    23152300# Check whether --with-osg-includes was given.
    23162301if test "${with_osg_includes+set}" = set; then :
     
    50595044#
    50605045# Need to check for the following dependencies:
    5061 #       Rappture headers and library (done)
    5062 #       Tcl headers and library (done)
     5046#       Tcl headers and library
    50635047#       GL headers and library
    50645048#       pthread library
     
    50705054for dir in \
    50715055 ${exec_prefix} \
    5072  ${exec_prefix}/lib \
    5073  ${with_rappture} \
    5074  ${with_rappture}/lib ; do
     5056 ${exec_prefix}/lib ; do
    50755057  tclconfig="${dir}/tclConfig.sh"
    50765058  if test -f "$tclconfig" ; then
     
    50905072if test "x$with_tclinclude" != "x" ; then
    50915073   TCL_INC_SPEC="-I${with_tclinclude}"
    5092 fi
    5093 
    5094 RP_DIR=""
    5095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&5
    5096 $as_echo_n "checking for rappture... " >&6; }
    5097 if test "$with_rappture" == "yes" ; then
    5098   for dir in "$exec_prefix" "/usr" ; do
    5099     if test -r "$dir/include/rappture2/rappture2.h" -a \
    5100      -r "$dir/lib/librappture.a"; then
    5101       RP_DIR="$dir"
    5102       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    5103       RP_LIB_DIR="$dir/lib"
    5104       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
    5105 $as_echo "$dir" >&6; }
    5106       break
    5107     fi
    5108   done
    5109 else
    5110   if test ! -d "$with_rappture" ; then
    5111     as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 5
    5112   fi
    5113   RP_DIR=$with_rappture
    5114   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    5115   RP_LIB_DIR="$with_rappture/lib"
    5116 fi
    5117 if test "x${RP_DIR}" = "x" ; then
    5118   as_fn_error $? "cannot find rappture.h and librappture2.a, try using --with-rappture" "$LINENO" 5
    5119 else
    5120   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_rappture" >&5
    5121 $as_echo "$with_rappture" >&6; }
    51225074fi
    51235075
     
    54335385fi
    54345386done
    5435 
    5436 
    5437 
    54385387
    54395388
  • trunk/packages/vizservers/geovis/configure.in

    r4024 r4057  
    99    [with_tcllib=$withval],
    1010    [with_tcllib=""])
    11 
    12 AC_ARG_WITH(
    13     [rappture],
    14     [AS_HELP_STRING([--with-rappture[=DIR]],
    15         [location of rappture files lib/librappture.a and include/rappture.h @<:@default=/usr@:>@])],
    16     [with_rappture=$withval],
    17     [with_rappture=yes])
    1811
    1912AC_ARG_WITH(
     
    8174#
    8275# Need to check for the following dependencies:
    83 #       Rappture headers and library (done)
    84 #       Tcl headers and library (done)
     76#       Tcl headers and library
    8577#       GL headers and library
    8678#       pthread library
     
    9284for dir in \
    9385 ${exec_prefix} \
    94  ${exec_prefix}/lib \
    95  ${with_rappture} \
    96  ${with_rappture}/lib ; do
     86 ${exec_prefix}/lib ; do
    9787  tclconfig="${dir}/tclConfig.sh"
    9888  if test -f "$tclconfig" ; then
     
    112102if test "x$with_tclinclude" != "x" ; then
    113103   TCL_INC_SPEC="-I${with_tclinclude}"
    114 fi
    115 
    116 RP_DIR=""
    117 AC_MSG_CHECKING([for rappture])
    118 if test "$with_rappture" == "yes" ; then
    119   for dir in "$exec_prefix" "/usr" ; do
    120     if test -r "$dir/include/rappture2/rappture2.h" -a \
    121      -r "$dir/lib/librappture.a"; then
    122       RP_DIR="$dir"
    123       RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"
    124       RP_LIB_DIR="$dir/lib"
    125       AC_MSG_RESULT([$dir])
    126       break
    127     fi
    128   done
    129 else
    130   if test ! -d "$with_rappture" ; then
    131     AC_MSG_ERROR([--with-rappture: no such directory $with_rappture])
    132   fi
    133   RP_DIR=$with_rappture
    134   RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"
    135   RP_LIB_DIR="$with_rappture/lib"
    136 fi
    137 if test "x${RP_DIR}" = "x" ; then
    138   AC_MSG_ERROR([cannot find rappture.h and librappture2.a, try using --with-rappture])
    139 else
    140   AC_MSG_RESULT([$with_rappture])
    141104fi
    142105
     
    162125AC_SUBST(CFLAGS_OPTIMIZE)
    163126AC_SUBST(LD_RPATH)
    164 AC_SUBST(RP_DIR)
    165 AC_SUBST(RP_INC_SPEC)
    166 AC_SUBST(RP_LIB_DIR)
    167127AC_SUBST(SHLIB_CFLAGS)
    168128AC_SUBST(SHLIB_LD)
Note: See TracChangeset for help on using the changeset viewer.