[67387] trunk/dports/emulators

[ryandesign at macports.org]

Revision: 67387
          http://trac.macports.org/changeset/67387
Author:   ryandesign at macports.org
Date:     2010-05-06 21:17:33 -0700 (Thu, 06 May 2010)
Log Message:
-----------
minivmac, minivmac-devel: ensure the bootstrap app always gets quit

Modified Paths:
--------------
    trunk/dports/emulators/minivmac/Portfile
    trunk/dports/emulators/minivmac/files/configure.applescript.in
    trunk/dports/emulators/minivmac-devel/Portfile
    trunk/dports/emulators/minivmac-devel/files/configure.applescript.in

Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile	2010-05-07 03:47:55 UTC (rev 67386)
+++ trunk/dports/emulators/minivmac/Portfile	2010-05-07 04:17:33 UTC (rev 67387)
@@ -227,7 +227,10 @@
     }
     
     # Launch the bootstrap Mini vMac so the configure script can talk to it.
-    my_system "open '${worksrcpath}/${my_bootstrap_app}'"
+    global my_bootstrap_pid
+    if {[catch {exec "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" &} my_bootstrap_pid]} {
+        return -code error "couldn't launch bootstrap"
+    }
 }
 
 configure.cmd           osascript
@@ -236,6 +239,10 @@
 build.dir               ${workpath}/variations
 
 post-configure {
+    # Kill the bootstrap Mini vMac.
+    global my_bootstrap_pid
+    exec kill ${my_bootstrap_pid}
+    
     file mkdir ${build.dir}
     set my_variation_dirs {}
     set my_output_disk_mount [my_attach_disk_image ${worksrcpath}/output.img]

Modified: trunk/dports/emulators/minivmac/files/configure.applescript.in
===================================================================
--- trunk/dports/emulators/minivmac/files/configure.applescript.in	2010-05-07 03:47:55 UTC (rev 67386)
+++ trunk/dports/emulators/minivmac/files/configure.applescript.in	2010-05-07 04:17:33 UTC (rev 67387)
@@ -33,16 +33,6 @@
 	my key_code(32) -- "U" -- select the untitled output disk
 	my menu_file_put_away() -- eject the output disk
 	
-	activate application "@BOOTSTRAP_APP@"
-	tell application "System Events"
-		tell process "Mini vMac"
-			key down control -- open Mini vMac control menu
-			my key_code(12) -- "Q" -- quit
-			my key_code(16) -- "Y" -- yes, really quit
-			key up control -- close Mini vMac control menu
-		end tell
-	end tell
-	
 	return "Variations: " & number_of_variations & ". CPU speed: " & (round cpu_mhz rounding up) & " MHz. Configuration delay: " & ((round configuration_delay * 100 rounding up) / 100) & " seconds."
 end run
 

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2010-05-07 03:47:55 UTC (rev 67386)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2010-05-07 04:17:33 UTC (rev 67387)
@@ -235,7 +235,10 @@
     }
     
     # Launch the bootstrap Mini vMac so the configure script can talk to it.
-    my_system "open '${worksrcpath}/${my_bootstrap_app}'"
+    global my_bootstrap_pid
+    if {[catch {exec "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" &} my_bootstrap_pid]} {
+        return -code error "couldn't launch bootstrap"
+    }
 }
 
 configure.cmd           osascript
@@ -244,6 +247,10 @@
 build.dir               ${workpath}/variations
 
 post-configure {
+    # Kill the bootstrap Mini vMac.
+    global my_bootstrap_pid
+    exec kill ${my_bootstrap_pid}
+    
     file mkdir ${build.dir}
     set my_variation_dirs {}
     set my_output_disk_mount [my_attach_disk_image ${worksrcpath}/output.img]

Modified: trunk/dports/emulators/minivmac-devel/files/configure.applescript.in
===================================================================
--- trunk/dports/emulators/minivmac-devel/files/configure.applescript.in	2010-05-07 03:47:55 UTC (rev 67386)
+++ trunk/dports/emulators/minivmac-devel/files/configure.applescript.in	2010-05-07 04:17:33 UTC (rev 67387)
@@ -33,16 +33,6 @@
 	my key_code(32) -- "U" -- select the untitled output disk
 	my menu_file_put_away() -- eject the output disk
 	
-	activate application "@BOOTSTRAP_APP@"
-	tell application "System Events"
-		tell process "Mini vMac"
-			key down control -- open Mini vMac control menu
-			my key_code(12) -- "Q" -- quit
-			my key_code(16) -- "Y" -- yes, really quit
-			key up control -- close Mini vMac control menu
-		end tell
-	end tell
-	
 	return "Variations: " & number_of_variations & ". CPU speed: " & (round cpu_mhz rounding up) & " MHz. Configuration delay: " & ((round configuration_delay * 100 rounding up) / 100) & " seconds."
 end run
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100506/aa453363/attachment.html>