Changeset 58968


Ignore:
Timestamp:
Oct 7, 2009, 10:36:45 PM (8 years ago)
Author:
ryandesign@…
Message:

minivmac, minivmac-devel: copy the source (3.0.x) or output (3.1.x) disk image in pre-configure, not in extract, so that if configure fails and is reattempted without cleaning the port, we're not also dealing with a possibly corrupted disk image because it wasn't unmounted cleanly from the emulator

Location:
trunk/dports/emulators
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/emulators/minivmac-devel/Portfile

    r58923 r58968  
    176176    my_system "unzip -q ${worksrcpath}/${my_blanks}/hfs24M.zip -d ${worksrcpath}"
    177177   
    178     # Use the .img extension for the output disk image so that we can mount it on Mac OS X later.
    179     file rename ${worksrcpath}/hfs24M.DSK ${worksrcpath}/output.img
    180    
    181     # Unrestrict the permissions on the output disk image so the Build program
    182     # can write its output to it.
    183     file attributes ${worksrcpath}/output.img -permissions 0777
    184    
    185178    # Extract the bootstrap version of Mini vMac.
    186179    my_system "tar -x -z -C ${worksrcpath} -f ${distpath}/${my_bootstrap_distfile}"
     
    202195
    203196pre-configure {
     197    # Copy the large blank disk image to store the output.
     198    # Use the .img extension so that we can mount it on Mac OS X later.
     199    copy -force ${worksrcpath}/hfs24M.DSK ${worksrcpath}/output.img
     200   
     201    # Unrestrict the permissions on the output disk image so the Build program
     202    # can write its output to it.
     203    file attributes ${worksrcpath}/output.img -permissions 0777
     204   
     205    # Build up the combined configure args for all variations.
    204206    set i 0
    205207    foreach my_arch ${my_archs} {
  • trunk/dports/emulators/minivmac/Portfile

    r58923 r58968  
    152152    my_detach_disk_image ${my_system_disk_container_mount}
    153153   
    154     # Use the .img extension for the source disk image so that we can mount it on Mac OS X later.
    155     file rename ${worksrcpath}/${my_src}/${my_src}.dsk ${worksrcpath}/${my_src}/${my_src}.img
    156    
    157     # Unrestrict the permissions on the source disk image so the Build program
    158     # can write its output to it.
    159     file attributes ${worksrcpath}/${my_src}/${my_src}.img -permissions 0777
    160    
    161154    # Extract the bootstrap version of Mini vMac.
    162155    my_system "tar -x -z -C ${worksrcpath} -f ${distpath}/${my_bootstrap_distfile}"
     
    177170
    178171pre-configure {
     172    # Copy the source disk image to store the output.
     173    # Use the .img extension so that we can mount it on Mac OS X later.
     174    copy -force ${worksrcpath}/${my_src}/${my_src}.dsk ${worksrcpath}/${my_src}/${my_src}.img
     175   
     176    # Unrestrict the permissions on the source disk image so the Build program
     177    # can write its output to it.
     178    file attributes ${worksrcpath}/${my_src}/${my_src}.img -permissions 0777
     179   
     180    # Build up the combined configure args for all variations.
    179181    set i 0
    180182    foreach my_arch ${my_archs} {
Note: See TracChangeset for help on using the changeset viewer.