Changeset 957 for trunk/base

Timestamp:

Oct 5, 2002, 3:44:19 PM (22 years ago)

Author:

landonf (Landon Fuller)

Message:

os.name -> os.platform to conform to other naming standards regarding
platform/architecture/os name

Location:

trunk/base/src/port1.0

Files:

• portbuild.tcl (modified) (3 diffs)
• portfetch.tcl (modified) (1 diff)
• portmain.tcl (modified) (3 diffs)

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

@@ -50 +50 @@
 
 proc build_getmaketype {args} {
-    global build.type build.cmd os.name
+    global build.type build.cmd os.platform
 
     if ![info exists build.type] {
@@ -57 +57 @@
     switch -exact -- ${build.type} {
         bsd {
-            if {${os.name} == "darwin"} {
+            if {${os.platform} == "darwin"} {
                 return bsdmake
             } else {
@@ -64 +64 @@
         }
         gnu {
-            if {${os.name} == "darwin"} {
+            if {${os.platform} == "darwin"} {
                 return gnumake
             } else {

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

@@ -210 +210 @@
 # the listed url varable and associated distfile
 proc fetchfiles {args} {
-    global distpath all_dist_files UI_PREFIX ports_verbose fetch_urls fetch.cmd os.name fetch.pre_args
+    global distpath all_dist_files UI_PREFIX ports_verbose fetch_urls fetch.cmd os.platform fetch.pre_args
     global distfile site
 
     # Override curl in the case of FreeBSD
-    if {${os.name} == "freebsd"} {
+    if {${os.platform} == "freebsd"} {
         set fetch.cmd "fetch"
     }
     if [tbool ports_verbose] {
         set fetch.pre_args -v
-    } elseif {${os.name} == "darwin" } {
+    } elseif {${os.platform} == "darwin" } {
         set fetch.pre_args "-s -S"
     }

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

@@ -40 +40 @@
 
 # define options
-options prefix portname portversion portrevision categories maintainers workdir worksrcdir filedir distname portdbpath libpath distpath sources_conf os.name os.version os.arch os.endian platforms
+options prefix portname portversion portrevision categories maintainers workdir worksrcdir filedir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms
 # Export options via PortInfo
 options_export portname portversion portrevision categories maintainers platforms 
 
-global os_name os_arch os_endian
-
-set os_name [string tolower $tcl_platform(os)]
-
-set os_arch $tcl_platform(machine)
-if {$os_arch == "Power Macintosh"} { set os_arch "powerpc" }
-
-set os_endian $tcl_platform(byteOrder)
 # Remove trailing "Endian"
-set os_endian [string range $os_endian 0 [expr [string length $os_endian] - 7]]
 
 default distpath {[file join $portdbpath distfiles]}
@@ -61 +52 @@
 default filedir files
 default portrevision 0
-default os.name {$os_name}
-default os.version {$tcl_platform(osVersion)}
-default os.arch {$os_arch}
-default os.endian {$os_endian}
 default distname {${portname}-${portversion}}
 default worksrcdir {$distname}
@@ -71 +58 @@
 default worksrcpath {[file join $workpath $worksrcdir]}
 
+
+# Platform Settings
+set os_arch $tcl_platform(machine)
+if {$os_arch == "Power Macintosh"} { set os_arch "powerpc" }
+
+set os_endian $tcl_platform(byteOrder)
+default os.platform {[string tolower $tcl_platform(os)]}
+default os.version {$tcl_platform(osVersion)}
+default os.arch {$os_arch}
+default os.endian {[string range $os_endian 0 [expr [string length $os_endian] - 7]]}
+
+
 # Select implicit variants
-global variations
-if {![info exists variations($os_name)]} { variant_set $os_name }
-if {![info exists variations($os_arch)]} { variant_set $os_arch }
+if {[info exists os.platform] && ![info exists variations(${os.platform})]} { variant_set ${os.platform}}
+if {[info exists os.arch] && ![info exists variations(${os.arch})]} { variant_set ${os.arch} }
 
 proc main {args} {