Changeset 26693

Timestamp:

2007-07-03 23:16:19 (14 months ago)

Author:

eridius@…

Message:

Commit patch for #12224 - provide ${os.major} variable

Location:

trunk/base/src

Files:

• package1.0/portrpm.tcl (modified) (2 diffs)
• package1.0/portsrpm.tcl (modified) (1 diff)
• port1.0/portmain.tcl (modified) (2 diffs)
• port1.0/portutil.tcl (modified) (2 diffs)

trunk/base/src/package1.0/portrpm.tcl

@@ -53 +53 @@
 proc rpm_pkg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portdbpath destpath workpath prefix portresourcepath categories maintainers description long_description homepage epoch portpath
-        global os.platform os.arch os.version
+        global os.platform os.arch os.version os.major
     
     set rpmdestpath ""
@@ -112 +112 @@
 
         # depend on system (virtual packages for apple stuff)
-        regexp {[0-9]+} ${os.version} major
-        lappend dependencies "org.macports.${os.platform}${major}"
+        lappend dependencies "org.macports.${os.platform}${os.major}"
     
     set listpath ${workpath}/${portname}.filelist

trunk/base/src/package1.0/portsrpm.tcl

@@ -54 +54 @@
 proc srpm_pkg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix portresourcepath categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
-        global os.platform os.arch os.version
+        global os.platform os.arch os.version os.major
     
     set rpmdestpath ""

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

@@ -43 +43 @@
 options prefix name version revision epoch categories maintainers
 options long_description description homepage
-options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms default_variants install.user install.group
+options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group
 
 # Export options via PortInfo
@@ -83 +83 @@
 set os_arch $tcl_platform(machine)
 if {$os_arch == "Power Macintosh"} { set os_arch "powerpc" }
+set os_major [lindex [split $tcl_platform(osVersion) .] 0]
 
 default os.platform {[string tolower $tcl_platform(os)]}
 default os.version {$tcl_platform(osVersion)}
+default os.major {$os_major}
 default os.arch {$os_arch}
 # Remove trailing "Endian"

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

@@ -486 +486 @@
 # be more readable, and support arch and version specifics
 proc platform {args} {
-    global all_variants PortInfo os.platform os.arch os.version
+    global all_variants PortInfo os.platform os.arch os.version os.major
     
     set len [llength $args]
@@ -523 +523 @@
     if {[info exists os.platform] && ${os.platform} == $os} { 
         set sel_platform $os
-        if {[info exists os.version] && [info exists release]} {
-            regexp {([0-9]*)[0-9\.]?} ${os.version} match major
-            if {$major == $release } { 
+        if {[info exists os.major] && [info exists release]} {
+            if {${os.major} == $release } { 
                 set sel_platform ${sel_platform}_${release} 
             } else {