Changeset 1017 for trunk/base

Timestamp:

Oct 9, 2002, 10:11:27 AM (22 years ago)

Author:

kevin

Message:

Added variants.default to specify default variants. These do not override any
variants set by the client (command line).
Syntax:
variants.default +x11

File:

• trunk/base/src/port1.0/portutil.tcl (modified) (7 diffs)

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

@@ -33 +33 @@
 package require Pextlib 1.0
 
-global targets target_uniqid variants
+global targets target_uniqid all_variants
 
 set targets [list]
 set target_uniqid 0
 
-set variants [list]
+set all_variants [list]
 
 ########### External High Level Procedures ###########
@@ -207 +207 @@
 # Portfile level procedure to provide support for declaring variants
 proc variant {args} {
-    global variants PortInfo
+    global all_variants PortInfo
     upvar $args upargs
     
@@ -236 +236 @@
     $obj append requires $requires
     $obj set code $code
-    lappend variants $obj
+    lappend all_variants $obj
     
     # Export provided variant to PortInfo
@@ -380 +380 @@
 # thought of any other way to do this.
 proc makeuserproc {name body} {
-    regsub -- "^\{(.*)" $body "\{ \n foreach g \[info globals\] \{ \n global \$g \n \} \n \\1 " body
+    regsub -- "^\{(.*?)" $body "\{ \n eval \"global \[info globals\]\" \n \\1" body
     eval "proc $name {} $body"
 }
@@ -743 +743 @@
     set name [$this get name]
     ui_debug "Executing $name provides [$this get provides]"
-    makeuserproc $name-code "\{[$this get code]\}"
-    if ([catch $name-code result]) {
+    makeuserproc ${name}-code "[$this get code]"
+    if ([catch ${name}-code result]) {
         ui_error "Error executing $name: $result"
         return 1
@@ -752 +752 @@
 
 proc eval_variants {variations} {
-    global variants
-    set dlist $variants
+    global all_variants
+    set dlist $all_variants
     upvar $variations upvariations
     set chosen [choose_variants $dlist upvariations]
@@ -995 +995 @@
 }
 
-
+options variants.default
+option_proc variants.default handle_variants.default
+proc handle_variants.default {option action args} {
+        global variations
+    switch -regex $action {
+                set|append {
+                        foreach v $args {
+                                if {[regexp {([-+])([-A-Za-z0-9_]+)} $v whole val variant]} {
+                                        if {![info exists variations($variant)]} {
+                                                set variations($variant) $val
+                                        }
+                                }
+                        }
+                }
+                delete {
+                        # xxx
+                }
+    }
+}
 
 ##### portfile depspec subclass #####