Bug 537817: Enable tamarin builds on snow leopard (p=jsudduth, r=edwsmith+cpeyer)
authorChris Peyer <cpeyer@adobe.com>
Thu, 01 Jul 2010 14:51:35 -0700
changeset 4903 6b542c6509d2117376181a2d3299b200446cd116
parent 4902 d4ae1396db36cbd31a0dbac05573a1dcfd433e99
child 4904 bf8d82bfe9766d87846392050cd9c679b17caf6c
push id2604
push usercpeyer@adobe.com
push dateThu, 01 Jul 2010 21:52:55 +0000
reviewersedwsmith
bugs537817
Bug 537817: Enable tamarin builds on snow leopard (p=jsudduth, r=edwsmith+cpeyer)
build/buildbot/master/argo.py
build/buildbot/master/sandbox.py
build/buildbot/master/tamarinredux.py
build/configuration.py
build/getopt.py
configure.py
--- a/build/buildbot/master/argo.py
+++ b/build/buildbot/master/argo.py
@@ -253,26 +253,26 @@ class argo:
     #### builder for mac-intel-10_4-compile ####
     ############################################
     mac_intel_104_compile_factory = factory.BuildFactory()
     mac_intel_104_compile_factory.addStep(sync_clean)
     mac_intel_104_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_104_compile_factory.addStep(sync_update)
     mac_intel_104_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_4"))
     mac_intel_104_compile_factory.addStep(compile_builtin)
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile-argo",
                 'slavename': "asteammac4",
                 'factory': mac_intel_104_compile_factory,
                 'builddir': './argo-mac-intel-10_4-compile',
@@ -284,26 +284,26 @@ class argo:
     #### builder for mac-intel-10_5-compile ####
     ############################################
     mac_intel_105_compile_factory = factory.BuildFactory()
     mac_intel_105_compile_factory.addStep(sync_clean)
     mac_intel_105_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_105_compile_factory.addStep(sync_update)
     mac_intel_105_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_5"))
     mac_intel_105_compile_factory.addStep(compile_builtin)
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-argo",
                 'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './argo-mac-intel-10_5-compile',
@@ -314,26 +314,26 @@ class argo:
     #### builder for mac-intel-64-compile ####
     ##########################################
     mac_intel_64_compile_factory = factory.BuildFactory()
     mac_intel_64_compile_factory.addStep(sync_clean)
     mac_intel_64_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_64_compile_factory.addStep(sync_update)
     mac_intel_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-intel"))
     mac_intel_64_compile_factory.addStep(compile_builtin)
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-argo",
                 'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './argo-mac64-intel-compile',
@@ -1800,19 +1800,19 @@ class argo:
     mac_ppc_deep_factory.addStep(bb_slaveupdate(slave="mac-ppc-deep"))
     mac_ppc_deep_factory.addStep(download_testmedia)
     mac_ppc_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_ppc", vmargs="", config="ppc-mac-tvm-debug-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Debug64", shellname="avmshell_d_64_ppc", vmargs="", config="ppc-mac-tvm-debug-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger64", shellname="avmshell_sd_64_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(deep_release_esc)
     mac_ppc_deep_factory.addStep(test_misc)
-    mac_ppc_deep_factory.addStep(compile_generic(name="Release-api", shellname="avmshell_api_ppc", args="--enable-shell --enable-api-versioning", upload="true"))
+    mac_ppc_deep_factory.addStep(compile_generic(name="Release-api", shellname="avmshell_api_ppc", args="--enable-shell --enable-api-versioning --mac-sdk=104u", upload="true"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-api", shellname="avmshell_api_ppc", vmargs="", config="", scriptargs="versioning/"))
-    mac_ppc_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
+    mac_ppc_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger --mac-sdk=104u", upload="true"))
     mac_ppc_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_ppc", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_ppc_deep_factory.addStep(util_process_clean)
     mac_ppc_deep_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_deep_builder = {
                 'name': "mac-ppc-deep-argo",
--- a/build/buildbot/master/sandbox.py
+++ b/build/buildbot/master/sandbox.py
@@ -205,26 +205,26 @@ class sandbox:
     #### builder for mac-intel-10_4-compile-sandbox ####
     ####################################################
     sb_mac_intel_104_compile_factory = factory.BuildFactory()
     sb_mac_intel_104_compile_factory.addStep(sync_clean)
     sb_mac_intel_104_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_intel_104_compile_factory.addStep(sync_update)
     sb_mac_intel_104_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_4"))
     sb_mac_intel_104_compile_factory.addStep(compile_builtin)
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile-sandbox",
                 'slavename': "asteammac4",
                 'factory': sb_mac_intel_104_compile_factory,
                 'builddir': './sandbox-mac-intel-10_4-compile',
@@ -235,26 +235,26 @@ class sandbox:
     #### builder for mac-intel-10_5-compile-sandbox ####
     ####################################################
     sb_mac_intel_105_compile_factory = factory.BuildFactory()
     sb_mac_intel_105_compile_factory.addStep(sync_clean)
     sb_mac_intel_105_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_intel_105_compile_factory.addStep(sync_update)
     sb_mac_intel_105_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_5"))
     sb_mac_intel_105_compile_factory.addStep(compile_builtin)
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-sandbox",
                 'slavename': "asteammac12-10_5",
                 'factory': sb_mac_intel_105_compile_factory,
                 'builddir': './sandbox-mac-intel-10_5-compile',
@@ -265,26 +265,26 @@ class sandbox:
     #### builder for mac-intel-64-compile-sandbox ####
     ##################################################
     sb_mac_intel_64_compile_factory = factory.BuildFactory()
     sb_mac_intel_64_compile_factory.addStep(sync_clean)
     sb_mac_intel_64_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_intel_64_compile_factory.addStep(sync_update)
     sb_mac_intel_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-intel"))
     sb_mac_intel_64_compile_factory.addStep(compile_builtin)
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
-    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-sandbox",
                 'slavename': "asteammac12-64bit",
                 'factory': sb_mac_intel_64_compile_factory,
                 'builddir': './sandbox-mac64-intel-compile',
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -264,26 +264,26 @@ class tamarinredux:
     #### builder for mac-intel-10_4-compile ####
     ############################################
     mac_intel_104_compile_factory = factory.BuildFactory()
     mac_intel_104_compile_factory.addStep(sync_clean)
     mac_intel_104_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_104_compile_factory.addStep(sync_update)
     mac_intel_104_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_4"))
     mac_intel_104_compile_factory.addStep(compile_builtin)
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_104", args="--enable-shell --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_104", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_104", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_104", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_104", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_104_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_104_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile",
                 'slavename': "asteammac4",
                 'factory': mac_intel_104_compile_factory,
                 'builddir': './mac-intel-10_4-compile',
@@ -295,26 +295,26 @@ class tamarinredux:
     #### builder for mac-intel-10_5-compile ####
     ############################################
     mac_intel_105_compile_factory = factory.BuildFactory()
     mac_intel_105_compile_factory.addStep(sync_clean)
     mac_intel_105_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_105_compile_factory.addStep(sync_update)
     mac_intel_105_compile_factory.addStep(bb_slaveupdate(slave="mac-intel-10_5"))
     mac_intel_105_compile_factory.addStep(compile_builtin)
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin", upload="false"))
-    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell", args="--enable-shell --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode", args="--enable-shell --enable-wordcode-interp --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_ppc", args="--enable-shell --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
+    mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile",
                 'slavename': "asteammac12-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './mac-intel-10_5-compile',
@@ -325,26 +325,26 @@ class tamarinredux:
     #### builder for mac-intel-64-compile ####
     ##########################################
     mac_intel_64_compile_factory = factory.BuildFactory()
     mac_intel_64_compile_factory.addStep(sync_clean)
     mac_intel_64_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_intel_64_compile_factory.addStep(sync_update)
     mac_intel_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-intel"))
     mac_intel_64_compile_factory.addStep(compile_builtin)
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin", upload="false"))
-    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release_PPC", shellname="avmshell_64_ppc", args="--enable-shell --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Release-wordcode_PPC", shellname="avmshell_wordcode_64_ppc", args="--enable-shell --enable-wordcode-interp --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
+    mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile",
                 'slavename': "asteammac12-64bit",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './mac64-intel-compile',
@@ -1959,19 +1959,19 @@ class tamarinredux:
     mac_ppc_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd_ppc"))
     mac_ppc_deep_factory.addStep(test_selftest(name="DebugDebugger64", shellname="avmshell_sd_64_ppc"))
     mac_ppc_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_ppc", vmargs="", config="ppc-mac-tvm-debug-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Debug64", shellname="avmshell_d_64_ppc", vmargs="", config="ppc-mac-tvm-debug-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger64", shellname="avmshell_sd_64_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(deep_release_esc)
     mac_ppc_deep_factory.addStep(test_misc)
-    mac_ppc_deep_factory.addStep(compile_generic(name="Release-api", shellname="avmshell_api_ppc", args="--enable-shell --enable-api-versioning", upload="true"))
+    mac_ppc_deep_factory.addStep(compile_generic(name="Release-api", shellname="avmshell_api_ppc", args="--enable-shell --enable-api-versioning --mac-sdk=104u", upload="true"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-api", shellname="avmshell_api_ppc", vmargs="", config="", scriptargs="versioning/"))
-    mac_ppc_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
+    mac_ppc_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger --mac-sdk=104u", upload="true"))
     mac_ppc_deep_factory.addStep(test_generic(name="ReleasDebugger-air", shellname="avmshell_air_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_ppc", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_ppc_deep_factory.addStep(util_process_clean)
     mac_ppc_deep_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_deep_builder = {
                 'name': "mac-ppc-deep",
--- a/build/configuration.py
+++ b/build/configuration.py
@@ -198,24 +198,22 @@ class Configuration:
                 'MKDLL'        : '$(LD) -DLL -OUT:$(1)',
                 'MKPROGRAM'    : '$(LD) -OUT:$(1)',
                 'EXPAND_LIBNAME' : '$(1).lib',
                 'EXPAND_DLLNAME' : '$(1).lib',
                 'OUTOPTION' : '-Fo',
                 'LIBPATH'   : '-LIBPATH:'
                 })
             if self._target[1] == "arm":
-				self._acvars.update({'LDFLAGS' : '-NODEFAULTLIB:"oldnames.lib" -ENTRY:"mainWCRTStartup"'})
-				
-				if sys.platform.startswith('cygwin'):
-					self._acvars.update({'ASM' : '$(topsrcdir)/build/cygwin-wrapper.sh armasm.exe -nologo -arch 5T'})
-				else:
-					self._acvars.update({'ASM' : 'armasm.exe -nologo -arch 5T'})
-				
-				
+                self._acvars.update({'LDFLAGS' : '-NODEFAULTLIB:"oldnames.lib" -ENTRY:"mainWCRTStartup"'})
+                if sys.platform.startswith('cygwin'):
+                    self._acvars.update({'ASM' : '$(topsrcdir)/build/cygwin-wrapper.sh armasm.exe -nologo -arch 5T'})
+                else:
+                    self._acvars.update({'ASM' : 'armasm.exe -nologo -arch 5T'})
+
             if self._target[1] == "x86_64":
                 if sys.platform.startswith('cygwin'):
                     self._acvars.update({'MASM' : '$(topsrcdir)/build/cygwin-wrapper.sh ml64.exe -nologo -c '})
                 else:
                     self._acvars.update({'MASM' : 'ml64.exe -nologo -c '})
 
             if sys.platform.startswith('cygwin'):
                 self._acvars.update({'CXX'          : '$(topsrcdir)/build/cygwin-wrapper.sh cl.exe -nologo'})
@@ -293,31 +291,31 @@ class Configuration:
                 'MKPROGRAM'    : '$(CXX) -o $(1)'
                 })
             if self._target[1] == "mips":
                 self._acvars.update({'CXXFLAGS' : ''})
                 self._acvars.update({'LDFLAGS' : ''})
                 self._acvars.update({'zlib_EXTRA_CFLAGS' : ''})
                 
         elif self._target[0] == 'sunos':
-	    if options.getBoolArg("gcc", False):
+            if options.getBoolArg("gcc", False):
                 self._acvars.update({
                 'CPPFLAGS'     : os.environ.get('CPPFLAGS', '') + "-DBROKEN_OFFSETOF",
                 'CXX'          : os.environ.get('CXX', 'g++'),
                 'CXXFLAGS'     : os.environ.get('CXXFLAGS', ''),
                 'CC'           : os.environ.get('CC', 'gcc'),
                 'CFLAGS'       : os.environ.get('CFLAGS', ''),
                 'DLL_CFLAGS'   : '-fPIC',
                 'LD'           : 'ar',
                 'LDFLAGS'      : '',
                 'MKSTATICLIB'  : '$(AR) cr $(1)',
                 'MKDLL'        : '$(CXX) -shared -o $(1)',
                 'MKPROGRAM'    : '$(CXX) -o $(1)'
                 })
- 	    else:
+            else:
                 self._compiler = 'SunStudio'
                 self._acvars.update({
                 'I_SUFFIX': 'i',
                 'II_SUFFIX': 'i',
                 'CPPFLAGS'     : '',
                 'CXX'          : 'CC',
                 'CXXFLAGS'     : '',
                 'CC'           : 'cc',
--- a/build/getopt.py
+++ b/build/getopt.py
@@ -40,40 +40,46 @@ import re
 
 _target = re.compile("^--target=(.*)$")
 _host = re.compile("^--host=(.*)$")
 _ignore = re.compile(r"^--(srcdir|cache-file)=")
 _arg = re.compile(r"^--(enable|disable|with|without)-([\w-]+)(?:=(.*)|$)$")
 _yes = re.compile("^(t|true|yes|y|1)$", re.I)
 _no = re.compile("^(f|false|no|n|0)$", re.I)
 _help = re.compile("^(-h|--help)$")
-
+_sdk = re.compile("^--mac-sdk=(.*)$")
 
 class Options:
     def __init__(self, argv = sys.argv):
         self._args = {}
         self.target = None
         self.host = None
         self.ignore_unknown_flags = False
         self.help = False
         self._allargs = {}
+        self.sdk_version = None
 
 
         unknown_args = []
         for arg in argv[1:]:
             m = _target.search(arg)
             if m:
                 self.target = m.group(1)
                 continue
 
             m = _host.search(arg)
             if m:
                 self.host = m.group(1)
                 continue
 
+            m = _sdk.search(arg)
+            if m:
+                self.sdk_version = m.group(1)
+                continue
+
             if _ignore.search(arg) is not None:
                 continue
 
             if arg == '--ignore-unknown-flags':
                 self.ignore_unknown_flags = True
                 continue
 
             if _help.search(arg) is not None:
@@ -101,17 +107,17 @@ class Options:
 
             elif t == "disable" or t == "without":
                 if v:
                     raise Exception("--disable-" + n + " does not take a value.")
 
                 self._args[n] = False
 
         if unknown_args and not self.ignore_unknown_flags:
-            raise Exception("Unrecognized command line parameters: "
+            raise Exception("Unrecognized command line parameter(s): "
                             + ', '.join(unknown_args))
 
 
     def getBoolArg(self, name, default=None, remove=True):
         self._allargs[name] = default
         if not name in self._args:
             return default
 
--- a/configure.py
+++ b/configure.py
@@ -41,26 +41,51 @@
 # This script runs just like a traditional configure script, to do configuration
 # testing and makefile generation.
 
 import os
 import os.path
 import sys
 import build.process
 import re
+import subprocess
 
 thisdir = os.path.dirname(os.path.abspath(__file__))
 
 # Look for additional modules in our build/ directory.
 sys.path.append(thisdir)
 
 from build.configuration import *
 import build.getopt
 import build.avmfeatures
 
+
+def _setSDKParams(sdk_version,os_ver):
+    # On 10.5/6 systems, if "--mac-sdk=104u" is passed in, compile for the 10.4u SDK and override CC/CXX to use gcc/gxx 4.0.x
+    if sdk_version == '104u':
+        os_ver,sdk_number = '10.4','10.4u'
+        config._acvars['CXX'] = 'g++-4.0'
+        config._acvars['CC']  = 'gcc-4.0'
+    elif sdk_version == '105':
+        os_ver,sdk_number = '10.5','10.5'
+    elif sdk_version == '106':
+        os_ver,sdk_number = '10.6','10.6'
+    # For future expansion
+    #elif sdk_version == '107':
+        #os_ver,sdk_number = '10.7','10.7'
+    else:
+        print'Unknown SDK version -> %s. Expected values are 104u, 105 or 106.' % sdk_version
+        sys.exit(2)
+
+    if not os.path.exists("/Developer/SDKs/MacOSX%s.sdk" % sdk_number):
+        print'Could not find /Developer/SDKs/MacOSX%s.sdk' % sdk_number
+        sys.exit(2)
+    else:
+        return os_ver,sdk_number
+
 o = build.getopt.Options()
 
 config = Configuration(thisdir, options = o,
                        sourcefile = 'core/avmplus.h')
 
 buildTamarin = o.getBoolArg('tamarin', True)
 if buildTamarin:
     config.subst("ENABLE_TAMARIN", 1)
@@ -103,18 +128,18 @@ MMGC_INTERIOR_PTRS = o.getBoolArg('mmgc-
 if MMGC_INTERIOR_PTRS:
     MMGC_DEFINES['MMGC_INTERIOR_PTRS'] = None
 
 MMGC_DYNAMIC = o.getBoolArg('mmgc-shared', False)
 if MMGC_DYNAMIC:
     MMGC_DEFINES['MMGC_DLL'] = None
     MMGC_CPPFLAGS += "-DMMGC_IMPL "
 
-arm_fpu = o.getBoolArg("arm-fpu",False)  
-arm_neon = o.getBoolArg("arm-neon",False)  
+arm_fpu = o.getBoolArg("arm-fpu",False)
+arm_neon = o.getBoolArg("arm-neon",False)
 
 the_os, cpu = config.getTarget()
 
 # For -Wreorder, see https://bugzilla.mozilla.org/show_bug.cgi?id=475750
 if config.getCompiler() == 'GCC':
     if 'CXX' in os.environ:
 		rawver = build.process.run_for_output(['$CXX', '--version'])
     else:
@@ -149,17 +174,17 @@ elif config.getCompiler() == 'VS':
         APP_CXXFLAGS = "-W4 -WX -wd4291 -wd4201 -wd4189 -wd4740 -wd4127 -fp:fast -GF -GS- -Zc:wchar_t- "
         OS_LDFLAGS += "-MAP "
         if config.getDebug():
             DEBUG_CXXFLAGS = "-Od "
             DEBUG_CFLAGS = "-Od "
             APP_CXXFLAGS += "-GR- -fp:fast -GS- -Zc:wchar_t- -Zc:forScope "
         else:
             OPT_CXXFLAGS = "-O2 -GR- "
-            
+
         if arm_fpu:
             OPT_CXXFLAGS += "-QRfpe- -QRarch6"  # compile to use hardware fpu and armv6
     else:
         APP_CXXFLAGS = "-W4 -WX -wd4291 -GF -GS- -Zc:wchar_t- "
         APP_CFLAGS = "-W4 -WX -wd4291 -GF -GS- -Zc:wchar_t- "
 	if cpu == 'x86_64':
 		pass # 64 bit VC does NaN comparisons incorrectly with fp:fast
 	else:
@@ -195,40 +220,48 @@ else:
     AVMSHELL_LDFLAGS = '$(call EXPAND_LIBNAME,zlib)'
 
 sys_root_dir = o.getStringArg('sys-root-dir')
 if sys_root_dir is not None:
     OS_LDFLAGS += " --sysroot=%s " % sys_root_dir
     OPT_CXXFLAGS += " --sysroot=%s " % sys_root_dir
 
 if the_os == "darwin":
+    # Get machine's OS version number and trim off anything after '10.x'
+    p = subprocess.Popen('sw_vers -productVersion', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    os_ver = p.stdout.read()
+    parts = os_ver.split('.')
+    os_ver = parts[0] + '.' + parts[1]
+
     AVMSHELL_LDFLAGS += " -exported_symbols_list "  + thisdir + "/platform/mac/avmshell/exports.exp"
     MMGC_DEFINES.update({'TARGET_API_MAC_CARBON': 1,
                          'DARWIN': 1,
                          '_MAC': None,
                          'AVMPLUS_MAC': None,
                          'TARGET_RT_MAC_MACHO': 1})
     APP_CXXFLAGS += "-fpascal-strings -faltivec -fasm-blocks "
-    if cpu == 'x86_64' or cpu == 'ppc64':
-        # 64-bit mac targets require the 10.5 sdk.
-        # Note that we don't override CC/CXX here; the calling script is expected to do that if desired 
-        # (thus we can support 10.5sdk with either 4.0 or 4.2)
-        APP_CXXFLAGS += "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk "
-        config.subst("MACOSX_DEPLOYMENT_TARGET",10.5)
-        if cpu == 'x86_64':
-            APP_CXXFLAGS += "-arch x86_64 "
-            APP_CFLAGS += "-arch x86_64 "
-            OS_LDFLAGS += "-arch x86_64 "
-        else:
-            APP_CXXFLAGS += "-arch ppc64 "
-            APP_CFLAGS += "-arch ppc64 "
-            OS_LDFLAGS += "-arch ppc64 "
+
+    # If an sdk is selected align OS and gcc/g++ versions to it
+    if o.sdk_version is not None:
+        os_ver,sdk_number = _setSDKParams(o.sdk_version, os_ver)
+        APP_CXXFLAGS += "-mmacosx-version-min=%s -isysroot /Developer/SDKs/MACOSX%s.sdk " % (os_ver,sdk_number)
     else:
-        APP_CXXFLAGS += "-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk "
-        config.subst("MACOSX_DEPLOYMENT_TARGET",10.4)
+        APP_CXXFLAGS += "-mmacosx-version-min=%s " % os_ver
+
+    config.subst("MACOSX_DEPLOYMENT_TARGET",os_ver)
+
+    if cpu == 'ppc64':
+        APP_CXXFLAGS += "-arch ppc64 "
+        APP_CFLAGS += "-arch ppc64 "
+        OS_LDFLAGS += "-arch ppc64 "
+    elif cpu == 'x86_64':
+        APP_CXXFLAGS += "-arch x86_64 "
+        APP_CFLAGS += "-arch x86_64 "
+        OS_LDFLAGS += "-arch x86_64 "
+
 elif the_os == "windows" or the_os == "cygwin":
     MMGC_DEFINES.update({'WIN32': None,
                          '_CRT_SECURE_NO_DEPRECATE': None})
     OS_LDFLAGS += "-MAP "
     if cpu == "arm":
         APP_CPPFLAGS += "-DARM -D_ARM_ -DUNICODE -DUNDER_CE=1 -DMMGC_ARM "
         if arm_fpu:
             APP_CPPFLAGS += "-DARMV6 -QRarch6 "
@@ -323,9 +356,8 @@ config.subst("OS_LIBS", " ".join(OS_LIBS
 config.subst("OS_LDFLAGS", OS_LDFLAGS)
 config.subst("MMGC_CPPFLAGS", MMGC_CPPFLAGS)
 config.subst("AVMSHELL_CPPFLAGS", AVMSHELL_CPPFLAGS)
 config.subst("AVMSHELL_LDFLAGS", AVMSHELL_LDFLAGS)
 config.subst("MMGC_DYNAMIC", MMGC_DYNAMIC and 1 or '')
 config.generate("Makefile")
 
 o.finish()
-