Changeset 229 for trunk/base

Timestamp:

Aug 21, 2002, 8:18:25 AM (22 years ago)

Author:

landonf (Landon Fuller)

Message:

Fix namespace collission. This is not a permanent fix

Location:

trunk/base/src

Files:

• darwinports1.0/darwinports.tcl (modified) (3 diffs)
• port1.0/portutil.tcl (modified) (1 diff)
• portbuild/portbuild.tcl (modified) (1 diff)

trunk/base/src/darwinports1.0/darwinports.tcl

@@ -9 +9 @@
 set uniqid 0
 
-proc init {args} {
+proc dportinit {args} {
     global auto_path env bootstrap_options sysportpath portconf
 
@@ -44 +44 @@
 }
 
-proc build {portdir chain target {options ""}} {
+proc dportbuild {portdir chain target {options ""}} {
     global targets portpath portinterp_options uniqid
 
@@ -52 +52 @@
         set workername workername[incr uniqid]
         interp create $workername
-        $workername alias build build
+        $workername alias dportbuild dportbuild
 
         foreach opt $portinterp_options {

trunk/base/src/port1.0/portutil.tcl

@@ -115 +115 @@
     }
     puts "Executing $portname"
-    build $sysportpath/software/$portname build build
+    dportbuild $sysportpath/software/$portname build build
     return 0
 }

trunk/base/src/portbuild/portbuild.tcl

@@ -38 +38 @@
         }
 }
-init
+dportinit
 if [info exists options] {
-    build $portdir build $target $options
+    dportbuild $portdir build $target $options
 } else {
-    build $portdir build $target
+    dportbuild $portdir build $target
 }