Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / buildbot / buildbot_windows-glibc-makefile.sh

diff --git a/src/native_client/buildbot/buildbot_windows-glibc-makefile.sh b/src/native_client/buildbot/buildbot_windows-glibc-makefile.sh
index fe4853b..8bc32bd 100755 (executable)
--- a/src/native_client/buildbot/buildbot_windows-glibc-makefile.sh
+++ b/src/native_client/buildbot/buildbot_windows-glibc-makefile.sh
@@ -31,8 +31,6 @@ OUT_TOOLCHAINNAME=nacl_x86_glibc
 TOOL_TOOLCHAIN="$TOOLCHAINLOC/$TOOLCHAINNAME"
 OUT_TOOLCHAIN="${OUT_TOOLCHAINLOC}/${OUT_TOOLCHAINNAME}"
 
-GSUTIL=buildbot/gsutil.sh
-
 export INST_GLIBC_PROGRAM="$PWD/tools/glibc_download.sh"
 # Workaround for broken autoconf mmap test (WOW64 limitation)
 # More info here: http://cygwin.com/ml/cygwin/2011-03/msg00596.html
@@ -72,55 +70,58 @@ echo @@@BUILD_STEP compile_toolchain@@@
 (
   cd tools
   make -j8 buildbot-build-with-glibc
-  ../mingw/msys/bin/sh.exe -c "export PATH=/mingw/bin:/bin:\$PATH &&
-    export TOOLCHAINLOC=${TOOLCHAINLOC} &&
-    export TOOLCHAINNAME=${TOOLCHAINNAME} &&
-    make -j8 gdb 2>&1"
   rm "${TOOL_TOOLCHAIN}/tmp"
 )
 
-if [[ "${BUILDBOT_SLAVE_TYPE:-Trybot}" == "Trybot" ]]; then
-  rm -rf "${OUT_TOOLCHAIN}"
-  mkdir -p "${OUT_TOOLCHAINLOC}"
-  mv "tools/${TOOL_TOOLCHAIN}" "${OUT_TOOLCHAIN}"
+if [[ "${BUILDBOT_SLAVE_TYPE:-Trybot}" != "Trybot" ]]; then
+  GSD_BUCKET=nativeclient-archive2
+  UPLOAD_REV=${BUILDBOT_GOT_REVISION}
+  UPLOAD_LOC=x86_toolchain/r${UPLOAD_REV}
 else
-  (
-    cd tools
-    echo @@@BUILD_STEP canonicalize timestamps@@@
-    ./canonicalize_timestamps.sh "${TOOL_TOOLCHAIN}"
-    echo @@@BUILD_STEP tar_toolchain@@@
-    tar Scf toolchain.tar "${TOOL_TOOLCHAIN}"
-    xz -k -9 toolchain.tar
-    bzip2 -k -9 toolchain.tar
-    gzip -n -9 toolchain.tar
-    for i in gz bz2 xz ; do
-      chmod a+x toolchain.tar.$i
-      echo "$(SHA1=$(sha1sum -b toolchain.tar.$i) ; echo ${SHA1:0:40})" \
-        > toolchain.tar.$i.sha1hash
-    done
-  )
-
-  echo @@@BUILD_STEP archive_build@@@
-  for suffix in gz gz.sha1hash bz2 bz2.sha1hash xz xz.sha1hash ; do
-    $GSUTIL cp -a public-read \
-      tools/toolchain.tar.$suffix \
-      gs://nativeclient-archive2/x86_toolchain/r${BUILDBOT_GOT_REVISION}/toolchain_win_x86.tar.$suffix
-  done
-  echo @@@STEP_LINK@download@http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${BUILDBOT_GOT_REVISION}/@@@
-
-  echo @@@BUILD_STEP untar_toolchain@@@
-  (
-    mkdir -p .tmp
-    cd .tmp
-    tar JSxf ../tools/toolchain.tar.xz
-    rm -rf "../${OUT_TOOLCHAIN}"
-    mkdir -p "../${OUT_TOOLCHAINLOC}"
-    mv "${TOOL_TOOLCHAIN}" "../${OUT_TOOLCHAIN}"
-  )
+  GSD_BUCKET=nativeclient-trybot/packages
+  UPLOAD_REV=${BUILDBOT_BUILDERNAME}/${BUILDBOT_BUILDNUMBER}
+  UPLOAD_LOC=x86_toolchain/${UPLOAD_REV}
 fi
 
-if [[ "${BUILD_COMPATIBLE_TOOLCHAINS:-yes}" != "no" ]]; then
-  echo @@@BUILD_STEP sync backports@@@
-  rm -rf tools/BACKPORTS/ppapi*
-  tools/BACKPORTS/build_backports.sh VERSIONS win glibc
-fi
+(
+  cd tools
+  echo @@@BUILD_STEP canonicalize timestamps@@@
+  ./canonicalize_timestamps.sh "${TOOL_TOOLCHAIN}"
+  echo @@@BUILD_STEP tar_toolchain@@@
+  tar Scf toolchain.tar "${TOOL_TOOLCHAIN}"
+  xz -k -9 toolchain.tar
+  bzip2 -k -9 toolchain.tar
+  gzip -n -9 toolchain.tar
+  for i in gz bz2 xz ; do
+    chmod a+x toolchain.tar.$i
+    echo "$(SHA1=$(sha1sum -b toolchain.tar.$i) ; echo ${SHA1:0:40})" \
+      > toolchain.tar.$i.sha1hash
+  done
+)
+
+echo @@@BUILD_STEP archive_build@@@
+for suffix in gz gz.sha1hash bz2 bz2.sha1hash xz xz.sha1hash ; do
+  ${NATIVE_PYTHON} ${GSUTIL} cp -a public-read \
+    tools/toolchain.tar.$suffix \
+    gs://${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_win_x86.tar.$suffix
+done
+echo @@@STEP_LINK@download@http://gsdview.appspot.com/${GSD_BUCKET}/${UPLOAD_LOC}/@@@
+
+echo @@@BUILD_STEP archive_extract_package@@@
+${NATIVE_PYTHON} build/package_version/package_version.py \
+  archive --archive-package=nacl_x86_glibc --extract \
+  --extra-archive gdb_i686_w64_mingw32.tgz \
+  tools/toolchain.tar.bz2,toolchain/win_x86@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_win_x86.tar.bz2 \
+
+echo @@@BUILD_STEP upload_package_info@@@
+${NATIVE_PYTHON} build/package_version/package_version.py \
+  --cloud-bucket=${GSD_BUCKET} --annotate \
+  upload --skip-missing \
+  --upload-package=nacl_x86_glibc --revision=${UPLOAD_REV}
+
+# sync_backports is obsolete and should probably be removed.
+# if [[ "${BUILD_COMPATIBLE_TOOLCHAINS:-yes}" != "no" ]]; then
+#   echo @@@BUILD_STEP sync backports@@@
+#   rm -rf tools/BACKPORTS/ppapi*
+#   tools/BACKPORTS/build_backports.sh VERSIONS win glibc
+# fi