Changeset 2059 for trunk/base

Timestamp:

Feb 20, 2003, 6:28:03 AM (21 years ago)

Author:

kevin

Message:

Fixed bug in name of .info, .sizes, .bom (symlink), and .pax.gz (symlink).
Names must match package name.

Location:

trunk/base/src/port1.0

Files:

• portmpkg.tcl (modified) (1 diff)
• portpackage.tcl (modified) (4 diffs)

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

@@ -138 +138 @@
         
     write_PkgInfo ${mpkgpath}/Contents/PkgInfo
-    write_info_file ${mpkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
+    write_info_file ${mpkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
     mpkg_write_info_plist ${mpkgpath}/Contents/Info.plist $portname $portversion $prefix $dependencies
     write_description_plist ${mpkgpath}/Contents/Resources/Description.plist $portname $portversion $description

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

@@ -62 +62 @@
     system "mkdir -p -m 0755 ${pkgpath}/Contents/Resources"
     write_PkgInfo ${pkgpath}/Contents/PkgInfo
-    write_info_file ${pkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
+    write_info_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
     write_info_plist ${pkgpath}/Contents/Info.plist $portname $portversion
     write_description_plist ${pkgpath}/Contents/Resources/Description.plist $portname $portversion $description
@@ -76 +76 @@
     file copy -force -- ${portresourcepath}/package/background.tiff ${pkgpath}/Contents/Resources/background.tiff
     system "mkbom ${destpath} ${pkgpath}/Contents/Archive.bom"
-    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}.bom"
+    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}-${portversion}.bom"
     system "cd ${destpath} && pax -w -z . > ${pkgpath}/Contents/Archive.pax.gz"
-    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}.pax.gz"
-
-    write_sizes_file ${pkgpath}/Contents/Resources/${portname}.sizes ${portname} ${pkgpath} ${destpath}
+    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}-${portversion}.pax.gz"
+
+    write_sizes_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.sizes ${portname} ${portversion} ${pkgpath} ${destpath}
 
     return 0
@@ -226 +226 @@
 }
 
-proc write_sizes_file {sizesfile portname pkgpath destpath} {
+proc write_sizes_file {sizesfile portname portversion pkgpath destpath} {
     
     if {[catch {set numFiles [exec lsbom -s ${pkgpath}/Contents/Archive.bom | wc -l]} result]} {
@@ -237 +237 @@
         return -code error [format [msgcat::mc "Error determining installed size: %s"] $result]
     }
-    if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}.info]} result]} {
+    if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}-${portversion}.info]} result]} {
         return -code error [format [msgcat::mc "Error determining info file size: %s"] $result]
     }