[58968] trunk/dports/emulators

[ryandesign at macports.org]

Revision: 58968
          http://trac.macports.org/changeset/58968
Author:   ryandesign at macports.org
Date:     2009-10-07 15:36:45 -0700 (Wed, 07 Oct 2009)
Log 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

Modified Paths:
--------------
    trunk/dports/emulators/minivmac/Portfile
    trunk/dports/emulators/minivmac-devel/Portfile

Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile	2009-10-07 21:54:13 UTC (rev 58967)
+++ trunk/dports/emulators/minivmac/Portfile	2009-10-07 22:36:45 UTC (rev 58968)
@@ -151,13 +151,6 @@
     file copy "${my_system_disk_container_mount}/Disk Tools.image" "${worksrcpath}/Disk Tools.dsk"
     my_detach_disk_image ${my_system_disk_container_mount}
     
-    # Use the .img extension for the source disk image so that we can mount it on Mac OS X later.
-    file rename ${worksrcpath}/${my_src}/${my_src}.dsk ${worksrcpath}/${my_src}/${my_src}.img
-    
-    # Unrestrict the permissions on the source disk image so the Build program
-    # can write its output to it.
-    file attributes ${worksrcpath}/${my_src}/${my_src}.img -permissions 0777
-    
     # Extract the bootstrap version of Mini vMac.
     my_system "tar -x -z -C ${worksrcpath} -f ${distpath}/${my_bootstrap_distfile}"
     
@@ -176,6 +169,15 @@
 }
 
 pre-configure {
+    # Copy the source disk image to store the output.
+    # Use the .img extension so that we can mount it on Mac OS X later.
+    copy -force ${worksrcpath}/${my_src}/${my_src}.dsk ${worksrcpath}/${my_src}/${my_src}.img
+    
+    # Unrestrict the permissions on the source disk image so the Build program
+    # can write its output to it.
+    file attributes ${worksrcpath}/${my_src}/${my_src}.img -permissions 0777
+    
+    # Build up the combined configure args for all variations.
     set i 0
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2009-10-07 21:54:13 UTC (rev 58967)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2009-10-07 22:36:45 UTC (rev 58968)
@@ -175,13 +175,6 @@
     # Get a large empty disk image to store the output.
     my_system "unzip -q ${worksrcpath}/${my_blanks}/hfs24M.zip -d ${worksrcpath}"
     
-    # Use the .img extension for the output disk image so that we can mount it on Mac OS X later.
-    file rename ${worksrcpath}/hfs24M.DSK ${worksrcpath}/output.img
-    
-    # Unrestrict the permissions on the output disk image so the Build program
-    # can write its output to it.
-    file attributes ${worksrcpath}/output.img -permissions 0777
-    
     # Extract the bootstrap version of Mini vMac.
     my_system "tar -x -z -C ${worksrcpath} -f ${distpath}/${my_bootstrap_distfile}"
     
@@ -201,6 +194,15 @@
 }
 
 pre-configure {
+    # Copy the large blank disk image to store the output.
+    # Use the .img extension so that we can mount it on Mac OS X later.
+    copy -force ${worksrcpath}/hfs24M.DSK ${worksrcpath}/output.img
+    
+    # Unrestrict the permissions on the output disk image so the Build program
+    # can write its output to it.
+    file attributes ${worksrcpath}/output.img -permissions 0777
+    
+    # Build up the combined configure args for all variations.
     set i 0
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091007/07aa308b/attachment-0001.html>