<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7701b9278f3fc8b831b1e5f7ea4a5ffcdfa1a882">https://github.com/macports/macports-ports/commit/7701b9278f3fc8b831b1e5f7ea4a5ffcdfa1a882</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7701b92 minivmac: Update to 3.4.1
</span>7701b92 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7701b9278f3fc8b831b1e5f7ea4a5ffcdfa1a882
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 1 19:16:18 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> minivmac: Update to 3.4.1
</span>---
emulators/minivmac/Portfile | 100 +++++++++++----------
.../minivmac/files/README-binary-patchfiles.md | 51 +++++++----
emulators/minivmac/files/configure.applescript.in | 72 ---------------
.../minivmac/files/patch-Disk Tools.image.bsdiff | Bin 5584 -> 1174 bytes
.../minivmac/files/patch-Tidbits.image.bsdiff | Bin 542 -> 0 bytes
.../minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff | Bin 0 -> 1624 bytes
emulators/minivmac/files/patch-src-MYOSGLUE.c.diff | 10 +--
emulators/minivmac/files/patch-src-MYOSGLUE.m.diff | 74 +++++++++++++++
8 files changed, 162 insertions(+), 145 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/Portfile b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d680dbb..4c8f75b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortSystem 1.0
</span> name minivmac
conflicts minivmac-devel
set my_name minivmac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_version [strsed ${version} {g/^.*-20//}]
</span> categories emulators aqua
maintainers ryandesign
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ use_zip yes
</span> platforms macosx
use_parallel_build yes
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${my_version}
</span>
description an emulator of the Macintosh Plus and other early Macintosh models
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,9 @@ long_description The Mini vMac emulator helps preserve software made for
</span> also emulations of the Macintosh 128K, 512K, 512Ke, SE, Classic, \
and SE FDHD, and work on Macintosh II emulation is in progress.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/minivmac/minivmac/${version}:minivmacsource \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://www.gryphel.com/d/minivmac/minivmac-${my_version}/:minivmacsource \
</span> sourceforge:project/minivmac/minivmac-extras/extras6:minivmacextras6 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ sourceforge:project/minivmac/minivmac-extras/extras11:minivmacextras11 \
</span> http://www.ryandesign.com/macports/distfiles/minivmac:bootstrap \
http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/System/Older_System/System_7.0.x/:apple
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,21 +39,25 @@ set my_src_distfile ${my_src}.zip
</span> set my_bootstrap_distfile ${my_name}-bootstrap-3.2.3_0.zip
set my_icons icnsosx-1.0.0
set my_icons_distfile ${my_icons}.zip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_autoquit autquit7-1.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_autoquit_distfile ${my_autoquit}.zip
</span> set my_system_disk_container System_7.0.1.smi
set my_system_disk_container_distfile ${my_system_disk_container}.bin
distfiles ${my_src_distfile}:minivmacsource \
${my_bootstrap_distfile}:bootstrap \
${my_icons_distfile}:minivmacextras6 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_autoquit_distfile}:minivmacextras11 \
</span> ${my_system_disk_container_distfile}:apple
extract.only ${my_src_distfile} \
${my_bootstrap_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_icons_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_icons_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_autoquit_distfile}
</span>
checksums ${my_src_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 24e2a29db9ea54dfc41889ef16184daa3f054ef5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f3b8c5dc3f4a48267d0a2666b9c71109a59fd5edf96a6d0ed12158df303c878f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 902a778adee791387051eb821017a9d440b124d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3a94f73af72f52fa15e76c794376049a89230c4add390e81d6b2e68831a04de4 \
</span> ${my_bootstrap_distfile} \
rmd160 32e803a75d4f9ab6b7dfa5a7b1ec2ef9d3a057c2 \
sha256 e6fe692683ab54e08b0350fe9901e872f7bf3c3a62f69b45773254fce45a4fae \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +65,9 @@ checksums ${my_src_distfile} \
</span> md5 2af006506de7549be14f94317918d59a \
sha1 4ef79bb56b988fedfeb82a8b6cafd8066f5bbab2 \
rmd160 cef6d7d7578464538d0042b0d98379ae7f18fab7 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_autoquit_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 949ce06752fbcfa9a92787497dace45e7299eb41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9aad37cfd2d6dbd4db5e307b8598348ba25aa5504aac968b8d570d5927e576a \
</span> ${my_system_disk_container_distfile} \
md5 8a4776350b15b5a516cdf7dd18e27290 \
sha1 d4c8b8653de9c7a9b2594dd6126ec7120e3e2e9e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +75,10 @@ checksums ${my_src_distfile} \
</span>
depends_extract port:bsdiff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:timeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_skip_archcheck bsdiff timeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set my_app_dir "${applications_dir}/Mini vMac"
set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
set my_bootstrap_app "Mini vMac Bootstrap.app"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +105,7 @@ variant unsupported description {Also build unfinished Macintosh II and IIx emul
</span> # The variant is hidden because it is useful only to the port maintainer.
if {[tbool bootstrap]} {
variant bootstrap conflicts unsupported requires universal description {Build the bootstrap version of Mini vMac} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- my_variations {Bootstrap} {-m Plus -sound 0 -bg 1 -speed a -as 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_variations {Bootstrap} {-m Plus -as 0 -bg 1 -mf 1 -sound 0 -speed a -var-fullscreen 0}
</span> depends_build-append port:p7zip
depends_skip_archcheck p7zip
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,7 +147,7 @@ pre-extract {
</span> worksrcdir configure
build.dir ${workpath}/build
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.asroot yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"
</span>
post-extract {
# Decompress the system disk container image.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,12 +158,12 @@ post-extract {
</span> # The images on the container image. Images we don't need are commented out for future reference.
set my_images {
{Disk Tools.image} 58368 eb1979132c843560ebab490faeb7520d9a94757ecef3121a21abace8d3ae63ff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {Tidbits.image} 1902848 3e3600bed1b5c7c595bc176b5eaadcc8c1517032489efc548b9b781c0ee1f062
</span> }
# {Fonts.image} 427264 8b06f086a96b75bd23b16ae018bd334696239cb56e65bfa20166ea00d14cdef0
# {Install 1.image} 796160 8c3ea898eeb88b795041108cd8a09bf4ebdf920d7d4763e4419df14713dbd952
# {Install 2.image} 1165056 0fc558475df55f3aed217d2eceebfa29e4a465a795807cd627b258740a9ec55b
# {Printing.image} 1533952 246cbf69ad1c2e588ee482fddec781135a67fbfe02734bb0f732eb055faa15fa
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# {Tidbits.image} 1902848 3e3600bed1b5c7c595bc176b5eaadcc8c1517032489efc548b9b781c0ee1f062
</span>
# Extract the disk images from the system disk container image. `hdiutil` on OS X 10.8 Mountain Lion
# does not mount this disk image correctly, so extract the files manually using `dd`.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,39 +179,37 @@ post-extract {
</span> delete ${worksrcpath}/${my_system_disk_container_decompressed}
# Make the data directory, where Mini vMac looks for the files it needs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"
</span> file mkdir ${my_mnvm_dat}
# Symlink the ROM file into the data directory.
ln -s [my_real_rom_file] ${my_mnvm_dat}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Symlink the disk images into the data directory with sequentially-numbered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # names so Mini vMac will find them and automatically mount them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s "${worksrcpath}/Disk Tools.image" "${my_mnvm_dat}/disk1.dsk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${worksrcpath}/Tidbits.image "${my_mnvm_dat}/disk2.dsk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${worksrcpath}/${my_src}/${my_src}.dsk "${my_mnvm_dat}/disk3.dsk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use the prettier icon on the bootstrap app.
copy -force ${worksrcpath}/${my_icons}/icons//AppIcon.icns ${worksrcpath}/${my_bootstrap_app}/Contents/Resources/
}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Place an 8192-byte TeachText file called "configure.args" (containing "@START@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 8180 spaces, and "@END@") onto the Tidbits disk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${prefix}/bin/bspatch Tidbits.image Tidbits.image.in '${filespath}/patch-Tidbits.image.bsdiff'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See README-binary-patchfiles.md in the files directory for instructions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on recreating these binary patchfiles.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Modify the AutQuit7 disk to have an alias "app" pointing to the MnvM_b34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # application and an 8192-byte TeachText file called "doc" (containing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "@START@", 8180 periods and spaces, and "@END@").
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/${my_autoquit} "${prefix}/bin/bspatch '${my_autoquit}.dsk' '${my_autoquit}.dsk.tmp' '${filespath}/patch-${my_autoquit}.dsk.bsdiff'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force "${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk.tmp" "${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Place an alias of the configure.args file in the Startup Items folder on the Disk Tools disk.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Modify the Disk Tools disk to have an alias of AutQuit7 in the Startup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Items folder.
</span> system -W ${worksrcpath} "${prefix}/bin/bspatch 'Disk Tools.image' 'Disk Tools.image.tmp' '${filespath}/patch-Disk Tools.image.bsdiff'"
move -force "${worksrcpath}/Disk Tools.image.tmp" "${worksrcpath}/Disk Tools.image"
}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the name of the bootstrap app in the configure script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/configure.applescript.in ${worksrcpath}/configure.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@BOOTSTRAP_APP@|${my_bootstrap_app}|g" ${worksrcpath}/configure.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy the template Tidbits disk image.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${worksrcpath}/Tidbits.image.in ${worksrcpath}/Tidbits.image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy the disk images into the data directory with sequentially-numbered
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # names so Mini vMac will find them and automatically mount them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force "${worksrcpath}/Disk Tools.image" "${my_mnvm_dat}/disk1.dsk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk "${my_mnvm_dat}/disk2.dsk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${worksrcpath}/${my_src}/${my_src}.dsk "${my_mnvm_dat}/disk3.dsk"
</span>
# Build up the combined configure args for all variations.
set i 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,45 +223,38 @@ pre-configure {
</span> ${my_base_options} \
-t ${my_target} \
${my_variation_options} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -n ${version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -n ${my_version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
</span> incr i
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Write the configure args into the configure.args file on the Tidbits disk image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Write the configure args into the "doc" file on the AutQuit7 disk image.
</span> set max_configure_args_length 8192
set padded_args [format "%-${max_configure_args_length}s" [join ${configure_args}]]
if {[string length ${padded_args}] > ${max_configure_args_length}} {
return -code error "configure args too long"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|@START@ *@END@|${padded_args}|" ${worksrcpath}/Tidbits.image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the real configure.args that get passed to the AppleScript to the number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # of variations being assembled, so that it knows how long to wait.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args ${i}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|@START@\[ .\]*@END@|${padded_args}|" "${my_mnvm_dat}/disk2.dsk"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Launch the bootstrap Mini vMac so the configure AppleScript can talk to it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global my_bootstrap_pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" &} my_bootstrap_pid]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "couldn't launch bootstrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set the number of seconds to wait before killing the bootstrap Mini vMac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # app, in case it gets stuck.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args [expr 10 * ${i}]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd osascript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args ./configure.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Launch the bootstrap Mini vMac to run the configuration. When it's done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it should automatically quit, but if not, we time out after awhile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec -ignorestderr ${prefix}/bin/timeout ${configure.pre_args} "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Kill the bootstrap Mini vMac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global my_bootstrap_pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec kill ${my_bootstrap_pid}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> file mkdir ${build.dir}
set my_variation_dirs {}
foreach my_arch ${my_archs} {
file mkdir ${build.dir}/${my_arch}
set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_variation ${version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_variation ${my_version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
</span> set my_src_tarball ${worksrcpath}/${my_variation}.tar
if {[file isfile ${my_src_tarball}]} {
set my_variation_dir ${my_arch}/${my_machine}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +284,8 @@ post-configure {
</span> xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
reinplace "s|@SUBDIRS@|[join ${my_variation_dirs}]|" ${build.dir}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If no variation directories were produced by configuration, either the flags we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # passed in were bad, or the automation script got out of sync with the emulator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if the latter, the delays in configure.applescript may need to be adjusted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If no variation directories were produced by configuration, the flags we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # passed in may have been bad.
</span> if {${my_variation_dirs} eq ""} {
return -code error "configuration failed!"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/README-binary-patchfiles.md b/emulators/minivmac/files/README-binary-patchfiles.md
</span><span style='display:block; white-space:pre;color:#808080;'>index 873fdd0..6e4a844 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/README-binary-patchfiles.md
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/README-binary-patchfiles.md
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +1,47 @@
</span> # Creating binary patches
<span style='display:block; white-space:pre;background:#ffe0e0;'>-* Boot Mini vMac with System 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Prerequisites
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## 1. Create patch-Tidbits.image.bsdiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* A copy of Mini vMac with support for writing to Disk Copy 4.2 images: either a version earlier than 3.2.2, or version 3.2.2 or later compiled with the build options `-sony-sum 1 -sony-tag 1`; the default build does not use these options. For example, custom build 1274 from the [Mini vMac custom variation service](http://www.gryphel.com/c/var/latest/index.html) works if you have a Mac Classic ROM.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Disk Tools.image and Tidbits.image disk images from the System 7.0.1.smi disk image from Apple's legacy download area.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* autquit7-1.3.1.dsk (or other version) and the latest minivmac*.src.dsk disk images from the Mini vMac web site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* A disk image with a copy of ResEdit 2.1.3 (optional).
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-* Get a fresh copy of Tidbits.image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make a copy called Tidbits.image.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Mount Tidbits.image in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make the configure.args file:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Create autquit7-1.3.1.dsk.bsdiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Boot Mini vMac with Disk Tools.image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Get a fresh copy of autquit7-1.3.1.dsk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Make a copy called autquit7-1.3.1.dsk.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Mount autquit7-1.3.1.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Make the "app" alias:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Get the latest minivmac*.src.dsk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Mount minivmac*.src.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Select the MnvM_b34 application on the MnvM_b34 volume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Choose Make Alias from the File menu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Rename the alias to "app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copy the alias to the AutQuit7 volume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Make the "doc" file:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Mount Tidbits.image in Mini vMac
</span> * Open TeachText on the Tidbits volume
* Type "@START@", 8180 spaces, "@END@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Save as "configure.args" on the Desktop of the Tidbits volume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Save as "docs" on the AutQuit7 volume
</span> * Use "Get Info" in the Finder to verify the file is exactly 8192 bytes long
* Close all windows
<span style='display:block; white-space:pre;background:#ffe0e0;'>-* Unmount the Tidbits volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Run `bsdiff Tidbits.image.orig Tidbits.image patch-Tidbits.image.bsdiff`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Choose Shut Down from the Special menu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Run `bsdiff autquit7-1.3.1.dsk.orig autquit7-1.3.1.dsk patch-autquit7-1.3.1.dsk.bsdiff`
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## 2. Create patch-Disk Tools.image.bsdiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## Create patch-Disk Tools.image.bsdiff
</span>
* Get a fresh copy of Disk Tools.image
* Make a copy called Disk Tools.image.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-* Mount Disk Tools.image in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make the configure.args alias:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Get a Tidbits.image patched to contain the configure.args file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mount Tidbits.image in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Open the System Folder on the Disk Tools volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Select the configure.args file on the Desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Boot Mini vMac with Disk Tools.image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Make the AutQuit7 alias:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Mount autquit7-1.3.1.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Select the AutQuit7 application on the AutQuit7 volume
</span> * Choose Make Alias from the File menu
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copy or move the alias into the Startup Items folder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [Disable Finder zoom rects](http://tidbits.com/static/html/TidBITS-099.html#lnk5):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Open the System Folder on the Disk Tools volume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copy the alias into the Startup Items folder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [Disable Finder zoom rects](http://tidbits.com/static/html/TidBITS-099.html#lnk5) (optional, now that the build script no longer depends on precise timing):
</span> * Mount an image containing ResEdit
* Open the Finder in ResEdit
* Open CODE resource 4, decompressing it when prompted
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,5 +49,5 @@
</span> * Change to 205F 700A DEC0 4ED0
* Save and quit
* Close all windows
<span style='display:block; white-space:pre;background:#ffe0e0;'>-* Unmount the Disk Tools volume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Choose Shut Down from the Special menu
</span> * Run `bsdiff 'Disk Tools.image.orig' 'Disk Tools.image' 'patch-Disk Tools.image.bsdiff'`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/configure.applescript.in b/emulators/minivmac/files/configure.applescript.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f13fa6d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/configure.applescript.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- $Id$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-global configuration_delay
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-property lf : ASCII character 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on run argv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set number_of_variations to item 1 of argv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- Base the delay for the configuration run on the processor speed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- The multiplier was chosen based on observations of a 2.2-GHz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- MacBook Pro and a 466-MHz Power Mac G4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cpu_mhz to (system attribute "pclk") / 1000000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set configuration_delay to 1400 * number_of_variations / cpu_mhz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delay 3 -- wait 1 second for each disk image Mini vMac needs to mount
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_edit_select_all() -- select the contents of the configure.args file which has been automatically opened
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_edit_copy() -- copy it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_file_quit() -- quit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code(46) -- "M" -- select the MnvM_bld program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_file_open() -- open it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_edit_paste() -- paste the configure args into the window
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my menu_file_go() -- do the configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "Variations: " & number_of_variations & lf & "CPU speed: " & (round cpu_mhz rounding up) & " MHz" & lf & "Configuration delay: " & ((round configuration_delay * 100 rounding up) / 100) & " seconds"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on key_code(key_code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(key_code, {})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end key_code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- Key codes are used instead of keystrokes because keystrokes would be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- translated through the currently-selected Mac OS X keyboard layout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- but the system software being used on the emulated machine is using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- the US English keyboard layout.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on key_code_with_modifiers(key_code, key_modifiers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- activate application "@BOOTSTRAP_APP@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tell application "System Events"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tell process "Mini vMac"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delay 0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key code key_code using key_modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end tell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end tell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end key_code_with_modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_file_open()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(31, {command down}) -- "Command-O"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delay 0.5 -- wait for zoomrects to draw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_file_open
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_file_go()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(5, {command down}) -- "Command-G"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delay configuration_delay -- wait for configuration to run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_file_go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_file_quit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(12, {command down}) -- "Command-Q"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_file_quit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_edit_copy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(8, {command down}) -- "Command-C"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_edit_copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_edit_paste()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(9, {command down}) -- "Command-V"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_edit_paste
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on menu_edit_select_all()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my key_code_with_modifiers(0, {command down}) -- "Command-A"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end menu_edit_select_all
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-Disk Tools.image.bsdiff b/emulators/minivmac/files/patch-Disk Tools.image.bsdiff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3044b17..f9ac35f 100644
</span>Binary files a/emulators/minivmac/files/patch-Disk Tools.image.bsdiff and b/emulators/minivmac/files/patch-Disk Tools.image.bsdiff differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-Tidbits.image.bsdiff b/emulators/minivmac/files/patch-Tidbits.image.bsdiff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 394e732..0000000
</span>Binary files a/emulators/minivmac/files/patch-Tidbits.image.bsdiff and /dev/null differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff b/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bb4ef21
</span>Binary files /dev/null and b/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff b/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ca7f1d..f0e3418 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MYOSGLUE.c.orig 2011-09-18 23:59:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MYOSGLUE.c 2013-05-21 01:53:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3410,55 +3410,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MYOSGLUE.c.orig 2012-05-27 04:47:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MYOSGLUE.c 2013-05-21 06:49:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3436,55 +3436,19 @@
</span> #if IncludeSonyNew
LOCALPROC MakeNewDisk(ui5b L, CFStringRef NewDiskName)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,6 @@
</span> - }
-
- DisposeNavEventUPP(gEventProc);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NewDiskName != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease(NewDiskName);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff b/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..86686d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MYOSGLUE.m.orig 2014-03-03 04:22:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MYOSGLUE.m 2014-05-22 06:54:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3506,70 +3506,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if IncludeSonyNew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCALPROC MakeNewDisk(ui5b L, NSString *drivename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSInteger result = NSCancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSSavePanel *panel = [NSSavePanel savePanel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DisconnectKeyCodes3();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ForceShowCursor();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ([panel respondsToSelector:@selector(setNameFieldStringValue:)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [panel setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* available as of OS X 10.6 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [panel performSelector:@selector(setNameFieldStringValue:)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- withObject: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = [panel runModal];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ([panel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- respondsToSelector: @selector(runModalForDirectory:file:)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = [panel runModalForDirectory: nil file: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- compiler warns deprecated. To avoid warning, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- to still work if removed from SDK, use NSInvocation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *sDirName = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SEL sel = @selector(runModalForDirectory:file:);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSInvocation* invoc =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSInvocation invocationWithMethodSignature:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [panel methodSignatureForSelector: sel]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc setTarget:panel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc setSelector:sel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc setArgument:&sDirName atIndex:2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc setArgument:&drivename atIndex:3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc invoke];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [invoc getReturnValue: &result];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* an easier way ? seems to work */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- runModalForDirectory: nil file: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* fail */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [MyWindow makeKeyWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NSOKButton == result) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString* filePath = [[panel URL] path];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *sPath =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [myAppDir stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MakeNewDisk0(L, sPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MakeNewDisk0(L, [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:drivename]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>