Changeset 1100 for trunk/lang/ruby


Ignore:
Timestamp:
Aug 6, 2008 4:20:58 AM (13 years ago)
Author:
gah
Message:

assorted lang fixes

Location:
trunk/lang/ruby
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lang/ruby/Makefile.in

    r1090 r1100  
    2525destdir         = $(libdir)/ruby
    2626rubydir         = $$RAPPTURE_INSTALL_DIR/lib/ruby
    27 envfile         = _ruby.env
    2827
    2928CXX             = @CXX@
    30 CC              = @CC@
     29CC              = @CXX@
    3130CFLAGS_DEBUG    = @CFLAGS_DEBUG@
    3231CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
     
    5857                $(RUBY_LDFLAGS)
    5958
    60 CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
    6159CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
    6260
     
    6765lib             = Rappture$(SOEXT)
    6866
    69 all: $(lib) $(envfile)
     67all: $(lib)
    7068
    7169$(lib): $(OBJS)
    7270        $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \
    7371                $(LIB_SEARCH_DIRS) $(LIBS)
    74 install: $(lib) $(envfile)
     72install: $(lib)
    7573        $(MKDIR_P) $(destdir)
    7674        $(INSTALL) -m 555 $(lib) $(destdir)
    77         $(INSTALL) -m 555 $(envfile) $(bindir)
    7875
    7976clean:
     
    8178
    8279distclean: clean
    83         $(RM) Makefile *~ build.rb $(envfile)
     80        $(RM) Makefile *~ build.rb
    8481
    8582Makefile.ruby: build.rb
     
    8885.cc.o:
    8986        $(CXX) $(CXX_SWITCHES) -c $?
    90 .c.o:
    91         $(CC) $(CC_SWITCHES)-c $?
    92 
    93 $(envfile):
    94         echo 'export RUBYLIB=$(rubydir):$$RUBYLIB' > $(envfile)
    9587
    9688old: Makefile.ruby
  • trunk/lang/ruby/Ruby_Rappture.cc

    r1081 r1100  
    396396   strRetVal = RpUnits::convert(STR2CSTR(fromVal), STR2CSTR(toUnitsName),
    397397                                NUM2INT(showUnits), &result);
    398                                    
    399398   /* Return value */
    400399   if (0 == result)
     
    409408#ifdef RAISE_EXCEPTIONS
    410409   else
    411       rb_raise(rb_eRuntimeError, "Unable to convert %s to %s",
     410      rb_raise(rb_eRuntimeError, "Unable to convert \"%s\" to \"%s\"",
    412411               STR2CSTR(fromVal), STR2CSTR(toUnitsName));
    413412#endif
Note: See TracChangeset for help on using the changeset viewer.