Changeset 1100 for trunk/lang/ruby

Timestamp:

Aug 6, 2008 4:20:58 AM (16 years ago)

Author:

gah

Message:

assorted lang fixes

Location:

trunk/lang/ruby

Files:

• Makefile.in (modified) (5 diffs)
• Ruby_Rappture.cc (modified) (2 diffs)

trunk/lang/ruby/Makefile.in

@@ -25 +25 @@
 destdir         = $(libdir)/ruby
 rubydir         = $$RAPPTURE_INSTALL_DIR/lib/ruby
-envfile         = _ruby.env
 
 CXX             = @CXX@
-CC              = @CC@
+CC              = @CXX@
 CFLAGS_DEBUG    = @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
@@ -58 +57 @@
                 $(RUBY_LDFLAGS)
 
-CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
 CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
 
@@ -67 +65 @@
 lib             = Rappture$(SOEXT)
 
-all: $(lib) $(envfile)
+all: $(lib) 
 
 $(lib): $(OBJS)
         $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \
                 $(LIB_SEARCH_DIRS) $(LIBS)
-install: $(lib) $(envfile)
+install: $(lib) 
         $(MKDIR_P) $(destdir)
         $(INSTALL) -m 555 $(lib) $(destdir)
-        $(INSTALL) -m 555 $(envfile) $(bindir)
 
 clean:
@@ -81 +78 @@
 
 distclean: clean
-        $(RM) Makefile *~ build.rb $(envfile)
+        $(RM) Makefile *~ build.rb 
 
 Makefile.ruby: build.rb
@@ -88 +85 @@
 .cc.o:
         $(CXX) $(CXX_SWITCHES) -c $?
-.c.o:
-        $(CC) $(CC_SWITCHES)-c $?
-
-$(envfile):
-        echo 'export RUBYLIB=$(rubydir):$$RUBYLIB' > $(envfile)
 
 old: Makefile.ruby

trunk/lang/ruby/Ruby_Rappture.cc

@@ -396 +396 @@
    strRetVal = RpUnits::convert(STR2CSTR(fromVal), STR2CSTR(toUnitsName), 
                                 NUM2INT(showUnits), &result);
-                                   
    /* Return value */
    if (0 == result)
@@ -409 +408 @@
 #ifdef RAISE_EXCEPTIONS
    else
-      rb_raise(rb_eRuntimeError, "Unable to convert %s to %s", 
+      rb_raise(rb_eRuntimeError, "Unable to convert \"%s\" to \"%s\"", 
                STR2CSTR(fromVal), STR2CSTR(toUnitsName));
 #endif