Changeset 14485 for trunk/base

Timestamp:

Oct 8, 2005, 9:29:35 PM (19 years ago)

Author:

jberry

Message:

Add a global switch in ports.conf which controls what kind of startupitem
will be generated by default. This may be overridden in particular portfiles
by the startupitem.type key. Legal values are "default", "systemstarter", or "launchd".
In the event of "default", a type appropriate to the platform will be chosen.

Location:

trunk/base

Files:

• doc/ports.conf.in (modified) (1 diff)
• src/darwinports1.0/darwinports.tcl (modified) (4 diffs)
• src/port1.0/portdestroot.tcl (modified) (2 diffs)
• src/port1.0/portstartupitem.tcl (modified) (2 diffs)

trunk/base/doc/ports.conf.in

@@ -49 +49 @@
 # Rsync options
 rsync_options           "-rtzv --delete --delete-after"
+
+# Options for generated startup items
+# startupitem_type may be "default", "systemstarter", or "launchd";
+# if the option is empty or "default" then a startupitem type appropriate
+# to the platform will be chosen. Tiger will default to launchd, while
+# older mac ox X systems will default to systemstarter.
+startupitem_type        default

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

@@ -1 +1 @@
 # darwinports.tcl
-# $Id: darwinports.tcl,v 1.197 2005/10/05 13:32:59 jberry Exp $
+# $Id: darwinports.tcl,v 1.198 2005/10/08 21:29:35 jberry Exp $
 #
 # Copyright (c) 2002 Apple Computer, Inc.
@@ -38 +38 @@
 namespace eval darwinports {
     namespace export bootstrap_options portinterp_options open_dports ui_priorities
-    variable bootstrap_options "portdbpath libpath binpath auto_path sources_conf prefix portdbformat portinstalltype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir xcodeversion xcodebuildcmd"
-    variable portinterp_options "portdbpath portpath portbuildpath auto_path prefix portsharepath registry.path registry.format registry.installtype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server rsync_options rsync_dir"
+    variable bootstrap_options "portdbpath libpath binpath auto_path sources_conf prefix portdbformat portinstalltype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir startupitem_type xcodeversion xcodebuildcmd"
+    variable portinterp_options "portdbpath portpath portbuildpath auto_path prefix portsharepath registry.path registry.format registry.installtype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server rsync_options rsync_dir startupitem_type"
     # deferred options are only computed when needed.
     # they are not exported to the trace thread.
@@ -180 +180 @@
         global darwinports::sources
         global darwinports::sources_conf
+        global darwinports::startupitem_type
         global darwinports::destroot_umask
         global darwinports::libpath
@@ -415 +416 @@
     } else {
         set env(PATH) "$binpath"
+    }
+    
+    # Set startupitem default type (can be overridden by portfile)
+    if {![info exists startupitem_type]} {
+        set darwinports::startupitem_type "default"
+        global darwinports::startupitem_type
     }
     

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

@@ -1 +1 @@
 # et:ts=4
 # portdestroot.tcl
-# $Id: portdestroot.tcl,v 1.27 2005/08/27 00:07:30 pguyot Exp $
+# $Id: portdestroot.tcl,v 1.28 2005/10/08 21:29:35 jberry Exp $
 #
 # Copyright (c) 2002 - 2003 Apple Computer, Inc.
@@ -67 +67 @@
 default startupitem.requires    ""
 default startupitem.executable  ""
-default startupitem.type                ""
+default startupitem.type                {$system_options(startupitem_type)}
 default startupitem.pidfile             ""
 default startupitem.logfile             ""

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

@@ -2 +2 @@
 # portstartupitem.tcl
 #
-# $Id: portstartupitem.tcl,v 1.18 2005/10/08 20:00:29 jberry Exp $
+# $Id: portstartupitem.tcl,v 1.19 2005/10/08 21:29:35 jberry Exp $
 #
 # Copyright (c) 2004, 2005 Markus W. Weissman <mww@opendarwin.org>,
@@ -574 +574 @@
         global startupitem.type os.platform
         
+        set startupitem.type [string tolower ${startupitem.type}]
+        
         # Calculate a default value for startupitem.type
-        # If the option has already been set, default will do nothing
-        switch -exact ${os.platform} {
-                darwin {
-                        set enableLaunchd ${portutil::autoconf::enable_launchd_support}
-                        set haveLaunchd ${portutil::autoconf::have_launchd}
-                        
-                        if { [tbool enableLaunchd] && [tbool haveLaunchd] } {
-                                default startupitem.type "launchd"
-                        } else {
-                                default startupitem.type "SystemStarter"
+        if {${startupitem.type} == "default" || ${startupitem.type} == ""} {
+                switch -exact ${os.platform} {
+                        darwin {
+                                set enableLaunchd ${portutil::autoconf::enable_launchd_support}
+                                set haveLaunchd ${portutil::autoconf::have_launchd}
+                                
+                                if { [tbool enableLaunchd] && [tbool haveLaunchd] } {
+                                        set startupitem.type "launchd"
+                                } else {
+                                        set startupitem.type "systemstarter"
+                                }
                         }
-                }
-                default {
-                        default startupitem.type "RCng"
-                }
-        }
-                
+                        default {
+                                set startupitem.type "rcng"
+                        }
+                }
+        }
+
         ui_msg "$UI_PREFIX [msgcat::mc "Creating ${startupitem.type} control script"]"
 
-        switch -- [string tolower ${startupitem.type}] {
+        switch -- ${startupitem.type} {
                 launchd                 { startupitem_create_darwin_launchd }
                 systemstarter   { startupitem_create_darwin_systemstarter }