* gcc_build: Use gcc.gnu.org as the default server. Set up

[pf3gnuchains/gcc-fork.git] / contrib / gcc_build

diff --git a/contrib/gcc_build b/contrib/gcc_build
index b36685e..7ad2484 100755 (executable)
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -4,12 +4,14 @@
 #
 # File:   gcc_build
 # Author: Mark Mitchell
-# Date:   07/10/2000
+# Date:   2000-07-10
+#
+# Adapted to Subversion by Ben Elliston <bje@au.ibm.com>, 2005-07-14.
 #
 # Contents:
 #   Script to automatically download and build GCC.
 #
-# Copyright (c) 2000, 2001, 2003 Free Software Foundation.
+# Copyright (c) 2000, 2001, 2003, 2005 Free Software Foundation.
 #
 # This file is part of GCC.
 #
@@ -25,8 +27,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GCC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 ########################################################################
 
@@ -34,9 +36,6 @@
 # Notes
 ########################################################################
 
-# If you are using password-based CVS, you must manually log in, and
-# not log out from, the CVS server before running this script.
-
 # You can set the following variables in the environment.  They 
 # have no corresponding command-line options because they should
 # only be needed infrequently:
@@ -63,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]
@@ -86,49 +86,33 @@ changedir() {
        error "Could not change directory to $1"
 }
 
-# Set up CVS environment variables
-
-cvs_setup() {
-    CVSROOT=":${CVS_PROTOCOL}:${CVS_USERNAME}@"
-    CVSROOT="${CVSROOT}${CVS_SERVER}:${CVS_REPOSITORY}"
-    export CVSROOT
-}
-
 # Checkout a fresh copy of the GCC build tree.
 
 checkout_gcc() {
-    # Tell CVS where to find everything.
-    cvs_setup
-
     # If the destination already exists, don't risk destroying it.
     test -e ${DESTINATION} && \
        error "${DESTINATION} already exists"
 
-    # CVS doesn't allow an absolute path for the destination directory.
-    DESTINATION_PARENT=`dirname ${DESTINATION}`
-    test -d ${DESTINATION_PARENT} || \
-       error "${DESTINATION_PARENT} is not a directory"
-    changedir ${DESTINATION_PARENT}
-
     # Checkout the tree
-    $GCC_CVS -z 9 co -d `basename ${DESTINATION}` gcc || \
+    test -n "${SVN_USERNAME}" && SVN_USERNAME="${SVN_USERNAME}@"
+    SVNROOT="${SVN_PROTOCOL}://${SVN_USERNAME}${SVN_SERVER}${SVN_REPOSITORY}${SVN_BRANCH}"
+
+    $GCC_SVN co $SVNROOT ${DESTINATION} || \
        error "Could not check out GCC"
 }
 
 # Update GCC.
 
 update_gcc() {
-    # Tell CVS where to find everything
-    cvs_setup
-
     # If the destination does not already exist, complain.
     test -d ${DESTINATION} || \
-       error "{$DESTINATION} does not exist"
+       error "${DESTINATION} does not exist"
+
     # Enter the destination directory.
     changedir ${DESTINATION}
 
     # Update the tree
-    ./contrib/gcc_update -d || \
+    ./contrib/gcc_update || \
        error "Could not update GCC"
 }
 
@@ -189,7 +173,7 @@ export_gcc() {
     # Build a tarball of the source directory.
     tar czf ${TARFILE} \
        --exclude=${OBJDIR} \
-       --exclude=CVS \
+       --exclude=.svn \
        --exclude='.#*' \
        --exclude='*~' \
        `basename ${DESTINATION}`
@@ -210,16 +194,19 @@ install_gcc() {
 # Initialization
 ########################################################################
 
-# CVS command
-GCC_CVS=${GCC_CVS-${CVS-cvs}}
-# The CVS server containing the GCC repository.
-CVS_SERVER="gcc.gnu.org"
+# SVN command
+GCC_SVN=${GCC_SVN-${SVN-svn}}
+# The SVN server containing the GCC repository.
+SVN_SERVER="gcc.gnu.org"
 # The path to the repository on that server.
-CVS_REPOSITORY="/cvs/gcc"
-# The CVS protocol to use.
-CVS_PROTOCOL="pserver"
+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.
-CVS_USERNAME="anoncvs"
+# An empty string means anonymous.
+SVN_USERNAME=""
 
 # The directory where the checked out GCC will be placed.
 DESTINATION="${HOME}/dev/gcc"
@@ -252,17 +239,21 @@ UPDATE=0
 # Main Program
 ########################################################################
 
+# Issue usage if no parameters are given.
+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}";;
     m)    MAKE_BOOTSTRAP_OPTIONS="${OPTARG}";;
     o)    OBJDIR="${OPTARG}";;
-    p)    CVS_PROTOCOL="${OPTARG}";;
+    p)    SVN_PROTOCOL="${OPTARG}";;
     t)    TARFILE="${OPTARG}";;
     x)    MAKE_CHECK_OPTIONS="${OPTARG}";;
-    u)    CVS_USERNAME="${OPTARG}";;
+    b)    SVN_BRANCH="${OPTARG}";;
+    u)    SVN_USERNAME="${OPTARG}";;
     \?)   usage;;
     esac
 done
@@ -289,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