Changeset 3741

Timestamp:

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

Author:

gah

Message:

fix Makefile

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• gui/scripts/drawingentry.tcl (modified) (10 diffs)
• lang/R/Makefile.in (modified) (1 diff)
• lang/R/Rappture/man/Rappture-package.Rd (modified) (1 diff)
• lang/R/Rappture/src/RpLibraryRInterface.cc (modified) (3 diffs)

trunk/Makefile.in

@@ -44 +44 @@
 .PHONY: all test install clean distclean package distrib runtime-distrib $(TARGETS)
 
-all: $(TARGETS)
-
-$(TARGETS):
-        $(MAKE) -C $@ all
+all:
+        for i in $(TARGETS) ; do \
+          $(MAKE) -C $$i all || exit 1 ;\
+        done
 
 test:

trunk/gui/scripts/drawingentry.tcl

@@ -125 +125 @@
 
     # scan through all variables and attach notifications for changes
-    foreach cpath [$_xmlobj children -as path -type variable $_path.substitutions] {
+    set subs [$_xmlobj children -as path -type variable $_path.substitutions]
+    foreach cpath $subs {
         set map ""
         set name ""
@@ -171 +172 @@
 
     # find all embedded controls and build a popup for each hotspot
-    foreach cpath [$_xmlobj children -type hotspot -as path $_path.components] {
+    set hotspots [$_xmlobj children -type hotspot -as path $_path.components]
+    foreach cpath $hotspots {
         set listOfControls [$_xmlobj children -type controls $cpath]
         if {[llength $listOfControls] > 0} {
@@ -190 +192 @@
         }
     }
-
     set c $itk_component(drawing)
-    foreach cpath [$_xmlobj children -type text -as path $_path.components] {
+    set texts [$_xmlobj children -type text -as path $_path.components] 
+    foreach cpath $texts {
         set popup ""
         set mode [XmlGetSubst $cpath.hotspot]
@@ -601 +603 @@
             set width [expr [image width $img] / 4]
         } else {
-            set width [expr [ScreenX $w] - [ScreenX 0]]
+            set width [expr int([ScreenX $w] - [ScreenX 0])]
         }
         set h [XmlGetSubst $cpath.height]
@@ -607 +609 @@
             set height [expr [image height $img] / 4]
         } else {
-            set height [expr [ScreenY $h] - [ScreenY 0]]
+            set height [expr int([ScreenY $h] - [ScreenY 0])]
         }
         if { $width != [image width $img] || $height != [image height $img] } {
             set dst [image create photo -width $width -height $height]
-            blt::winop resample $img $dst
+            blt::winop resample $img $dst box
             image delete $img
             set img $dst
@@ -627 +629 @@
             set x2 $tmp
         }
-        set width [expr {$x2 - $x1 + 1}]
-        set height [expr {$y2 - $y1 + 1}]
+        set width [expr {int($x2 - $x1 + 1)}]
+        set height [expr {int($y2 - $y1 + 1)}]
         if { $width != [image width $img] || $height != [image height $img] } {
             set dst [image create photo -width $width -height $height]
-            blt::winop resample $img $dst
+            blt::winop resample $img $dst box
             image delete $img
             set img $dst
@@ -639 +641 @@
         set height [expr [image height $img] / 4]
         set dst [image create photo -width $width -height $height]
-        blt::winop resample $img $dst
+        blt::winop resample $img $dst box
         image delete $img
         set img $dst
@@ -971 +973 @@
 
     if {$bad ne ""} {
-        puts "WARNING: $bad"
-        puts "assuming default \"0 0 1 1\" coordinates"
+        puts stderr "WARNING: $bad"
+        puts stderr "assuming default \"0 0 1 1\" coordinates"
         array set xvals {1 0 2 1}
         array set yvals {1 0 2 1}
@@ -1031 +1033 @@
             }
             default {
-                puts "WARNING: don't understand \"$elem\" in $_path"
+                puts stderr "WARNING: don't understand \"$elem\" in $_path"
             }
         }
@@ -1042 +1044 @@
 itcl::body Rappture::DrawingEntry::Invoke {cpath x y} {
     if {![info exists _cpath2popup($cpath)]} {
-        puts "WARNING: no controls for hotspot at $cpath"
+        puts stderr "WARNING: no controls for hotspot at $cpath"
         return
     }

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");