Bug 562324: move windows64 shell compilation from win64 buildslave to the windows-mobile buildslave which is a much faster machine (r=dschaffe+)
authorBrent Baker <brbaker@adobe.com>
Thu, 29 Apr 2010 11:43:52 -0400
changeset 4599 acf96e983e6c7fb0a89c51ff9df158c3fcf1fc8c
parent 4598 e45ab3aefbdbd5450df2dd88000a491e23fae3e5
child 4600 d64894332c4202eae99b3f5710d78016a43b54f1
push id2404
push userbrbaker@adobe.com
push dateThu, 29 Apr 2010 15:44:15 +0000
reviewersdschaffe
bugs562324
Bug 562324: move windows64 shell compilation from win64 buildslave to the windows-mobile buildslave which is a much faster machine (r=dschaffe+)
build/buildbot/master/argo.py
build/buildbot/master/sandbox.py
build/buildbot/master/tamarinredux.py
build/buildbot/slaves/winmobile-arm/scripts/build-check.sh
build/buildbot/slaves/winmobile-arm/scripts/environment.sh
build/buildbot/slaves/winmobile-arm/scripts/upload-asteam.sh
build/buildbot/slaves/winmobile-arm/scripts/upload-mozilla.sh
--- a/build/buildbot/master/argo.py
+++ b/build/buildbot/master/argo.py
@@ -231,24 +231,16 @@ class argo:
     #######################################
     #### builder for windows64-compile ####
     #######################################
     windows_64_compile_factory = factory.BuildFactory()
     windows_64_compile_factory.addStep(sync_clean)
     windows_64_compile_factory.addStep(sync_clone(url=HG_URL))
     windows_64_compile_factory.addStep(sync_update)
     windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
-    windows_64_compile_factory.addStep(compile_builtin)
-    windows_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-win", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-win", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_buildcheck_local)
-    windows_64_compile_factory.addStep(util_upload_asteam)
 
     windows_64_compile_builder = {
                 'name': "windows64-compile-argo",
                 'slavename': "asteamwin3",
                 'factory': windows_64_compile_factory,
                 'builddir': './argo-windows64-compile',
     }
 
@@ -526,16 +518,71 @@ class argo:
     winmobile_emulator_compile_factory.addStep(sync_update)
     winmobile_emulator_compile_factory.addStep(bb_slaveupdate(slave="winmobile-arm"))
     winmobile_emulator_compile_factory.addStep(compile_builtin)
     winmobile_emulator_compile_factory.addStep(compile_generic(name="ReleaseARM", shellname="avmshell_arm", args="--enable-shell --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-wordcode-ARM", shellname="avmshell_wordcode_arm", args="--enable-shell --enable-wordcode-interp --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-fpu-ARM", shellname="avmshell_fpu_arm", args="--enable-shell --enable-arm-fpu --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="DebugARM", shellname="avmshell_arm_d", args="--enable-shell --enable-debug --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Debug-fpu-ARM", shellname="avmshell_fpu_arm_d", args="--enable-shell --enable-debug --enable-arm-fpu --target=arm-windows", upload="false"))
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --target=x86_64-win', 'avmshell_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release64 build...',
+                descriptionDone='finished Release64 build.',
+                name="Release64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-wordcode-interp --target=x86_64-win', 'avmshell_wordcode_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release-wordcode64 build...',
+                descriptionDone='finished Release-wordcode64 build.',
+                name="Release-wordcode64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --target=x86_64-win', 'avmshell_d_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Debug64 build...',
+                descriptionDone='finished Debug64 build.',
+                name="Debug64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debugger --target=x86_64-win', 'avmshell_s_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting ReleaseDebugger64 build...',
+                descriptionDone='finished ReleaseDebugger64 build.',
+                name="ReleaseDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --enable-debugger --target=x86_64-win', 'avmshell_sd_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting DebugDebugger64 build...',
+                descriptionDone='finished DebugDebugger64 build.',
+                name="DebugDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
     winmobile_emulator_compile_factory.addStep(compile_buildcheck_local)
     winmobile_emulator_compile_factory.addStep(util_upload_asteam_local)
     winmobile_emulator_compile_factory.addStep(BuildShellCommand(
                 command=['./build-release-mobile-pocketpc-arm-sizereport.sh', WithProperties('%s','revision')],
                 env={'branch': WithProperties('%s','branch')},
                 description='starting to run sizereport...',
                 descriptionDone='finished sizereport.',
                 name="Build_Release_sizereport",
--- a/build/buildbot/master/sandbox.py
+++ b/build/buildbot/master/sandbox.py
@@ -178,25 +178,16 @@ class sandbox:
     ###############################################
     #### builder for windows64-compile-sandbox ####
     ###############################################
     sb_windows_64_compile_factory = factory.BuildFactory()
     sb_windows_64_compile_factory.addStep(sync_clean)
     sb_windows_64_compile_factory.addStep(sync_clone_sandbox)
     sb_windows_64_compile_factory.addStep(sync_update)
     sb_windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
-    sb_windows_64_compile_factory.addStep(compile_builtin)
-    sb_windows_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-win", upload="false"))
-    sb_windows_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-win", upload="false"))
-    sb_windows_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-win ", upload="false"))
-    sb_windows_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-win ", upload="false"))
-    sb_windows_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-win ", upload="false"))
-    sb_windows_64_compile_factory.addStep(compile_buildcheck_local)
-    sb_windows_64_compile_factory.addStep(util_upload_asteam)
-
 
     sb_windows_64_compile_builder = {
                 'name': "windows64-compile-sandbox",
                 'slavename': "asteamwin3",
                 'factory': sb_windows_64_compile_factory,
                 'builddir': './sandbox-windows64-compile',
     }
 
@@ -475,16 +466,71 @@ class sandbox:
     sb_winmobile_emulator_compile_factory.addStep(sync_update)
     sb_winmobile_emulator_compile_factory.addStep(bb_slaveupdate(slave="winmobile-arm"))
     sb_winmobile_emulator_compile_factory.addStep(compile_builtin)
     sb_winmobile_emulator_compile_factory.addStep(compile_generic(name="ReleaseARM", shellname="avmshell_arm", args="--enable-shell --target=arm-windows", upload="false"))
     sb_winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-wordcode-ARM", shellname="avmshell_wordcode_arm", args="--enable-shell --enable-wordcode-interp --target=arm-windows", upload="false"))
     sb_winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-fpu-ARM", shellname="avmshell_fpu_arm", args="--enable-shell --enable-arm-fpu --target=arm-windows", upload="false"))
     sb_winmobile_emulator_compile_factory.addStep(compile_generic(name="DebugARM", shellname="avmshell_arm_d", args="--enable-shell --enable-debug --target=arm-windows", upload="false"))
     sb_winmobile_emulator_compile_factory.addStep(compile_generic(name="Debug-fpu-ARM", shellname="avmshell_fpu_arm_d", args="--enable-shell --enable-debug --enable-arm-fpu --target=arm-windows", upload="false"))
+    sb_winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --target=x86_64-win', 'avmshell_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release64 build...',
+                descriptionDone='finished Release64 build.',
+                name="Release64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    sb_winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-wordcode-interp --target=x86_64-win', 'avmshell_wordcode_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release-wordcode64 build...',
+                descriptionDone='finished Release-wordcode64 build.',
+                name="Release-wordcode64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    sb_winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --target=x86_64-win', 'avmshell_d_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Debug64 build...',
+                descriptionDone='finished Debug64 build.',
+                name="Debug64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    sb_winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debugger --target=x86_64-win', 'avmshell_s_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting ReleaseDebugger64 build...',
+                descriptionDone='finished ReleaseDebugger64 build.',
+                name="ReleaseDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    sb_winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --enable-debugger --target=x86_64-win', 'avmshell_sd_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting DebugDebugger64 build...',
+                descriptionDone='finished DebugDebugger64 build.',
+                name="DebugDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
     sb_winmobile_emulator_compile_factory.addStep(compile_buildcheck_local)
     sb_winmobile_emulator_compile_factory.addStep(util_upload_asteam_local)
 
     sb_winmobile_emulator_compile_builder = {
                 'name': "winmobile-emulator-compile-sandbox",
                 'slavename': "asteamwin19",
                 'factory': sb_winmobile_emulator_compile_factory,
                 'builddir': './sandbox-winmobile-emulator-compile',
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -239,25 +239,16 @@ class tamarinredux:
     #######################################
     #### builder for windows64-compile ####
     #######################################
     windows_64_compile_factory = factory.BuildFactory()
     windows_64_compile_factory.addStep(sync_clean)
     windows_64_compile_factory.addStep(sync_clone(url=HG_URL))
     windows_64_compile_factory.addStep(sync_update)
     windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
-    windows_64_compile_factory.addStep(compile_builtin)
-    windows_64_compile_factory.addStep(compile_generic(name="Release", shellname="avmshell_64", args="--enable-shell --target=x86_64-win", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="Release-wordcode", shellname="avmshell_wordcode_64", args="--enable-shell --enable-wordcode-interp --target=x86_64-win", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d_64", args="--enable-shell --enable-debug --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger --target=x86_64-win ", upload="false"))
-    windows_64_compile_factory.addStep(compile_buildcheck_local)
-    windows_64_compile_factory.addStep(util_upload_asteam)
-    windows_64_compile_factory.addStep(util_upload_mozilla)
 
     windows_64_compile_builder = {
                 'name': "windows64-compile",
                 'slavename': "asteamwin3",
                 'factory': windows_64_compile_factory,
                 'builddir': './windows64-compile',
     }
 
@@ -541,16 +532,71 @@ class tamarinredux:
     winmobile_emulator_compile_factory.addStep(sync_update)
     winmobile_emulator_compile_factory.addStep(bb_slaveupdate(slave="winmobile-arm"))
     winmobile_emulator_compile_factory.addStep(compile_builtin)
     winmobile_emulator_compile_factory.addStep(compile_generic(name="ReleaseARM", shellname="avmshell_arm", args="--enable-shell --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-wordcode-ARM", shellname="avmshell_wordcode_arm", args="--enable-shell --enable-wordcode-interp --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Release-fpu-ARM", shellname="avmshell_fpu_arm", args="--enable-shell --enable-arm-fpu --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="DebugARM", shellname="avmshell_arm_d", args="--enable-shell --enable-debug --target=arm-windows", upload="false"))
     winmobile_emulator_compile_factory.addStep(compile_generic(name="Debug-fpu-ARM", shellname="avmshell_fpu_arm_d", args="--enable-shell --enable-debug --enable-arm-fpu --target=arm-windows", upload="false"))
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --target=x86_64-win', 'avmshell_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release64 build...',
+                descriptionDone='finished Release64 build.',
+                name="Release64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-wordcode-interp --target=x86_64-win', 'avmshell_wordcode_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Release-wordcode64 build...',
+                descriptionDone='finished Release-wordcode64 build.',
+                name="Release-wordcode64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --target=x86_64-win', 'avmshell_d_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting Debug64 build...',
+                descriptionDone='finished Debug64 build.',
+                name="Debug64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debugger --target=x86_64-win', 'avmshell_s_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting ReleaseDebugger64 build...',
+                descriptionDone='finished ReleaseDebugger64 build.',
+                name="ReleaseDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
+    winmobile_emulator_compile_factory.addStep(BuildShellCommand(
+                command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --enable-debugger --target=x86_64-win', 'avmshell_sd_64', 'false'],
+                env={
+                    'branch': WithProperties('%s','branch'),
+                    'compile64':'true'
+                },
+                description='starting DebugDebugger64 build...',
+                descriptionDone='finished DebugDebugger64 build.',
+                name="DebugDebugger64",
+                workdir="../repo/build/buildbot/slaves/scripts")
+    )
     winmobile_emulator_compile_factory.addStep(compile_buildcheck_local)
     winmobile_emulator_compile_factory.addStep(util_upload_asteam_local)
     winmobile_emulator_compile_factory.addStep(util_upload_mozilla_local)
     winmobile_emulator_compile_factory.addStep(BuildShellCommand(
                 command=['./build-release-mobile-pocketpc-arm-sizereport.sh', WithProperties('%s','revision')],
                 env={'branch': WithProperties('%s','branch')},
                 description='starting to run sizereport...',
                 descriptionDone='finished sizereport.',
--- a/build/buildbot/slaves/winmobile-arm/scripts/build-check.sh
+++ b/build/buildbot/slaves/winmobile-arm/scripts/build-check.sh
@@ -92,16 +92,48 @@ test -f $basedir/core/$builtinABC || {
 
 # toplevel.abc
 test -f $basedir/shell/$shellABC || {
   echo "message: toplevel.abc Failed"
   fail=1
 }
 
 
+# bring in the win64 environment this will reset the shell names so that the x64 shells are checked
+. ../windows64/scripts/environment.sh
+# Release
+test -f $buildsdir/$change-${changeid}/$platform/$shell_release || {
+  echo "message: Release64 Failed"
+  fail=1
+}
+
+# Release-wordcode
+test -f $buildsdir/$change-${changeid}/$platform/$shell_release_wordcode || {
+  echo "message: ReleaseWordCode64 Failed"
+  fail=1
+}
+
+# Release_Debugger
+test -f $buildsdir/$change-${changeid}/$platform/$shell_release_debugger || {
+  echo "message: Release_Debugger64 Failed"
+  fail=1
+}
+
+# Debug
+test -f $buildsdir/$change-${changeid}/$platform/$shell_debug || {
+  echo "message: Debug64 Failed"
+  fail=1
+}
+
+#Debug_Debugger
+test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger || {
+  echo "message: Debug_Debugger64 Failed"
+  fail=1
+}
+
 
 if test "${fail}" = 1; then
    echo Failing the build
    exit 1
 fi
 
 
 
--- a/build/buildbot/slaves/winmobile-arm/scripts/environment.sh
+++ b/build/buildbot/slaves/winmobile-arm/scripts/environment.sh
@@ -75,12 +75,18 @@ export PATH="$VS_HOME_PATH/VC/ce/bin/x86
 MOBILE_SDK_DIR="c:/Program Files (x86)/Windows Mobile 6 SDK/PocketPC"
 
 export INCLUDE="$MOBILE_SDK_DIR\Include\Armv4i;$INCLUDE;$VS_HOME\VC\ce\include"
 export LIB="$MOBILE_SDK_DIR\Lib\ARMV4I;$VS_HOME\VC\ce\lib\armv4i;$LIB"
 export LIBPATH="$MOBILE_SDK_DIR\Lib\ARMV4I;$VS_HOME\VC\ce\lib\armv4i;$LIBPATH"
 
 export mobile_dir=Windows\ Mobile\ 6\ Professional\ SDK\ \(ARMV4I\)
 
+# If we are being asked to compile the windows64 shells then bring in the win64 environment
+# this will reset the PATH, INCLUDE and LIB to point to the correct x64 locations
+if [ "$compile64" == "true" ]; then
+    . ../windows64/scripts/environment.sh
+fi
+
 ## Used by make in the build scripts
 export make_opt="-j16"
 export test_threads=1
 export test_emulator_threads=2
--- a/build/buildbot/slaves/winmobile-arm/scripts/upload-asteam.sh
+++ b/build/buildbot/slaves/winmobile-arm/scripts/upload-asteam.sh
@@ -59,8 +59,26 @@
 # Release-FPU_ARM
 . ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_release_fpu_arm $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_release_fpu_arm
 
 # Debug_ARM
 . ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_debug_arm $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_debug_arm
 
 # Debug-FPU_ARM
 . ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_debug_fpu_arm $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_debug_fpu_arm
+
+
+# bring in the win64 environment this will reset the shell names so that the x64 shells are uploaded
+. ../windows64/scripts/environment.sh
+# Release
+. ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_release $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_release
+
+# Release-wordcode
+. ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_release_wordcode $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_release_wordcode
+
+# Release_Debugger
+. ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_release_debugger $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_release_debugger
+
+# Debug
+. ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_debug $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_debug
+
+#Debug_Debugger
+. ../all/util-upload-ftp-asteam.sh $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger $ftp_asteam/$branch/$change-${changeid}/$platform/$shell_debug_debugger
--- a/build/buildbot/slaves/winmobile-arm/scripts/upload-mozilla.sh
+++ b/build/buildbot/slaves/winmobile-arm/scripts/upload-mozilla.sh
@@ -70,8 +70,29 @@ echo "url: ftp://ftp.mozilla.org/pub/js/
 . ../all/util-upload-scp-mozilla.sh $uploadbuildsdir/$change-${changeid}/$platform/$shell_debug_arm $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_debug_arm
 echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_debug_arm $shell_debug_arm"
 
 # Debug-fpu_ARM
 . ../all/util-upload-scp-mozilla.sh $uploadbuildsdir/$change-${changeid}/$platform/$shell_debug_fpu_arm $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_debug_fpu_arm
 echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_debug_fpu_arm $shell_debug_fpu_arm"
 
 
+# bring in the win64 environment this will reset the shell names so that the x64 shells are uploaded
+. ../windows64/scripts/environment.sh
+# Release
+. ../all/util-upload-scp-mozilla.sh $buildsdir/$change-${changeid}/$platform/$shell_release $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_release
+echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_release $shell_release"
+
+# Release-wordcode
+. ../all/util-upload-scp-mozilla.sh $buildsdir/$change-${changeid}/$platform/$shell_release_wordcode $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_release_wordcode
+echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_release_wordcode $shell_release_wordcode"
+
+# Release_Debugger
+. ../all/util-upload-scp-mozilla.sh $buildsdir/$change-${changeid}/$platform/$shell_release_debugger $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_release_debugger
+echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_release_debugger $shell_release_debugger"
+
+# Debug
+. ../all/util-upload-scp-mozilla.sh $buildsdir/$change-${changeid}/$platform/$shell_debug $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_debug
+echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_debug $shell_debug"
+
+#Debug_Debugger
+. ../all/util-upload-scp-mozilla.sh $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger $scp_mozilla/$branch/$change-${changeid}/$platform/$shell_debug_debugger
+echo "url: ftp://ftp.mozilla.org/pub/js/tamarin/builds/$branch/$change-${changeid}/$platform/$shell_debug_debugger $shell_debug_debugger"