From ba765c6ca0ba19042e104f1b4721094ffe97e89c Mon Sep 17 00:00:00 2001 From: "ccooper%deadsquid.com" Date: Thu, 18 Sep 2008 22:00:51 +0000 Subject: [PATCH] b=451466 p=armenzg r=ted a=dveditz - add wget target to get en-US binary git-svn-id: svn://10.0.0.236/trunk@254319 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/locales/Makefile.in | 20 ++++++++++++++++++++ mozilla/config/autoconf.mk.in | 1 + mozilla/configure.in | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/mozilla/browser/locales/Makefile.in b/mozilla/browser/locales/Makefile.in index c098a8e5119..3520112c5f9 100644 --- a/mozilla/browser/locales/Makefile.in +++ b/mozilla/browser/locales/Makefile.in @@ -325,3 +325,23 @@ ifdef MOZ_CRASHREPORTER libs:: $(addprefix $(LOCALE_SRCDIR)/,crashreporter/crashreporter-override.ini) $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) endif + +# This variable is to allow the wget-en-US target to know which ftp server to download from +ifndef EN_US_BINARY_URL +EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL) +endif + +# This make target allows us to wget the latest en-US binary from a specified website +# The make installers-% target needs the en-US binary in dist/ +# and for the windows repackages we need the .installer.exe in dist/sea +wget-en-US: +ifndef WGET + $(error Wget not installed) +endif + @$(WGET) -nv --output-document $(_ABS_DIST)/$(PACKAGE) $(EN_US_BINARY_URL)/$(PACKAGE) + @echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PACKAGE)" +ifeq ($(OS_ARCH), WINNT) + $(NSINSTALL) -D $(_ABS_DIST)/install/sea + @$(WGET) -nv --output-document $(_ABS_DIST)/install/sea/$(PKG_BASENAME).installer.exe $(EN_US_BINARY_URL)/$(PKG_BASENAME).installer.exe + @echo "Downloaded $(EN_US_BINARY_URL)/$(PKG_BASENAME).installer.exe to $(_ABS_DIST)/install/sea/$(PKG_BASENAME)" +endif diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 534460a677d..13bca597bef 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -394,6 +394,7 @@ MAKE = @MAKE@ PBBUILD_BIN = @PBBUILD@ SDP = @SDP@ NSINSTALL_BIN = @NSINSTALL_BIN@ +WGET = @WGET@ ifdef MOZ_NATIVE_JPEG JPEG_CFLAGS = @JPEG_CFLAGS@ diff --git a/mozilla/configure.in b/mozilla/configure.in index bc72aff6f4f..b162127d3aa 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -5750,6 +5750,11 @@ fi AC_MSG_RESULT([$TAR]) AC_SUBST(TAR) +AC_MSG_CHECKING([for wget]) +AC_CHECK_PROGS(WGET, wget, "") +AC_MSG_RESULT([$WGET]) +AC_SUBST(WGET) + dnl ======================================================== dnl Updater dnl ========================================================