Changeset 3729 for branches

Timestamp:

Jun 29, 2013 3:25:10 PM (11 years ago)

Author:

ldelgass

Message:

Fixes for Rappture version/build variables (Tcl_SetVar returns NULL on error),
also fix build to include Rappture version number on .so file.

Location:

branches/1.3/lang/tcl/src

Files:

• Makefile.in (modified) (1 diff)
• Rappture_Init.c (modified) (1 diff)

branches/1.3/lang/tcl/src/Makefile.in

@@ -81 +81 @@
 # Not using     RpLibraryTclInterface.o \
 
-name        = Rappture$(version)
+name        = Rappture$(RAPPTURE_VERSION)
 libname     = $(name)
 lib         = $(libname)$(SHLIB_SUFFIX)

branches/1.3/lang/tcl/src/Rappture_Init.c

@@ -54 +54 @@
     }
     if (Tcl_SetVar(interp, "::Rappture::version", RAPPTURE_VERSION,
-                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) != NULL) {
+                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
         return TCL_ERROR;
     }
     if (Tcl_SetVar(interp, "::Rappture::build", SVN_VERSION,
-                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) != NULL) {
+                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
         return TCL_ERROR;
     }