Changeset 3739


Ignore:
Timestamp:
Jul 3, 2013 8:39:28 AM (7 years ago)
Author:
gah
Message:

bandaid R bindings for R 3.0.1

Location:
branches/1.3
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/Makefile.in

    r3717 r3739  
    4545
    4646all: $(TARGETS)
    47         for i in $(TARGETS) ; do \
    48           $(MAKE) -C $$i all || exit 1 ;\
    49         done
     47
     48$(TARGETS):
     49        $(MAKE) -C $@ all
     50
    5051test:
    5152        $(MAKE) -C test all
  • branches/1.3/configure

    r3717 r3739  
    671671OCTAVE_VERSION_MAJOR
    672672OCTAVE_VERSION
     673SVN_VERSION
    673674MKOCTFILE3
    674675MKOCTFILE2
     
    72877288
    72887289
     7290SVN_VERSION=`svnversion $srcdir`
     7291
    72897292make_command=""
    72907293for m in "$MAKE" make gmake gnumake ; do
     
    1015010153
    1015110154
     10155
    1015210156ac_configure_args="--disable-threads --enable-shared"
    1015310157
     
    1015610160
    1015710161
    10158 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
     10162ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
    1015910163
    1016010164cat >confcache <<\_ACEOF
     
    1089510899    "lang/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/Makefile" ;;
    1089610900    "lang/tcl/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES lang/tcl/pkgIndex.tcl" ;;
     10901    "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;;
    1089710902    "lang/tcl/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/src/Makefile" ;;
    10898     "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;;
    1089910903    "lang/tcl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/tests/Makefile" ;;
    1090010904    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
  • branches/1.3/configure.in

    r3717 r3739  
    106106
    107107SC_CONFIG_CFLAGS
     108
     109SVN_VERSION=`svnversion $srcdir`
    108110
    109111make_command=""
     
    360362AC_SUBST(MKOCTFILE2)
    361363AC_SUBST(MKOCTFILE3)
     364AC_SUBST(SVN_VERSION)
    362365AC_SUBST(OCTAVE_VERSION)
    363366AC_SUBST(OCTAVE_VERSION_MAJOR)
     
    471474    lang/tcl/Makefile
    472475    lang/tcl/pkgIndex.tcl
     476    lang/tcl/scripts/Makefile
    473477    lang/tcl/src/Makefile
    474     lang/tcl/scripts/Makefile
    475478    lang/tcl/tests/Makefile
    476479    lib/Makefile
  • branches/1.3/examples/Makefile.in

    r3471 r3739  
    3131.PHONY: all install clean distclean $(SUBDIRS)
    3232
    33 all:
    34         for i in $(SUBDIRS) ; do \
    35             $(MAKE) -C $$i all || exit 1 ; \
    36         done
     33all: $(SUBDIRS)
     34
     35$(SUBDIRS):
     36        $(MAKE) -C $@ all
    3737
    3838install:
  • branches/1.3/examples/zoo/mesh/mesh.m

    r3735 r3739  
    1313
    1414switch meshtype
    15   case 'unirect2d'
    16     mesh = 'output.unirect2d';
    17     rpLibPutString(lib, 'output.unirect2d.about.label', \
    18                    'unirect2d mesh (deprecated)', 0);
    19     rpLibPutString(lib, 'output.unirect2d.dim', '2', 0);
    20     rpLibPutString(lib, 'output.unirect2d.units', 'm', 0);
    21     rpLibPutString(lib, 'output.unirect2d.hide', 'yes', 0);
    22 
    23     % Create a unirect2d mesh.  The mesh will be used in the 'field'
    24     % object below. We will specify a mesh and then provide the data
    25     % points to the field.
    26 
    27     rpLibPutString(lib, 'output.unirect2d.xaxis.label', 'Fermi-Dirac Factor',0);
    28     rpLibPutString(lib, 'output.unirect2d.yaxis.label', 'Energy', 0);
    29 
    30     % The uniform grid that we are specifying is a mesh of 50 points on
    31     % the x-axis and 50 points on the y-axis.  The 50 points are
    32     % equidistant between 0.0 and 1.0
    33 
    34     % Specify the x-axis of the mesh
    35     rpLibPutString(lib, 'output.unirect2d.xaxis.min', '0.0', 0);
    36     rpLibPutString(lib, 'output.unirect2d.xaxis.max', '1.0', 0);
    37     rpLibPutString(lib, 'output.unirect2d.xaxis.numpoints', '50', 0);
    38    
    39     % Specify the y-axis of the mesh
    40     rpLibPutString(lib, 'output.unirect2d.yaxis.min', '0.0', 0);
    41     rpLibPutString(lib, 'output.unirect2d.yaxis.max', '1.0', 0);
    42     rpLibPutString(lib, 'output.unirect2d.yaxis.numpoints', '50', 0);
    43 
    44   case 'oldcloud'
    45     mesh = 'output.cloud';
    46     rpLibPutString(lib, 'output.cloud.about.label', 'cloud (deprecated)', 0);
    47     rpLibPutString(lib, 'output.cloud.dim', '2', 0);
    48     rpLibPutString(lib, 'output.cloud.units', 'm', 0);
    49     rpLibPutString(lib, 'output.cloud.hide', 'yes', 0);
    50 
    51     xv = linspace(0, 1, 50)
    52     for i = 1:50
    53       for j = 1:50
    54         string = sprintf('%12g  %12g\n', xv(i), xv(j));
    55         rpLibPutString(lib, 'output.cloud.points', string, 1);
    56       endfor
    57     endfor
    58 
    5915  case 'cloud'
    6016    mesh = 'output.mesh';
  • branches/1.3/examples/zoo/mesh/mesh.tcl

    r3735 r3739  
    2222
    2323switch -- $meshtype {
    24     "unirect2d" {
    25         set mesh "output.unirect2d"
    26 
    27         $driver put $mesh.about.label "unirect2d mesh"
    28         $driver put $mesh.dim  2
    29         $driver put $mesh.units "m"
    30         $driver put $mesh.hide "yes"
    31 
    32         # Create a unirect2d mesh.  The mesh will be used in the "field"
    33         # object below. We will specify a mesh and then provide the data
    34         # points to the field.
    35 
    36         $driver put $mesh.xaxis.label "Fermi-Dirac Factor"
    37         $driver put $mesh.yaxis.label "Energy"
    38 
    39         # The uniform grid that we are specifying is a mesh of 50 points on
    40         # the x-axis # and 50 points on the y-axis.  The 50 points are
    41         # equidistant between 0.0 and # 1.0
    42 
    43         # Specify the x-axis of the mesh
    44         $driver put $mesh.xaxis.min 0.0
    45         $driver put $mesh.xaxis.max 1.0
    46         $driver put $mesh.xaxis.numpoints 50
    47        
    48         # Specify the y-axis of the mesh
    49         $driver put $mesh.yaxis.min 0.0
    50         $driver put $mesh.yaxis.max 1.0
    51         $driver put $mesh.yaxis.numpoints 50
    52     }
    53     "oldcloud" {
    54         set mesh output.cloud
    55         $driver put $mesh.about.label "cloud (deprecated)"
    56         $driver put $mesh.dim  2
    57         $driver put $mesh.units "m"
    58         $driver put $mesh.hide "yes"
    59 
    60         set points {}
    61         foreach y [$xv range 0 end] {
    62             foreach x [$xv range 0 end] {
    63                 append points "$x $y\n"
    64             }
    65         }
    66    
    67         # Test old-style cloud element.
    68         $driver put $mesh.units "m"
    69         $driver put $mesh.points $points
    70     }
    7124    "cloud" {
    7225        set mesh output.mesh
  • branches/1.3/examples/zoo/mesh/tool.xml

    r3483 r3739  
    77 <input>
    88   <choice id="mesh">
    9     <option>
    10      <about>
    11       <label>unirect2d (deprecated)</label>
    12       <description>Uniform 2D grid using old-style unirect2d element.</description>
    13      </about>
    14      <value>unirect2d</value>
    15     </option>
    16     <option>
    17      <about>
    18       <label>cloud (deprecated)</label>
    19       <description>2 dimensional cloud of points using old-style cloud element.</description>
    20      </about>
    21      <value>oldcloud</value>
    22     </option>
    239    <option>
    2410     <about>
  • branches/1.3/examples/zoo/mesh/tool2.xml

    r3735 r3739  
    77 <input>
    88   <choice id="mesh">
    9     <option>
    10      <about>
    11       <label>unirect2d (deprecated)</label>
    12       <description>Uniform 2D grid using old-style unirect2d element.</description>
    13      </about>
    14      <value>unirect2d</value>
    15     </option>
    16     <option>
    17      <about>
    18       <label>cloud (deprecated)</label>
    19       <description>2 dimensional cloud of points using old-style cloud element.</description>
    20      </about>
    21      <value>oldcloud</value>
    229    </option>
    2310    <option>
  • branches/1.3/gui/scripts/drawingentry.tcl

    r3671 r3739  
    125125
    126126    # scan through all variables and attach notifications for changes
    127     foreach cpath [$_xmlobj children -as path -type variable $_path.substitutions] {
     127    set subs [$_xmlobj children -as path -type variable $_path.substitutions]
     128    foreach cpath $subs {
    128129        set map ""
    129130        set name ""
     
    171172
    172173    # find all embedded controls and build a popup for each hotspot
    173     foreach cpath [$_xmlobj children -type hotspot -as path $_path.components] {
     174    set hotspots [$_xmlobj children -type hotspot -as path $_path.components]
     175    foreach cpath $hotspots {
    174176        set listOfControls [$_xmlobj children -type controls $cpath]
    175177        if {[llength $listOfControls] > 0} {
     
    190192        }
    191193    }
    192 
    193194    set c $itk_component(drawing)
    194     foreach cpath [$_xmlobj children -type text -as path $_path.components] {
     195    set texts [$_xmlobj children -type text -as path $_path.components]
     196    foreach cpath $texts {
    195197        set popup ""
    196198        set mode [XmlGetSubst $cpath.hotspot]
     
    601603            set width [expr [image width $img] / 4]
    602604        } else {
    603             set width [expr [ScreenX $w] - [ScreenX 0]]
     605            set width [expr int([ScreenX $w] - [ScreenX 0])]
    604606        }
    605607        set h [XmlGetSubst $cpath.height]
     
    607609            set height [expr [image height $img] / 4]
    608610        } else {
    609             set height [expr [ScreenY $h] - [ScreenY 0]]
     611            set height [expr int([ScreenY $h] - [ScreenY 0])]
    610612        }
    611613        if { $width != [image width $img] || $height != [image height $img] } {
    612614            set dst [image create photo -width $width -height $height]
    613             blt::winop resample $img $dst
     615            blt::winop resample $img $dst box
    614616            image delete $img
    615617            set img $dst
     
    627629            set x2 $tmp
    628630        }
    629         set width [expr {$x2 - $x1 + 1}]
    630         set height [expr {$y2 - $y1 + 1}]
     631        set width [expr {int($x2 - $x1 + 1)}]
     632        set height [expr {int($y2 - $y1 + 1)}]
    631633        if { $width != [image width $img] || $height != [image height $img] } {
    632634            set dst [image create photo -width $width -height $height]
    633             blt::winop resample $img $dst
     635            blt::winop resample $img $dst box
    634636            image delete $img
    635637            set img $dst
     
    639641        set height [expr [image height $img] / 4]
    640642        set dst [image create photo -width $width -height $height]
    641         blt::winop resample $img $dst
     643        blt::winop resample $img $dst box
    642644        image delete $img
    643645        set img $dst
     
    971973
    972974    if {$bad ne ""} {
    973         puts "WARNING: $bad"
    974         puts "assuming default \"0 0 1 1\" coordinates"
     975        puts stderr "WARNING: $bad"
     976        puts stderr "assuming default \"0 0 1 1\" coordinates"
    975977        array set xvals {1 0 2 1}
    976978        array set yvals {1 0 2 1}
     
    10311033            }
    10321034            default {
    1033                 puts "WARNING: don't understand \"$elem\" in $_path"
     1035                puts stderr "WARNING: don't understand \"$elem\" in $_path"
    10341036            }
    10351037        }
     
    10421044itcl::body Rappture::DrawingEntry::Invoke {cpath x y} {
    10431045    if {![info exists _cpath2popup($cpath)]} {
    1044         puts "WARNING: no controls for hotspot at $cpath"
     1046        puts stderr "WARNING: no controls for hotspot at $cpath"
    10451047        return
    10461048    }
  • branches/1.3/gui/scripts/gauge.tcl

    r3654 r3739  
    462462
    463463    if {$state} {
    464         $itk_component($comp) configure -relief solid
     464        $itk_component($comp) configure -relief flat
    465465    } else {
    466466        if {$comp eq "presets"} {
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r3694 r3739  
    19991999            set tag $dataobj-$cname
    20002000            set contents [$dataobj vtkdata $cname]
    2001             append bytes "$contents\n\n"
     2001            append bytes "$contents\n"
    20022002        }
    20032003    }
     
    21172117    SendCmd "glyphs add arrow $tag"
    21182118    SendCmd "glyphs edges $style(-edges) $tag"
    2119     SendCmd "glyphs gscale 20 $tag"
     2119    # normscale=1 and gscale=1 are defaults
     2120    #SendCmd "glyphs normscale 1 $tag"
     2121    #SendCmd "glyphs gscale 1 $tag"
    21202122    SendCmd "outline add $tag"
    21212123    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r3656 r3739  
    389389
    390390    set _image(download) [image create photo]
    391 
     391    puts stderr "args=$args"
    392392    eval itk_initialize $args
    393393    Connect
  • branches/1.3/lang/Makefile.in

    r3603 r3739  
    5252endif
    5353
    54 .PHONY: all install test clean distclean tcl octave matlab perl python ruby java R
     54.PHONY: all install test clean distclean $(LANGS)
    5555
    56 all:
    57         for i in $(LANGS) ; do \
    58           $(MAKE) -C $$i all || exit 1 ;\
    59         done
     56
     57all: $(LANGS)
     58
     59$(LANGS):
     60        $(MAKE) -C $@ all
    6061
    6162install:
  • branches/1.3/lang/R/Makefile.in

    r3717 r3739  
    2121R               = @R@
    2222
    23 coresrcdir      = ${PWD}/../../rappture/src/core
    24 corelibdir      = ${PWD}/../src/core
    25 R_flags         = --configure-args='--with-rappture-include=$(coresrcdir)\
     23coresrcdir      = ${PWD}/$(srcdir)/../../src/core
     24corelibdir      = ${PWD}/../../src/core
     25R_flags         = --configure-args='--with-rappture-include=$(coresrcdir) \
    2626                                    --with-rappture-lib=$(corelibdir)'
    2727
    28 Rlib            = $(libdir)/R
     28RLIB            = R
    2929
    3030#       $(MKDIR_P) -m 0755 ${PWD}/build
    3131#       tar -C ${PWD}/build -clf - . | tar -C $(Rlib) -xpf -
    3232
    33 all:
    34         $(R) CMD build $(srcdir)/Rappture
    35         tar xvzf Rappture_1.0.tar.gz
     33all: $(RLIB)
    3634
    37 install:
    38         $(MKDIR_P) -m 0755 $(Rlib)
    39         $(R) CMD INSTALL $(R_flags) --library=$(Rlib) Rappture
     35$(RLIB):
     36        tar -C $(srcdir) -clf - Rappture | tar -xpf -
     37        $(MKDIR_P) -m 0755 $(RLIB)
     38        $(R) CMD build Rappture
     39        LD_LIBRARY_PATH=$(libdir) $(R) CMD INSTALL $(R_flags) --library=$(RLIB) Rappture
     40
     41install: $(RLIB)
     42        $(RM) -rf $(libdir)/$(RLIB)
     43        $(MKDIR_P) -m 0755 $(RLIB)
     44        tar -clf - $(RLIB) | tar -C $(libdir) -xpf - 
    4045
    4146clean:
    42         $(RM) -rf Rappture ${PWD}/build
     47        $(RM) -r $(RLIB)
     48        $(RM) -rf Rappture Rappture_1.0.tar.gz
    4349
    4450distclean: clean
  • branches/1.3/lang/R/Rappture/man/Rappture-package.Rd

    r2709 r3739  
    3131~~ Literature or other references for background information ~~
    3232}
    33 ~~ Optionally other standard keywords, one per line, from file KEYWORDS in ~~
    34 ~~ the R documentation directory ~~
    3533\keyword{ package }
    3634\seealso{
  • branches/1.3/lang/R/Rappture/src/RpLibraryRInterface.cc

    r3177 r3739  
    2424rp_lib_finalizer(SEXP ptr)
    2525{
    26     RpLibrary* lib = NULL;
    2726    if (!R_ExternalPtrAddr(ptr)) {
    2827        return;
    2928    }
    30     lib = (RpLibrary *) R_ExternalPtrAddr(ptr);
     29#ifdef notdef
     30    /* Until we figure this out, don't delete the library object.  R is
     31     * calling the finalizer on every method of the library object.  This is a
     32     * problem only if someone explicitly deletes the library object from
     33     * R. */
     34    RpLibrary* lib;
     35    lib = (RpLibrary *)R_ExternalPtrAddr(ptr);
    3136    if (lib != NULL) {
    3237        delete lib;
    33         lib = NULL;
    34     }
     38    }
     39#endif
    3540    R_ClearExternalPtr(ptr);
    36 
    3741}
    3842
     
    9296    SEXP path)              // null terminated path
    9397{
    94     RpLibrary* lib = NULL;
     98    RpLibrary* lib;
    9599    SEXP ans;
    96100    int handleVal = -1;
     
    123127
    124128    lib = (RpLibrary*) getObject_Void(handleVal);
    125 
    126129    if (lib == NULL) {
    127130        error("invalid Rappture Library Object");
  • branches/1.3/lang/tcl/pkgIndex.tcl.in

    r2298 r3739  
    55    namespace eval Rappture {
    66        variable version $version
     7        variable build "@SVN_VERSION@"
    78        variable installdir [file normalize $dir]
    89    }
     
    1415    package provide Rappture $version
    1516} $dir]
     17
  • branches/1.3/lang/tcl/src/Makefile.in

    r3729 r3739  
    4040  -I$(includedir)
    4141RAPPTURE_VERSION = @PACKAGE_VERSION@
    42 SVN_VERSION     := $(shell svnversion $(srcdir))
    43 DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
    44                   -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
     42SVN_VERSION     := $(shell svnversion $(srcdir))
     43DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
     44                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
    4545
    4646RANLIB          = @RANLIB@
  • branches/1.3/lang/tcl/src/Rappture_Init.c

    r3729 r3739  
    5353        return TCL_ERROR;
    5454    }
    55     if (Tcl_SetVar(interp, "::Rappture::version", RAPPTURE_VERSION,
    56                    TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
    57         return TCL_ERROR;
    58     }
    59     if (Tcl_SetVar(interp, "::Rappture::build", SVN_VERSION,
    60                    TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
    61         return TCL_ERROR;
    62     }
    6355#ifdef notdef
    6456    if (RpLibrary_Init(interp) != TCL_OK) {
Note: See TracChangeset for help on using the changeset viewer.