Changeset 3741 for trunk/lang/R

Timestamp:

Jul 3, 2013, 9:10:00 AM (11 years ago)

Author:

gah

Message:

fix Makefile

Location:

trunk/lang/R

Files:

• Makefile.in (modified) (1 diff)
• Rappture/man/Rappture-package.Rd (modified) (1 diff)
• Rappture/src/RpLibraryRInterface.cc (modified) (3 diffs)

trunk/lang/R/Makefile.in

@@ -21 +21 @@
 R               = @R@
 
-coresrcdir      = ${PWD}/../../rappture/src/core
-corelibdir      = ${PWD}/../src/core
-R_flags         = --configure-args='--with-rappture-include=$(includedir)\
-                                    --with-rappture-lib=$(libdir)'
+coresrcdir      = ${PWD}/$(srcdir)/../../src/core
+corelibdir      = ${PWD}/../../src/core
+R_flags         = --configure-args='--with-rappture-include=$(coresrcdir) \
+                                    --with-rappture-lib=$(corelibdir)'
 
 RLIB            = R

trunk/lang/R/Rappture/man/Rappture-package.Rd

@@ -31 +31 @@
 ~~ Literature or other references for background information ~~
 }
-~~ Optionally other standard keywords, one per line, from file KEYWORDS in ~~
-~~ the R documentation directory ~~
 \keyword{ package }
 \seealso{

trunk/lang/R/Rappture/src/RpLibraryRInterface.cc

@@ -24 +24 @@
 rp_lib_finalizer(SEXP ptr)
 {
-    RpLibrary* lib = NULL;
     if (!R_ExternalPtrAddr(ptr)) {
         return;
     }
-    lib = (RpLibrary *) R_ExternalPtrAddr(ptr);
+#ifdef notdef
+    /* Until we figure this out, don't delete the library object.  R is
+     * calling the finalizer on every method of the library object.  This is a
+     * problem only if someone explicitly deletes the library object from
+     * R. */
+    RpLibrary* lib;
+    lib = (RpLibrary *)R_ExternalPtrAddr(ptr);
     if (lib != NULL) {
         delete lib;
-        lib = NULL;
-    }
+    }
+#endif
     R_ClearExternalPtr(ptr);
-
 }
 
@@ -92 +96 @@
     SEXP path)              // null terminated path
 {
-    RpLibrary* lib = NULL;
+    RpLibrary* lib;
     SEXP ans;
     int handleVal = -1;
@@ -123 +127 @@
 
     lib = (RpLibrary*) getObject_Void(handleVal);
-
     if (lib == NULL) {
         error("invalid Rappture Library Object");