Changeset 1530 for trunk/base

Timestamp:

Jan 3, 2003, 9:15:39 AM (21 years ago)

Author:

jkh

Message:

Conditionalize the package.type handling properly. Now if I could just
figure out how to set package.destdir externally.

File:

• trunk/base/src/port1.0/portpackage.tcl (modified) (4 diffs)

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

@@ -42 +42 @@
 
 # Set defaults
-default package.type tarball
+default package.type pkg
 default package.destpath {${workpath}}
 
@@ -48 +48 @@
 
 proc package_main {args} {
-    global portname portversion package.type UI_PREFIX
+    global portname portversion package.type package.destpath UI_PREFIX
 
     set rfile [registry_exists $portname $portversion]
@@ -55 +55 @@
         return -code error "Package ${portname}-${portversion} not installed on this system"
     }
-    ui_msg "$UI_PREFIX Creating ${package.type} package for ${portname}-${portversion}"
+    ui_msg "$UI_PREFIX Creating ${package.type} format package for ${portname}-${portversion}"
     if [regexp .bz2$ $rfile] {
         set fd [open "|bunzip2 -c $rfile" r]
@@ -64 +64 @@
     close $fd
 
-    # For now the only package type we support is "tarball" but move that
-    # into another routine anyway so that this is abstract enough.
-
-    return [package_pkg $portname $portversion $entry]
+    # Make sure the destination path exists.
+    system "mkdir -p ${package.destpath}"
+
+    # For now we only support pkg and tarball package types.
+    switch -exact -- ${package.type} {
+        pkg {
+            return [package_pkg $portname $portversion $entry]
+        }
+        tarball {
+            return [package_tarball $portname $portversion $entry]
+        }
+        default {
+            ui_error "Do not know how to generate package of type ${package.type}"
+            return -code error "Unknown package type: ${package.type}"
+        }
+    }
 }