Changeset 1200 for trunk/base

Timestamp:

Nov 6, 2002, 12:15:40 AM (21 years ago)

Author:

torrey

Message:

Resync with changes accidentally made on lamancha.

Location:

trunk/base/src

Files:

• port/portall.tcl (modified) (1 diff)
• port1.0/portbuild.tcl (modified) (2 diffs)
• port1.0/portchecksum.tcl (modified) (2 diffs)
• port1.0/portclean.tcl (modified) (1 diff)
• port1.0/portconfigure.tcl (modified) (3 diffs)
• port1.0/portextract.tcl (modified) (2 diffs)
• port1.0/portfetch.tcl (modified) (2 diffs)
• port1.0/portinstall.tcl (modified) (3 diffs)
• port1.0/portregistry.tcl (modified) (3 diffs)
• port1.0/portuninstall.tcl (modified) (3 diffs)

trunk/base/src/port/portall.tcl

@@ -38 +38 @@
     }
     array set portinfo [dportinfo $interp]
-    puts "Doing $target for port: $portinfo(name)"
     dportexec $interp $target
     dportclose $interp

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

@@ -37 +37 @@
 ${com.apple.build} requires main fetch extract checksum patch configure
 ${com.apple.build} deplist depends_build depends_lib
+${com.apple.build} set prerun build_start
 
 # define options
@@ -80 +81 @@
 }
 
+proc build_start {args} {
+    global UI_PREFIX portname build.target.all
+
+    ui_msg "$UI_PREFIX Building $portname with target ${build.target.all}"
+}
+
 proc build_main {args} {
     global portname portpath workdir prefix build.type build.cmd build.env build.target.all build.target.current UI_PREFIX worksrcdir
 
-    ui_msg "$UI_PREFIX Building $portname with target ${build.target.all}"
     set build.target.current ${build.target.all}
     system "[command build]"

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

@@ -36 +36 @@
 ${com.apple.checksum} provides checksum
 ${com.apple.checksum} requires main fetch
+${com.apple.checksum} set prerun checksum_start
 
 # define options
@@ -72 +73 @@
     }
     return -1
+}
+
+proc checksum_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Checksumming $portname"
 }
 

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

@@ -39 +39 @@
 ${com.apple.clean} provides clean
 ${com.apple.clean} requires main
+${com.apple.clean} set prerun clean_start
+
+proc clean_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Cleaning $portname"
+}
 
 proc clean_main {args} {

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

@@ -37 +37 @@
 ${com.apple.configure} requires main fetch extract checksum patch
 ${com.apple.configure} deplist depends_build depends_lib
+${com.apple.configure} set prerun configure_start
 
 # define options
@@ -51 +52 @@
 
 set UI_PREFIX "---> "
+
+proc configure_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Configuring $portname"
+}
 
 proc configure_main {args} {
@@ -83 +90 @@
         }
     } elseif [tbool use_configure] {
-        ui_msg "$UI_PREFIX Running configure script"
         if {[catch {system "[command configure]"} result]} {
             ui_error "configure target failed: $result"

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

@@ -38 +38 @@
 ${com.apple.extract} requires fetch checksum
 ${com.apple.extract} deplist depends_extract
+${com.apple.extract} set prerun extract_start
 
 # define options
@@ -67 +68 @@
 }
 
+proc extract_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Extracting $portname"
+}
+
 proc extract_main {args} {
     global portname portpath workdir distname distpath distfiles use_bzip2 extract.only extract.cmd extract.before_args extract.after_args extract.args UI_PREFIX

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

@@ -38 +38 @@
 ${com.apple.fetch} requires main
 ${com.apple.fetch} deplist depends_fetch
+${com.apple.fetch} set prerun fetch_start
 
 # define options: distname master_sites
@@ -275 +276 @@
 }
 
+proc fetch_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Fetching $portname"
+}
+
 # Main fetch routine
 # If all_dist_files is not populated and $fetch.type == standard, then

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

@@ -37 +37 @@
 ${com.apple.install} requires main fetch extract checksum patch configure build 
 ${com.apple.install} deplist depends_run depends_lib
+${com.apple.install} set prerun install_start
 
 # define options
@@ -44 +45 @@
 
 set UI_PREFIX "---> "
+
+proc install_start {args} {
+    global UI_PREFIX portname build.target.install
+
+    ui_msg "$UI_PREFIX Installing $portname with target ${build.target.install}"
+}
 
 proc install_main {args} {
@@ -55 +62 @@
         }
     }
-    ui_msg "$UI_PREFIX Installing $portname with target ${build.target.install}"
+
     set build.target.current ${build.target.install}
     if [catch {system "[command build]"}] {

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

@@ -37 +37 @@
 ${com.apple.registry} requires main fetch extract checksum patch configure build install 
 ${com.apple.registry} deplist depends_run depends_lib
+${com.apple.registry} set prerun registry_start
 
 # define options
@@ -47 +48 @@
 
 set UI_PREFIX "---> "
+
+proc registry_start {args} {
+    global UI_PREFIX portname
+
+    ui_msg "$UI_PREFIX Adding $portname to registry, this may take a moment..."
+}
 
 # For now, just write stuff to a file for debugging.
@@ -205 +212 @@
     # Package installed successfully, so now we must register it
     set rhandle [registry_new $portname $portversion]
-    ui_msg "$UI_PREFIX Adding $portname to registry, this may take a moment..."
 
     registry_store $rhandle [list prefix $prefix]

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

@@ -37 +37 @@
 ${com.apple.uninstall} provides uninstall
 ${com.apple.uninstall} requires main
+${com.apple.uninstall} set prerun uninstall_start
 
 # define options
@@ -42 +43 @@
 
 set UI_PREFIX "---> "
+
+proc uninstall_start {args} {
+    global portname portversion UI_PREFIX
+
+    if [string length [registry_exists $portname $portversion]] {
+        ui_msg "$UI_PREFIX Uninstalling $portname-$portversion"
+    }
+}
 
 proc uninstall_main {args} {
@@ -53 +62 @@
     set rfile [registry_exists $portname $portversion]
     if [string length $rfile] {
-        ui_msg "$UI_PREFIX Uninstalling $portname-$portversion"
         if [regexp .bz2$ $rfile] {
             set fd [open "|bunzip2 -c $rfile" r]