From 133f4c87b1b4310699829de23e1fc65e95bfae60 Mon Sep 17 00:00:00 2001
From: Steven Bosscher <stevenb@suse.de>
Date: Sun, 30 Oct 2005 19:45:01 +0000
Subject: gcc_build: Use gcc.gnu.org as the default server.

	* gcc_build: Use gcc.gnu.org as the default server.  Set up
	SVN_REPOSITORY correctly.  Add support for checking out branches.

From-SVN: r106248
---
 contrib/ChangeLog |  5 +++++
 contrib/gcc_build | 21 +++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'contrib')

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 235d748..005ebe3 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-30  Steven Bosscher  <stevenb@suse.de>
+
+	* gcc_build: Use gcc.gnu.org as the default server.  Set up
+	SVN_REPOSITORY correctly.  Add support for checking out branches.
+
 2005-10-28  Andrew Pinski  <pinskia@gcc.gnu.org>
 
 	* gcc_update: When svn update is called and
diff --git a/contrib/gcc_build b/contrib/gcc_build
index 91091ed..7ad2484 100755
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -62,6 +62,7 @@ gcc_build        [-c configure_options]
 		 [-d destination_directory]
 		 [-m make_boot_options]
 		 [-o objdir]
+		 [-b branch_name]
 		 [-u username]
 		 [-p protocol]
 		 [-t tarfile]
@@ -94,7 +95,7 @@ checkout_gcc() {
 
     # Checkout the tree
     test -n "${SVN_USERNAME}" && SVN_USERNAME="${SVN_USERNAME}@"
-    SVNROOT="${SVN_PROTOCOL}://${SVN_USERNAME}${SVN_SERVER}${SVN_REPOSITORY}"
+    SVNROOT="${SVN_PROTOCOL}://${SVN_USERNAME}${SVN_SERVER}${SVN_REPOSITORY}${SVN_BRANCH}"
 
     $GCC_SVN co $SVNROOT ${DESTINATION} || \
 	error "Could not check out GCC"
@@ -196,9 +197,11 @@ install_gcc() {
 # SVN command
 GCC_SVN=${GCC_SVN-${SVN-svn}}
 # The SVN server containing the GCC repository.
-SVN_SERVER="dberlin.org"
+SVN_SERVER="gcc.gnu.org"
 # The path to the repository on that server.
-SVN_REPOSITORY="/trunk"
+SVN_REPOSITORY="/svn/gcc/"
+# The branch to check out from that server.
+SVN_BRANCH="trunk"
 # The SVN protocol to use.
 SVN_PROTOCOL="svn"
 # The username to use when connecting to the server.
@@ -240,7 +243,7 @@ UPDATE=0
 test $# -eq 0 && usage
 
 # Parse the options.
-while getopts "c:d:m:o:p:t:u:x:" ARG; do
+while getopts "c:d:m:o:p:t:b:u:x:" ARG; do
     case $ARG in
     c)    CONFIGURE_OPTIONS="${OPTARG}";;
     d)    DESTINATION="${OPTARG}";;
@@ -249,6 +252,7 @@ while getopts "c:d:m:o:p:t:u:x:" ARG; do
     p)    SVN_PROTOCOL="${OPTARG}";;
     t)    TARFILE="${OPTARG}";;
     x)    MAKE_CHECK_OPTIONS="${OPTARG}";;
+    b)    SVN_BRANCH="${OPTARG}";;
     u)    SVN_USERNAME="${OPTARG}";;
     \?)   usage;;
     esac
@@ -276,6 +280,15 @@ if [ ${CHECKOUT} -ne 0 ] && [ ${UPDATE} -ne 0 ]; then
     error "Cannot checkout and update simultaneously"
 fi
 
+if [ ${CHECKOUT} -eq 0 ] && test -n "${SVN_BRANCH}"; then
+    error "Branch argument only makes sense when doing a checkout"
+fi
+
+# Validate the branch name.
+if test "${SVN_BRANCH}" != "trunk"; then
+    SVN_BRANCH="branches/${SVN_BRANCH}";
+fi
+
 # Checkout the tree.
 if [ ${CHECKOUT} -ne 0 ]; then
     checkout_gcc
-- 
cgit v1.1