[64420] trunk/base/src

[jmr at macports.org]

Revision: 64420
          http://trac.macports.org/changeset/64420
Author:   jmr at macports.org
Date:     2010-03-04 20:59:26 -0800 (Thu, 04 Mar 2010)
Log Message:
-----------
store os.platform and os.major in registry

Modified Paths:
--------------
    trunk/base/src/cregistry/sql.c
    trunk/base/src/port1.0/portinstall.tcl
    trunk/base/src/registry2.0/entryobj.c

Modified: trunk/base/src/cregistry/sql.c
===================================================================
--- trunk/base/src/cregistry/sql.c	2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/cregistry/sql.c	2010-03-05 04:59:26 UTC (rev 64420)
@@ -286,7 +286,7 @@
             "location TEXT, epoch INTEGER, version TEXT COLLATE VERSION, "
             "revision INTEGER, variants TEXT, default_variants TEXT, "
             "state TEXT, date DATETIME, installtype TEXT, archs TEXT, "
-            "requested INT, "
+            "requested INT, os_platform TEXT, os_major INTEGER, "
             "UNIQUE (name, epoch, version, revision, variants), "
             "UNIQUE (url, epoch, version, revision, variants)"
             ")",

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/port1.0/portinstall.tcl	2010-03-05 04:59:26 UTC (rev 64420)
@@ -144,7 +144,8 @@
     worksrcdir UI_PREFIX destroot revision maintainers ports_force \
     portvariants default_variants targets depends_lib PortInfo epoch license \
     registry.installtype registry.path registry.format \
-    os.arch configure.build_arch configure.universal_archs supported_archs
+    os.arch configure.build_arch configure.universal_archs supported_archs \
+    os.platform os.major
 
     if {[string equal ${registry.format} "receipt_sqlite"]} {
         # registry2.0
@@ -166,6 +167,8 @@
 
             set regref [registry::entry create $name $version $revision $portvariants $epoch]
 
+            $regref os_platform ${os.platform}
+            $regref os_major ${os.major}
             if {$supported_archs == "noarch"} {
                 $regref archs noarch
             } elseif {[variant_exists universal] && [variant_isset universal]} {
@@ -222,6 +225,8 @@
 
         registry_prop_store $regref categories $categories
 
+        registry_prop_store $regref os_platform ${os.platform}
+        registry_prop_store $regref os_major ${os.major}
         if {$supported_archs == "noarch"} {
             registry_prop_store $regref archs noarch
         } elseif {[variant_exists universal] && [variant_isset universal]} {

Modified: trunk/base/src/registry2.0/entryobj.c
===================================================================
--- trunk/base/src/registry2.0/entryobj.c	2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/registry2.0/entryobj.c	2010-03-05 04:59:26 UTC (rev 64420)
@@ -53,6 +53,8 @@
     "state",
     "installtype",
     "archs",
+    "os_platform",
+    "os_major",
     NULL
 };
 
@@ -374,6 +376,8 @@
     { "state", entry_obj_prop },
     { "installtype", entry_obj_prop },
     { "archs", entry_obj_prop },
+    { "os_platform", entry_obj_prop },
+    { "os_major", entry_obj_prop },
     /* filemap */
     { "map", entry_obj_filemap },
     { "unmap", entry_obj_filemap },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100304/f8fe78ec/attachment.html>