Changeset 14736 for trunk/base

Timestamp:

Oct 20, 2005, 9:26:43 PM (19 years ago)

Author:

jberry

Message:

• Handle some issues with the fact that dportopen sets the current directory, and that relative urls for subsequent ports to be processed can break when it does. So we now save and restore the cd in foreachport, and during a few other operations. The best solution down the road would be to stop dportopen from setting the current directory...I have a feeling this isn't used anywhere...but I don't want to risk it so close to shipping 1.2.

• Add action "url" to return the URL to a given port. This is suitable for feeding back into port to specify the port in the future.

• Fix errors in parsing D and U (directory and url) options. These should be deprecated, as there is little reason to have them anymore.

• Option "u" was apparently duplicated, unless I messed that up somewhere up the road, so I changed it to "U".

File:

• trunk/base/src/port/port.tcl (modified) (9 diffs)

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.136 2005/10/17 00:45:14 jberry Exp $
+# $Id: port.tcl,v 1.137 2005/10/20 21:26:43 jberry Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -155 +155 @@
         
 Valid actions are:
-        help, info, location, provides, activate, deactivate, selfupdate,
-        upgrade, version, compact, uncompact, uninstall, installed, outdated,
-        contents, deps, variants, search, list, echo, sync, dir, file, cat, edit,
+        help, info, location, provides, activate, deactivate, selfupdate, upgrade,
+        version, compact, uncompact, uninstall, installed, outdated, contents, deps,
+        variants, search, list, echo, sync, dir, url, file, cat, edit,
         fetch, patch, extract, build, destroot, install, test.
         
@@ -343 +343 @@
 
 proc url_to_portname { url } {
+        # Save directory and restore the directory, since dportopen changes it
+        set savedir [pwd]
+        set portname ""
         if {[catch {set ctx [dportopen $url]} result]} {
                 puts stderr "Can't map the URL '$url' to a port description file (${result}). Please verify that the directory and portfile syntax are correct."
-                return ""
         } else {
                 array set portinfo [dportinfo $ctx]
                 set portname $portinfo(name)
                 dportclose $ctx
-                return $portname
-        }
+        }
+        cd $savedir
+        return $portname
 }
 
@@ -381 +384 @@
 # will have been set
 proc foreachport {portlist block} {
+        # Restore cwd after each port, since dportopen changes it, and relative
+        # urls will break on subsequent passes
+        set savedir [pwd]
         foreach portspec $portlist {
                 uplevel 1 "array set portspec { $portspec }"
@@ -393 +399 @@
                 }
                 uplevel 1 $block
+                cd $savedir
         }
 }
@@ -1106 +1113 @@
                                 D { advance
                                         set global_porturl "file://[lookahead]"
+                                        break
                                   }
-                                u { advance
+                                U { advance
                                         set global_porturl [lookahead]
+                                        break
                                   }
                                 default {
@@ -1713 +1722 @@
         cat -
         dir -
+        url -
         file {
                 # Operations on the port's directory and Portfile
@@ -1733 +1743 @@
                         }
                         
-                        set portdir [darwinports::getportdir $porturl $portdir]
+                        set portdir [file normalize [darwinports::getportdir $porturl $portdir]]
+                        set porturl "file://${portdir}";        # Rebuild url so it's fully qualified
                         set portfile "${portdir}/Portfile"
                         
@@ -1785 +1796 @@
                                         }
 
+                                        url {
+                                                # output the url of the port's directory, suitable to feed back in later as a port descriptor
+                                                puts $porturl
+                                        }
+
                                         file {
                                                 # output the path to the port's portfile