Changeset 2059 for trunk/base


Ignore:
Timestamp:
Feb 20, 2003, 6:28:03 AM (17 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portmpkg.tcl

    r2041 r2059  
    138138       
    139139    write_PkgInfo ${mpkgpath}/Contents/PkgInfo
    140     write_info_file ${mpkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
     140    write_info_file ${mpkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
    141141    mpkg_write_info_plist ${mpkgpath}/Contents/Info.plist $portname $portversion $prefix $dependencies
    142142    write_description_plist ${mpkgpath}/Contents/Resources/Description.plist $portname $portversion $description
  • trunk/base/src/port1.0/portpackage.tcl

    r1836 r2059  
    6262    system "mkdir -p -m 0755 ${pkgpath}/Contents/Resources"
    6363    write_PkgInfo ${pkgpath}/Contents/PkgInfo
    64     write_info_file ${pkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
     64    write_info_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
    6565    write_info_plist ${pkgpath}/Contents/Info.plist $portname $portversion
    6666    write_description_plist ${pkgpath}/Contents/Resources/Description.plist $portname $portversion $description
     
    7676    file copy -force -- ${portresourcepath}/package/background.tiff ${pkgpath}/Contents/Resources/background.tiff
    7777    system "mkbom ${destpath} ${pkgpath}/Contents/Archive.bom"
    78     system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}.bom"
     78    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}-${portversion}.bom"
    7979    system "cd ${destpath} && pax -w -z . > ${pkgpath}/Contents/Archive.pax.gz"
    80     system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}.pax.gz"
    81 
    82     write_sizes_file ${pkgpath}/Contents/Resources/${portname}.sizes ${portname} ${pkgpath} ${destpath}
     80    system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}-${portversion}.pax.gz"
     81
     82    write_sizes_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.sizes ${portname} ${portversion} ${pkgpath} ${destpath}
    8383
    8484    return 0
     
    226226}
    227227
    228 proc write_sizes_file {sizesfile portname pkgpath destpath} {
     228proc write_sizes_file {sizesfile portname portversion pkgpath destpath} {
    229229   
    230230    if {[catch {set numFiles [exec lsbom -s ${pkgpath}/Contents/Archive.bom | wc -l]} result]} {
     
    237237        return -code error [format [msgcat::mc "Error determining installed size: %s"] $result]
    238238    }
    239     if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}.info]} result]} {
     239    if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}-${portversion}.info]} result]} {
    240240        return -code error [format [msgcat::mc "Error determining info file size: %s"] $result]
    241241    }
Note: See TracChangeset for help on using the changeset viewer.