Changeset 134511

Timestamp:

Mar 27, 2015, 9:15:41 PM (9 years ago)

Author:

cal@…

Message:

base: provide macports::version as pure Tcl, and macports_version in Portfile ctxt

Use a pure-Tcl macports::version rather than using C to read a Tcl variable and
pass it back to Tcl(?!). Also make macports::version available in Portfiles as
macports_version so Portfiles can check for the base version and return helpful
error messages rather than failing.

Location:

trunk/base/src/macports1.0

Files:

• macports.c (modified) (2 diffs)
• macports.tcl (modified) (2 diffs)

trunk/base/src/macports1.0/macports.c

@@ -41 +41 @@
 #include "sysctl.h"
 
-static int
-macports__version(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
-{
-        if (objc != 1) {
-                Tcl_WrongNumArgs(interp, 1, objv, NULL);
-                return TCL_ERROR;
-        }
-        Tcl_SetObjResult(interp, Tcl_GetVar2Ex(interp, "macports::autoconf::macports_version", NULL, 0));
-        return TCL_OK;
-}
-
 int
 Macports_Init(Tcl_Interp *interp)
@@ -57 +46 @@
         if (Tcl_InitStubs(interp, "8.4", 0) == NULL)
                 return TCL_ERROR;
-        Tcl_CreateObjCommand(interp, "macports::version", macports__version, NULL, NULL);
         Tcl_CreateObjCommand(interp, "get_systemconfiguration_proxies", GetSystemConfigurationProxiesCmd, NULL, NULL);
         Tcl_CreateObjCommand(interp, "sysctl", SysctlCmd, NULL, NULL);

trunk/base/src/macports1.0/macports.tcl

@@ -81 +81 @@
 }
 
+##
+# Return the version of MacPorts you are running
+#
+# This proc never fails and always returns the current version in the format
+# major.minor.patch. Note that the value of patch will not be meaningful for
+# trunk releases, but we guarantee that it will compare to be greater than any
+# released versions from the same major.minor.x series. You should use the
+# MacPorts-provided Tcl extension "vercmp" to do version number comparisons on
+# the return value of this function.
+proc macports::version {} {
+    return ${macports::autoconf::macports_version}
+}
+
 # Provided UI instantiations
 # For standard messages, the following priorities are defined
@@ -1327 +1340 @@
 
     # Export some utility functions defined here.
+    $workername alias macports_version macports::version
     $workername alias macports_create_thread macports::create_thread
     $workername alias getportworkpath_from_buildpath macports::getportworkpath_from_buildpath