From: Michael Peters Date: Wed, 10 Jun 2015 15:17:09 +0000 (-0400) Subject: Use HTTP instead of FTP to transfer the xulrunner package when building staff client X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fmrpeters%2Fhttp_over_ftp_for_xulrunner_runtime_download;p=working%2FEvergreen.git Use HTTP instead of FTP to transfer the xulrunner package when building staff client When building staff clients, using FTP seems to result in the xulrunner packages not being found. Connecting to ftp.mozilla.org (ftp.mozilla.org)|63.245.215.46|:21... connected. Logging in as anonymous ... Logged in! ==> SYST ... done. ==> PWD ... done. ==> TYPE I ... done. ==> CWD (1) /pub/mozilla.org/xulrunner/releases/14.0.1/runtimes ... done. ==> SIZE xulrunner-14.0.1.en-US.win32.zip ... 17646249 ==> PASV ... done. ==> RETR xulrunner-14.0.1.en-US.win32.zip ... No such file ‘xulrunner-14.0.1.en-US.win32.zip’. This patch makes the staff client build scripts use http to grab the file, instead. Signed-off-by: Michael Peters --- diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index a27b5cb4c4..bcbd00213c 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -15,7 +15,7 @@ XULRUNNER_VERSION=14.0.1 XULRUNNER_WINFILE=xulrunner-$(XULRUNNER_VERSION).en-US.win32.zip XULRUNNER_LINUX32FILE=xulrunner-$(XULRUNNER_VERSION).en-US.linux-i686.tar.bz2 XULRUNNER_LINUX64FILE=xulrunner-$(XULRUNNER_VERSION).en-US.linux-x86_64.tar.bz2 -XULRUNNER_URL=ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$(XULRUNNER_VERSION)/runtimes/ +XULRUNNER_URL=http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$(XULRUNNER_VERSION)/runtimes/ XULRUNNER_MAJOR_VERSION=$$(echo ${XULRUNNER_VERSION} | cut -d. -f1) # Extensions we include when not an extension ourselves