Re: [patch] Fix gcc_build

[VÃclav Haisman <V dot Haisman at sh dot cvut dot cz>]

Steven Bosscher wrote:
> Hi,
> 
> The following patch fixes some bugs in gcc_build:
> - We were checking out from dberlin.org.
> - The repository was always in the root directory.
> - There was no support for checking out branches.
> 
> Tested by doing a few branch checkouts.
> 
> OK for mainline?
> Check carefully, my script-fu is not really good ;-)
> 
> Gr.
> Steven
> 
> 
> Index: ChangeLog
> ===================================================================
> --- ChangeLog	(revision 106012)
> +++ ChangeLog	(working copy)
> @@ -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
> Index: gcc_build
> ===================================================================
> --- gcc_build	(revision 106012)
> +++ gcc_build	(working copy)
> @@ -62,6 +62,7 @@
>  		 [-d destination_directory]
>  		 [-m make_boot_options]
>  		 [-o objdir]
> +		 [-b brach_name]
>  		 [-u username]
>  		 [-p protocol]
>  		 [-t tarfile]
> @@ -94,7 +95,7 @@
>  
>      # 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 @@
>  # 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 @@
>  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 @@
>      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,19 @@
>      error "Cannot checkout and update simultaneously"
>  fi
>  
> +if [ ${CHECKOUT} -eq 0 ] && test -n "${SVN_BRANCH}"; then
All the rest of the script seems to use [ instead of test.

> +    error "Branch argument only makes sense when doing a checkout"
> +fi
> +
> +# Validate the branch name.
> +if test -n "${SVN_BRANCH}" && test "${SVN_BRANCH}" != "trunk"; then
Likewise.

> +    if test "${SVN_BRANCH}" = "mainline"; then
Likewise.

> +        SVN_BRANCH="trunk";
> +    else
> +        SVN_BRANCH="branches/${SVN_BRANCH}";
> +    fi
> +fi
> +
>  # Checkout the tree.
>  if [ ${CHECKOUT} -ne 0 ]; then
>      checkout_gcc


Vaclav Haisman

Attachment: signature.asc
Description: OpenPGP digital signature