From 1a94b2bfa6fb4e83b6d1b12de0de3edd5eb91575 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Thu, 15 Jan 2015 09:15:45 -0800 Subject: [PATCH] Closes #23160: Respect the environment variable SVNROOT in external-common.bat (patch by anselm.kruis) --- Tools/buildbot/external-common.bat | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index fb36c170e0..fcc33ecfde 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -1,6 +1,8 @@ @rem Common file shared between external.bat and external-amd64.bat. Responsible for @rem fetching external components into the root\externals directory. +if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ + if not exist externals mkdir externals cd externals @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @@ -31,31 +33,31 @@ cd externals @rem bzip if not exist bzip2-1.0.6 ( rd /s/q bzip2-1.0.5 - svn export http://svn.python.org/projects/external/bzip2-1.0.6 + svn export %SVNROOT%bzip2-1.0.6 ) @rem Berkeley DB if exist db-4.4.20 rd /s/q db-4.4.20 -if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 +if not exist db-4.7.25.0 svn export %SVNROOT%db-4.7.25.0 @rem NASM, for OpenSSL build @rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06 -if not exist nasm-2.11.06 svn export http://svn.python.org/projects/external/nasm-2.11.06 +if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06 @rem OpenSSL if exist openssl-1.0.1i rd /s/q openssl-1.0.1i -if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j +if not exist openssl-1.0.1j svn export %SVNROOT%openssl-1.0.1j @rem tcl/tk if not exist tcl-8.5.15.0 ( rd /s/q tcltk tcltk64 tcl-8.5.2.1 tk-8.5.2.0 - svn export http://svn.python.org/projects/external/tcl-8.5.15.0 + svn export %SVNROOT%tcl-8.5.15.0 ) -if not exist tk-8.5.15.0 svn export http://svn.python.org/projects/external/tk-8.5.15.0 -if not exist tix-8.4.3.5 svn export http://svn.python.org/projects/external/tix-8.4.3.5 +if not exist tk-8.5.15.0 svn export %SVNROOT%tk-8.5.15.0 +if not exist tix-8.4.3.5 svn export %SVNROOT%tix-8.4.3.5 @rem sqlite3 if not exist sqlite-3.6.21 ( rd /s/q sqlite-source-3.3.4 - svn export http://svn.python.org/projects/external/sqlite-3.6.21 + svn export %SVNROOT%sqlite-3.6.21 ) -- 2.50.1