Changeset 3730 for trunk/lang

Timestamp:

Jun 29, 2013, 3:43:27 PM (11 years ago)

Author:

ldelgass

Message:

Merge version/build variables for Tcl from 1.3 release branch.

Location:

trunk/lang/tcl

Files:

• scripts/result.tcl (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/Rappture_Init.c (modified) (1 diff)

trunk/lang/tcl/scripts/result.tcl

@@ -40 +40 @@
     }
 
-    $libobj put tool.version.rappture.revision "\$LastChangedRevision$"
+    # I can't stand that there are two versions of this.  I spend more time
+    # tracking down problems that exist in the one version but not the other.
+    # For example, it matters if the tool is running TCL or some other
+    # language.
+
+    $libobj put tool.version.rappture.version $::Rappture::version
+    $libobj put tool.version.rappture.revision $::Rappture::build
     $libobj put tool.version.rappture.modified "\$LastChangedDate$"
     $libobj put tool.version.rappture.language "tcl"

trunk/lang/tcl/src/Makefile.in

@@ -39 +39 @@
   -I$(srcdir)/../../../src/objects \
   -I$(includedir)
-version         = @PACKAGE_VERSION@
-DEFINES         = -DPACKAGE_VERSION=\"$(version)\"
+RAPPTURE_VERSION = @PACKAGE_VERSION@
+SVN_VERSION     := $(shell svnversion $(srcdir))
+DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
+                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
 
 RANLIB          = @RANLIB@
@@ -79 +81 @@
 # Not using     RpLibraryTclInterface.o \
 
-name        = Rappture$(version)
+name        = Rappture$(RAPPTURE_VERSION)
 libname     = $(name)
 lib         = $(libname)$(SHLIB_SUFFIX)

trunk/lang/tcl/src/Rappture_Init.c

@@ -50 +50 @@
         return TCL_ERROR;
     }
-    if (Tcl_PkgProvide(interp, "Rappture", PACKAGE_VERSION) != TCL_OK) {
+    if (Tcl_PkgProvide(interp, "Rappture", RAPPTURE_VERSION) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_SetVar(interp, "::Rappture::version", RAPPTURE_VERSION,
+                   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) {
         return TCL_ERROR;
     }