[51645] users/ryandesign/minivmac-devel
ryandesign at macports.org
ryandesign at macports.org
Fri May 29 19:04:29 PDT 2009
Revision: 51645
http://trac.macports.org/changeset/51645
Author: ryandesign at macports.org
Date: 2009-05-29 19:04:28 -0700 (Fri, 29 May 2009)
Log Message:
-----------
minivmac-devel: Remove the model variants (which were never updated for Mini vMac 3); now always build all variants.
Modified Paths:
--------------
users/ryandesign/minivmac-devel/Portfile
Removed Paths:
-------------
users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac128k.diff
users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512k.diff
users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512ke.diff
users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-macse.diff
Modified: users/ryandesign/minivmac-devel/Portfile
===================================================================
--- users/ryandesign/minivmac-devel/Portfile 2009-05-30 00:53:24 UTC (rev 51644)
+++ users/ryandesign/minivmac-devel/Portfile 2009-05-30 02:04:28 UTC (rev 51645)
@@ -5,6 +5,7 @@
name minivmac-devel
set my_name minivmac
version 3.1.0-20090402
+revision 1
set version_number [lindex [split ${version} -] 0]
set version_date [lindex [split ${version} -] 1]
set version_short_date [string range ${version_date} 2 end]
@@ -58,9 +59,16 @@
set my_options_file options.txt
set my_base_options "-maintainer MacPorts -homepage http://www.macports.org/ -cl -eol unx -nex"
set my_target ""
-set my_machine Plus
-set my_variation_machine mac[string tolower ${my_machine}]
+# variation_id variation_suffix variation_options
+set my_variations {
+ 128k "128K" {-m 128K}
+ 512k "512K" {-m 128K -mem 512K}
+ 512ke "512Ke" {-m 512Ke}
+ plus "Plus" {-m Plus}
+ se "SE" {-m SE}
+}
+
platform powerpc {
set my_target mach
}
@@ -124,69 +132,52 @@
file rename ${worksrcpath}/projects/gcc_${my_target}/Build.app ${worksrcpath}
}
- # Write our options file.
- set my_variation [my_get_variation]
- set my_options "${my_base_options} -t ${my_target} -m ${my_machine} -n ${my_variation}"
- set my_options_file_id [open ${worksrcpath}/${my_options_file} "w"]
- puts -nonewline ${my_options_file_id} ${my_options}
- close ${my_options_file_id}
-
- # Run the build system.
- set my_cmd "${workpath}/runbuild.sh ${worksrcpath} ${worksrcpath}/${my_options_file}"
- ui_debug ${my_cmd}
- system ${my_cmd}
-
- # Get the build product.
- file rename ${worksrcpath}/output/${my_variation} ${workpath}
+ file mkdir ${workpath}/${my_target}
+ foreach {variation_id variation_suffix variation_options} ${my_variations} {
+ ui_debug "Configuring ${variation_id}"
+
+ # Due to limitations of the build system, the variation name cannot be longer than 27 characters.
+ set variation_name ${version}_${revision}-${variation_id}
+
+ # Write our options file.
+ set my_options "${my_base_options} -t ${my_target} -n ${variation_name} ${variation_options}"
+ set my_options_file_id [open ${worksrcpath}/${my_options_file} "w"]
+ puts -nonewline ${my_options_file_id} ${my_options}
+ close ${my_options_file_id}
+
+ # Run the build system.
+ set my_cmd "${workpath}/runbuild.sh ${worksrcpath} ${worksrcpath}/${my_options_file}"
+ ui_debug ${my_cmd}
+ system ${my_cmd}
+
+ # Get the build product.
+ file rename ${worksrcpath}/output/${variation_name} ${workpath}/${my_target}/${variation_id}
+ }
}
-pre-build {
- set my_variation [my_get_variation]
- build.dir ${workpath}/${my_variation}
+build {
+ foreach {variation_id variation_suffix variation_options} ${my_variations} {
+ ui_debug "Building ${variation_id}"
+
+ build.dir ${workpath}/${my_target}/${variation_id}
+ set my_cmd "cd ${build.dir} && [build_getnicevalue] ${build.cmd} ${build.target} [build_getmakejobs]"
+ ui_debug ${my_cmd}
+ system ${my_cmd}
+
+ eval xinstall -m 644 [glob ${workpath}/${my_icons}/icons/*.icns] ${workpath}/${my_target}/${variation_id}/minivmac.app/Contents/Resources
+ }
}
-post-build {
- set my_variation [my_get_variation]
- eval xinstall -m 644 [glob ${workpath}/${my_icons}/icons/*.icns] ${workpath}/${my_variation}/minivmac.app/Contents/Resources
-}
-
destroot {
- set my_variation [my_get_variation]
xinstall -d ${destroot}${my_appdir}
- file copy ${workpath}/${my_variation}/minivmac.app \
- ${destroot}${my_appdir}/Mini\ vMac\ ${my_machine}.app
+ foreach {variation_id variation_suffix variation_options} ${my_variations} {
+ ui_debug "Staging ${variation_id}"
+
+ file copy ${workpath}/${my_target}/${variation_id}/minivmac.app \
+ ${destroot}${my_appdir}/Mini\ vMac\ ${variation_suffix}.app
+ }
}
-if { ![variant_isset mac128k] && ![variant_isset mac512k] && ![variant_isset mac512ke] && ![variant_isset macse] } {
- default_variants +macplus
-}
-
-variant mac128k conflicts mac512k mac512ke macplus macse description {Emulate a Macintosh with 128K RAM and 2 drives} {
- patchfiles-append patch-CNFGGLOB.h-mac128k.diff
- set romfile Mac128K.ROM
- set romfile_model "Macintosh 128K or 512K"
-}
-
-variant mac512k conflicts mac128k mac512ke macplus macse description {Emulate a Macintosh 512K with 512K RAM and 2 drives} {
- patchfiles-append patch-CNFGGLOB.h-mac512k.diff
- set romfile Mac128K.ROM
- set romfile_model "Macintosh 128K or 512K"
-}
-
-variant mac512ke conflicts mac128k mac512k macplus macse description {Emulate a Macintosh 512Ke with 512K RAM and 6 drives} {
- patchfiles-append patch-CNFGGLOB.h-mac512ke.diff
-}
-
-variant macplus conflicts mac128k mac512k mac512ke macse description {Emulate a Macintosh Plus with 4 MB RAM and 6 drives (default)} {
- # Mac Plus emulation is the default so we don't need to do anything here
-}
-
-variant macse conflicts mac128k mac512k mac512ke macplus description {Emulate a Macintosh SE with 4 MB RAM and 6 drives} {
- patchfiles-append patch-CNFGGLOB.h-macse.diff
- set romfile MacSE.ROM
- set romfile_model "Macintosh SE"
-}
-
proc my_attach_disk_image {disk_image allow_writing} {
global name workpath
set mountpoint [exec mktemp -d -q -t ${name}]
@@ -208,12 +199,6 @@
file delete -force ${mountpoint}
}
-proc my_get_variation {} {
- global version revision my_variation_machine
- # Due to limitations of the build system, the variation name cannot be longer than 27 characters.
- return ${version}_${revision}-${my_variation_machine}
-}
-
livecheck.check regex
livecheck.version ${version_short_date}
livecheck.url ${homepage}develop/
Deleted: users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac128k.diff
===================================================================
--- users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac128k.diff 2009-05-30 00:53:24 UTC (rev 51644)
+++ users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac128k.diff 2009-05-30 02:04:28 UTC (rev 51645)
@@ -1,6 +0,0 @@
---- config/CNFGGLOB.h 2007-04-04 05:47:40.000000000 -0500
-+++ config/CNFGGLOB.h-mac128k 2007-04-05 02:30:44.000000000 -0500
-@@ -13,2 +13,3 @@
- #define kStrHomePage "http://minivmac.sourceforge.net/"
-
-+#define CurEmu kEmu128K
Deleted: users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512k.diff
===================================================================
--- users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512k.diff 2009-05-30 00:53:24 UTC (rev 51644)
+++ users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512k.diff 2009-05-30 02:04:28 UTC (rev 51645)
@@ -1,6 +0,0 @@
---- config/CNFGGLOB.h 2007-04-04 05:47:40.000000000 -0500
-+++ config/CNFGGLOB.h-mac512k 2007-04-05 03:01:24.000000000 -0500
-@@ -13,2 +13,3 @@
- #define kStrHomePage "http://minivmac.sourceforge.net/"
-
-+#define CurEmu kEmu512K
Deleted: users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512ke.diff
===================================================================
--- users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512ke.diff 2009-05-30 00:53:24 UTC (rev 51644)
+++ users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-mac512ke.diff 2009-05-30 02:04:28 UTC (rev 51645)
@@ -1,6 +0,0 @@
---- config/CNFGGLOB.h 2007-04-04 05:47:40.000000000 -0500
-+++ config/CNFGGLOB.h-mac512ke 2007-04-05 03:01:39.000000000 -0500
-@@ -13,2 +13,3 @@
- #define kStrHomePage "http://minivmac.sourceforge.net/"
-
-+#define CurEmu kEmu512Ke
Deleted: users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-macse.diff
===================================================================
--- users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-macse.diff 2009-05-30 00:53:24 UTC (rev 51644)
+++ users/ryandesign/minivmac-devel/files/patch-CNFGGLOB.h-macse.diff 2009-05-30 02:04:28 UTC (rev 51645)
@@ -1,6 +0,0 @@
---- config/CNFGGLOB.h 2007-04-04 05:47:40.000000000 -0500
-+++ config/CNFGGLOB.h-macse 2007-04-05 03:01:48.000000000 -0500
-@@ -13,2 +13,3 @@
- #define kStrHomePage "http://minivmac.sourceforge.net/"
-
-+#define CurEmu kEmuSE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090529/38d6f8a4/attachment-0001.html>
More information about the macports-changes
mailing list