Bug 370678, bug 363096 - Fix MozillaBuild syntax error, add some additional utilities, and install MIME::Base64 perl module to make tinderbox work - r=luser

tools/build-environment/win32/packageit-msys.sh

@@ -0,0 +1,30 @@
+set -e
+
+# This script expects these to be absolute paths in win32 format
+if test -z "$MOZ_SRCDIR"; then
+    echo "This script should be run from packageit.py (MOZ_SRCDIR missing)."
+    exit 1
+fi
+if test -z "$MOZ_STAGEDIR"; then
+    echo "This script should be run from packageit.py (MOZ_STAGEDIR missing)."
+    exit 1
+fi
+
+MSYS_SRCDIR=$(cd "$MOZ_SRCDIR" && pwd)
+MSYS_STAGEDIR=$(cd "$MOZ_STAGEDIR" && pwd)
+
+tar -xzf "${MSYS_SRCDIR}/MIME-Base64-3.07.tar.gz" -C "${MSYS_STAGEDIR}"
+pushd "${MSYS_STAGEDIR}/MIME-Base64-3.07"
+perl Makefile.pl
+make LD="gcc -shared"
+make test
+make install PREFIX="${MSYS_STAGEDIR}/mozilla-build/msys"
+popd
+
+# In order for this to actually work, we now need to rebase
+# the DLL. Since I can't figure out how to rebase just one
+# DLL to avoid conflicts with a set of others, we just
+# rebase them all!
+
+find "${MSYS_STAGEDIR}/mozilla-build/lib" -name "*.dll" | \
+  xargs rebase -d -b 60000000

tools/build-environment/win32/packageit.py

@@ -18,6 +18,8 @@
 # The following tools are prerequisites:
 #   A mingw build toolchain, and an MSYS shell to build it. Use --msys= to
 #   specify the installed location of MSYS (default c:\msys\1.0)
+#   An MSYS build toolchain. This is described in:
+#     http://www.mingw.org/MinGWiki/index.php/MSYSBuildEnvironment
 
 from subprocess import check_call
 from os import getcwd, remove, environ
@@ -79,3 +81,12 @@ check_call([join(sourcedir, "XEmacs Setup 21.4.19.exe"),
 
 check_call([join(msysdir, "bin", "sh.exe"), "--login",
             join(sourcedir, "packageit.sh")])
+
+environ["MSYSTEM"] = "MSYS"
+check_call([join(msysdir, "bin", "sh.exe"), "--login",
+            join(sourcedir, "packageit-msys.sh")])
+
+del environ["MSYSTEM"]
+
+# Make an installer
+check_call(["makensis", "/NOCD", "installit.nsi"])

tools/build-environment/win32/packageit.sh

@@ -80,10 +80,17 @@ cp "${MSYS_SRCDIR}"/{profile-inputrc.sh,profile-extrapaths.sh,profile-echo.sh,pr
 # Copy the batch files that make everything go!
 cp "${MSYS_SRCDIR}"/{guess-msvc.bat,start-msvc6.bat,start-msvc71.bat,start-msvc8.bat} "${MSYS_STAGEDIR}/mozilla-build"
 
-# zip it up and make an installer
+# Install autoconf 2.13
+tar -xzf "${MSYS_SRCDIR}/autoconf-2.13.tar.gz" -C "${MSYS_STAGEDIR}"
+pushd "${MSYS_STAGEDIR}/autoconf-2.13"
+./configure --prefix=/local --program-suffix=-2.13
+make
+make install prefix="${MSYS_STAGEDIR}/mozilla-build/msys/local"
+popd
+
+# Install wget
+unzip -d "${MSYS_STAGEDIR}/mozilla-build/wget" "${MSYS_SRCDIR}/wget-1.10.2b.zip"
+
+# stage files to make the installer
 cp "${MSYS_SRCDIR}"/{license.rtf,installit.nsi} "${MSYS_STAGEDIR}"
 unix2dos "${MSYS_STAGEDIR}/license.rtf"
-pushd "${MSYS_STAGEDIDR}"
-makensis //NOCD installit.nsi
-zip -r9D mozilla-build.zip mozilla-build
-popd

tools/build-environment/win32/profile-extrapaths.sh

@@ -2,7 +2,7 @@
 
 if test -n "$MOZILLABUILD"; then
     MSYS_MOZBUILD=$(cd "$MOZILLABUILD" && pwd)
-    PATH="/local/bin:$MSYS_MOZBUILD/7zip:$MSYS_MOZBUILD/blat261:$MSYS_MOZBUILD/make-3.81/bin:$MSYS_MOZBUILD/python25:$MSYS_MOZBUILD/svn-win32-1.4.2/bin:$MSYS_MOZBUILD/upx203w:$MSYS_MOZBUILD/xemacs/XEmacs-21.4.19/i586-pc-win32:$MSYS_MOZBUILD/info-zip:$MSYS_MOZBUILD/nsis-2.22:$PATH"
+    PATH="/local/bin:$MSYS_MOZBUILD/wget:$MSYS_MOZBUILD/7zip:$MSYS_MOZBUILD/blat261/full:$MSYS_MOZBUILD/make-3.81/bin:$MSYS_MOZBUILD/python25:$MSYS_MOZBUILD/svn-win32-1.4.2/bin:$MSYS_MOZBUILD/upx203w:$MSYS_MOZBUILD/xemacs/XEmacs-21.4.19/i586-pc-win32:$MSYS_MOZBUILD/info-zip:$MSYS_MOZBUILD/nsis-2.22:$PATH"
     EDITOR=xemacs.exe
     CVS_RSH=ssh
     export PATH EDITOR CVS_RSH

tools/build-environment/win32/start-msvc8.bat

@@ -34,8 +34,7 @@ if "%VC8DIR%"=="" (
     call "%VC8EXPRESSDIR%\Bin\vcvars32.bat"
 
     rem Don't set SDK paths in this block, because blocks are early-evaluated.
-)
-else (
+) else (
     rem Prepend MSVC paths
     call "%VC8DIR%\Bin\vcvars32.bat"
 )