mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8416

Modified Files:
	ChangeLog x86-mingw32-build.sh 
Log Message:
Improve efficiency of GCC build; add more comments.


Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** x86-mingw32-build.sh	22 Feb 2009 15:18:24 -0000	1.7
--- x86-mingw32-build.sh	26 Feb 2009 19:12:03 -0000	1.8
***************
*** 6,10 ****
  # MinGW cross-compiler for Win32.
  #
! # Copyright (C) 2006, MinGW Project
  # Written by Keith Marshall <kei...@us...>
  # 
--- 6,10 ----
  # MinGW cross-compiler for Win32.
  #
! # Copyright (C) 2006, 2009, MinGW Project
  # Written by Keith Marshall <kei...@us...>
  # 
***************
*** 32,42 ****
--- 32,52 ----
  . $script.getopts
  
+ # Specify the TARGET identification prefix, to be assigned to the cross
+ # compiler tool suite, and the operating system element, which may be used
+ # to qualify source package names.
+ #
  TARGET=${1-${TARGET-${TARGET_CPU-"i386"}-${TARGET_OS="mingw32"}}}
  TARGET_OS=${TARGET_OS-"`echo $TARGET | sed 's,^.*-mingw,mingw,'`"}
  
+ # Check how the user wants to progress the build, (default is `interactive'),
+ # then hand off package selection and set-up to the appropriate helper script.
+ #
  assume BUILD_METHOD interactive
  test "$BUILD_METHOD" = interactive && BUILD_METHOD=dialogue || BUILD_METHOD=batch
  test -r $script.$BUILD_METHOD && . $script.$BUILD_METHOD
  
+ # Check that all required packages are either available locally,
+ # or can be downloaded from a source repository identified on set-up.
+ #
  echo "
  $script: checking package availability ..."
***************
*** 58,61 ****
--- 68,73 ----
  done
  
+ # Prepare for building all selected packages and components.
+ #
  prompt "
  $script: preparing the build tree... "
***************
*** 68,71 ****
--- 80,93 ----
  unrecoverable="$script: unrecoverable error"
  
+ # The following pair of variables are used when `making' the GCC components;
+ # we initialise them here, to restrict the STAGE 1 build to creation of only
+ # the C language compiler; they are subsequently reset, after completion of
+ # that STAGE 1 build, to enable the building of any other selected language
+ # components in STAGE 2.
+ #
+ ALL_GCC=all-gcc INSTALL_GCC=install-gcc
+ 
+ # Progress the build, in two stages.
+ #
  for STAGE in 1 2
  do for COMPONENT in $BUILD_COMPONENTS
***************
*** 95,101 ****
  
      gcc)
!       test -r gcc-*/configure || $RUN prepare gcc-core-$GCC_VERSION
!       if test $STAGE -eq 2
        then
          for FILE in $GCC_LANGUAGE_OPTIONS
  	do
--- 117,123 ----
  
      gcc)
!       if ! test -r gcc-*/configure
        then
+ 	$RUN prepare gcc-core-$GCC_VERSION
          for FILE in $GCC_LANGUAGE_OPTIONS
  	do
***************
*** 106,119 ****
        fi
        $RUN setbuilddir build-gcc .
!       $RUN ../gcc-*/configure --prefix="$INSTALL_DIR" --target="$TARGET" \
! 	$GLOBAL_BASE_OPTIONS $GCC_BASE_OPTIONS --enable-languages=`
!           case $STAGE in 1) echo c ;; 2) echo $GCC_LANGUAGE_SET ;; esac` \
!         --with-sysroot="$INSTALL_DIR" || die $? \
!         "$unrecoverable configuring gcc"
!       $RUN $MAKE CFLAGS="$CFLAGS_FOR_GCC" LDFLAGS="$LDFLAGS_FOR_GCC" || die $? \
!         "$unrecoverable building gcc"
!       $RUN $MAKE install || die $? \
          "$unrecoverable installing gcc"
        cd "$WORKING_DIR"; test $LEAN_BUILD && rm -rf build-gcc
        ;;
  
--- 128,145 ----
        fi
        $RUN setbuilddir build-gcc .
!       if ! test -r ./config.status
!       then
! 	$RUN ../gcc-*/configure --prefix="$INSTALL_DIR" --target="$TARGET" \
! 	  $GLOBAL_BASE_OPTIONS $GCC_BASE_OPTIONS --with-sysroot="$INSTALL_DIR" \
! 	  --enable-languages=$GCC_LANGUAGE_SET || die $? \
! 	  "$unrecoverable configuring gcc"
!       fi
!       $RUN $MAKE CFLAGS="$CFLAGS_FOR_GCC" \
!         LDFLAGS="$LDFLAGS_FOR_GCC" $ALL_GCC || die $? \
!        	"$unrecoverable building gcc"
!       $RUN $MAKE $INSTALL_GCC || die $? \
          "$unrecoverable installing gcc"
        cd "$WORKING_DIR"; test $LEAN_BUILD && rm -rf build-gcc
+       ALL_GCC="" INSTALL_GCC=""
        ;;
  
***************
*** 160,163 ****
--- 186,191 ----
  done
  
+ # Clean up when done.
+ #
  prompt "
  $script: cleaning up... "

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	23 Feb 2009 00:17:04 -0000	1.9
--- ChangeLog	26 Feb 2009 19:12:02 -0000	1.10
***************
*** 1,2 ****
--- 1,13 ----
+ 2009-02-26  Keith Marshall  <kei...@us...>
+ 
+ 	Improve efficiency of GCC build; add more comments.
+ 
+ 	* x86-mingw32-build.sh: Add miscellaneous comments.
+ 	(GCC_LANGUAGE_SET): Enable all in STAGE 1 configuration.
+ 	(ALL_GCC, INSTALL_GCC): New shell variables; define them; use when...
+ 	[COMPONENT == gcc, STAGE == 1]: ...to facilite once-only configuration
+ 	with all languages selected, while still building only the C compiler;
+ 	reset at end of STAGE 1, to enable remaining languages in STAGE 2.
+ 
  2009-02-22  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1756

Modified Files:
	ChangeLog x86-mingw32-build.sh.mirrors 
Log Message:
Add diagnostic for invalid DOWNLOAD_HOST.


Index: x86-mingw32-build.sh.mirrors
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.mirrors,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x86-mingw32-build.sh.mirrors	13 Jan 2008 18:16:53 -0000	1.2
--- x86-mingw32-build.sh.mirrors	23 Feb 2009 00:17:04 -0000	1.3
***************
*** 1,3 ****
! # x86-mingw32-build.sh.mirrors -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.mirrors -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 63,66 ****
--- 63,71 ----
    DOWNLOAD_HOST="http://$REPLY.dl.sourceforge.net/mingw"
  else
+   if test "$ALLOW_DOWNLOADS" = YES && test "$BUILD_METHOD" = unattended
+   then
+     echo "$script.conf: DOWNLOAD_HOST does not specify a vaild mirror"
+     echo "$script.mirrors: automatic download feature is disabled"
+   fi
    ALLOW_DOWNLOADS=NO
  fi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	22 Feb 2009 15:18:24 -0000	1.8
--- ChangeLog	23 Feb 2009 00:17:04 -0000	1.9
***************
*** 1,4 ****
--- 1,12 ----
  2009-02-22  Keith Marshall  <kei...@us...>
  
+ 	Add diagnostic for invalid DOWNLOAD_HOST.
+ 
+ 	* x86-mingw32-build.sh.mirrors: Emit diagnostic message, in
+ 	`unattended' build mode, when `$DOWNLOAD_HOST' does not specify a
+ 	valid mirror, and downloads are enabled.
+ 
+ 2009-02-22  Keith Marshall  <kei...@us...>
+ 
  	Add support for new MinGW.org package naming conventions.
  
***************
*** 34,38 ****
  	(gcc_srctag, binutils_srctag, mingwrt_srctag, w32api_srctag): New
  	optionally defined shell variables; define and use them in same manner
! 	as it is used in `x86-mingw32-build.sh.batch'.
  	(mingwrt): New shell variable; define and use it in same manner as it
  	is used in `x86-mingw32-build.sh.batch'.
--- 42,46 ----
  	(gcc_srctag, binutils_srctag, mingwrt_srctag, w32api_srctag): New
  	optionally defined shell variables; define and use them in same manner
! 	as they are used in `x86-mingw32-build.sh.batch'.
  	(mingwrt): New shell variable; define and use it in same manner as it
  	is used in `x86-mingw32-build.sh.batch'.

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10491

Modified Files:
	ChangeLog x86-mingw32-build.sh x86-mingw32-build.sh.batch 
	x86-mingw32-build.sh.dialogue x86-mingw32-build.sh.functions 
Log Message:
Add support for new MinGW.org package naming conventions.


Index: x86-mingw32-build.sh.functions
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.functions,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x86-mingw32-build.sh.functions	13 Jan 2008 18:16:53 -0000	1.2
--- x86-mingw32-build.sh.functions	22 Feb 2009 15:18:25 -0000	1.3
***************
*** 1,3 ****
! # x86-mingw32-build.sh.functions -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.functions -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 148,160 ****
  # they will be applied in increasing serial number order.
  {
!   local PACKAGE
!   for PACKAGE in $PACKAGE_DIR/$1${2-"-src"}.t[ag][rz]*
!   do
!     case $PACKAGE in
!       *.tar.bz2) unpack xjf $PACKAGE ;;
!       *.tar.gz | *.tgz) unpack xzf $PACKAGE ;;
!       *.tar) unpack xf $PACKAGE ;;
!       *) die 2 "${script-$0}: $PACKAGE is not a recognisable archive" ;;
!     esac; break
    done
    for PACKAGE in $PATCHES_DIR/$1${3-"-patch"}*
--- 148,163 ----
  # they will be applied in increasing serial number order.
  {
!   local PACKAGE SUFFIX
!   SUFFIX="${2-"-src"}.t[ag][rz]*"
!   for PACKAGE in $PACKAGE_DIR/$1$SUFFIX $PACKAGE_DIR/$1-$TARGET_OS*$SUFFIX
!   do if test -r "$PACKAGE"
!      then
!        case $PACKAGE in
! 	 *.tar.bz2) unpack xjf $PACKAGE ;;
! 	 *.tar.gz | *.tgz) unpack xzf $PACKAGE ;;
! 	 *.tar) unpack xf $PACKAGE ;;
! 	 *) die 2 "${script-$0}: $PACKAGE is not a recognisable archive" ;;
!        esac; break
!      fi
    done
    for PACKAGE in $PATCHES_DIR/$1${3-"-patch"}*
***************
*** 191,195 ****
    for match in ${3-$1*$2}
    do
!     echo $match | sed s'?^'"$1"'\(.*\)'"$2"'$?\1?'
    done
  }
--- 194,202 ----
    for match in ${3-$1*$2}
    do
!     if test "$match" != "${3-$1*$2}"
!     then
!       match=`echo $match | sed s'?^'"$1"'\(.*\)'"$2"'$?\1?'`
!       case $match in *-$TARGET_OS) ;; *) echo $match ;; esac
!     fi
    done
  }
***************
*** 276,280 ****
  # mishandle function definitions within `if' or `case' blocks.
  #
! test "0`exec 2>/dev/null; x=123; eval echo '$((x+456))'`" -eq 579 && \
  incr()
  {
--- 283,287 ----
  # mishandle function definitions within `if' or `case' blocks.
  #
! test 2>/dev/null "0`x=123; eval echo '$((x+456))'`" -eq 579 && \
  incr()
  {
***************
*** 294,298 ****
  # available for shells supporting Korn Shell arithmetic syntax.
  #
! test "0`exec 2>/dev/null; x=123; eval echo '$((x+456))'`" -eq 579 && \
  space()
  {
--- 301,305 ----
  # available for shells supporting Korn Shell arithmetic syntax.
  #
! test 2>/dev/null "0`x=123; eval echo '$((x+456))'`" -eq 579 && \
  space()
  {
***************
*** 338,343 ****
  #     is `$MISSING_PACKAGE Package $FAILED_SELECTION'.
  {
!   local index choice choices default
!   choices=`enumerate ${4-"."}/$3- -${5-"src.tar.gz"}`
    default=`newest $choices` REPLY=""
    if test `set x $choices; echo $#` -gt 2
--- 345,363 ----
  #     is `$MISSING_PACKAGE Package $FAILED_SELECTION'.
  {
!   local index try choice choices default
!   try=`enumerate ${4-"."}/$3- -${5-"src.tar.gz"}`
!   try="$try "`enumerate ${4-"."}/$3- -$TARGET_OS-${5-"src.tar.gz"}`
!   if test "x$3" = xmingw-runtime
!   then
! #
! #   mingw-runtime needs special handling, to accommodate the
! #   alternative naming convention introduced at version 3.15.
! #
!     try="$try "`enumerate ${4-"."}/mingwrt- -$TARGET_OS-${5-"src.tar.gz"}`
!     try="$try "`enumerate ${4-"."}/mingwrt- -${5-"src.tar.gz"}`
!   fi
!   choices=""
!   for choice in $try
!   do case $choice in *-$TARGET_OS) ;; *) choices="$choices $choice" ;; esac; done
    default=`newest $choices` REPLY=""
    if test `set x $choices; echo $#` -gt 2
***************
*** 347,353 ****
      for choice in $choices
      do
!       incr index
!       echo "  $index)	$3-$choice-"${5-"src.tar.gz"}
!       test "$choice" = "$default" && REPLY=$index
      done
      default=$REPLY
--- 367,379 ----
      for choice in $choices
      do
!       test $index -eq 0 && choices=""
!       try=`tarname $3 $choice ${5-"src.tar.gz"} $4`
!       if test -n "$try"
!       then
! 	incr index
! 	choices="$choices $choice"
! 	echo "  $index)	$try"
! 	test "$choice" = "$default" && REPLY=$index
!       fi
      done
      default=$REPLY
***************
*** 359,369 ****
      eval $2=`set x $choices; shift $REPLY; echo $1`
      echo "$BUILDING_PACKAGE `quote $3` $FROM_SELECTION"
!     eval echo '"  *)	$3-$'$2'-"${5-"src.tar.gz"}'
  
    elif test -n "$choices"
    then
!     eval $2='$choices'
      echo "$SELECTING_PACKAGE `quote $3` $FROM_SOLE_CHOICE"
!     echo "  *)	$3-$choices-"${5-"src.tar.gz"}
  
    else
--- 385,395 ----
      eval $2=`set x $choices; shift $REPLY; echo $1`
      echo "$BUILDING_PACKAGE `quote $3` $FROM_SELECTION"
!     eval echo '"  *)	"`tarname $3 $'$2' ${5-"src.tar.gz"}`'
  
    elif test -n "$choices"
    then
!     eval $2="`echo $choices`"
      echo "$SELECTING_PACKAGE `quote $3` $FROM_SOLE_CHOICE"
!     eval echo '"  *)	$3-$'$2'-"${5-"src.tar.gz"}'
  
    else
***************
*** 373,376 ****
--- 399,427 ----
  }
  
+ tarname()
+ # usage: tarname package version suffix [path]
+ #
+ # Identify the actual file name for an available tarball which provides
+ # the requested `version' of the specified `package'.  The package file
+ # is expected to reside in the directory specified by `path', (defaults
+ # to current working directory), and to to be named conventionally as:
+ #
+ #   package-version-suffix
+ {
+   local try possibile
+   possible='"$1-$2-$3" "$1-$2-$TARGET_OS-$3"'
+   if test "x$1" = xmingw-runtime
+   then
+ #
+ #   later versions of the `mingw-runtime' package use the shorter form
+ #   `mingwrt', as the `package' identification in the tarball name.
+ #
+     possible="$possible"' "mingwrt-$2-$3" "mingwrt-$2-$TARGET_OS-$3"'
+   fi
+   for try in $possible
+   do eval test -r ${4-"."}/"$try" && eval echo "$try" && break
+   done
+ }
+ 
  posn() 
  # usage: posn VarName "Reference Text" "Keywords ..."

Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** x86-mingw32-build.sh	21 Feb 2009 19:33:49 -0000	1.6
--- x86-mingw32-build.sh	22 Feb 2009 15:18:24 -0000	1.7
***************
*** 32,36 ****
  . $script.getopts
  
! TARGET=${1-${TARGET-"${TARGET_CPU-i386}-mingw32"}}
  
  assume BUILD_METHOD interactive
--- 32,37 ----
  . $script.getopts
  
! TARGET=${1-${TARGET-${TARGET_CPU-"i386"}-${TARGET_OS="mingw32"}}}
! TARGET_OS=${TARGET_OS-"`echo $TARGET | sed 's,^.*-mingw,mingw,'`"}
  
  assume BUILD_METHOD interactive
***************
*** 118,123 ****
  
      headers | mingw-runtime | w32api)
!       test -r mingw-runtime-*/configure || $RUN prepare mingw-runtime-$RUNTIME_VERSION
!       test -r w32api-*/configure || $RUN prepare w32api-$W32API_VERSION
        case $COMPONENT in
  	headers)
--- 119,126 ----
  
      headers | mingw-runtime | w32api)
!       MINGWRT=`tarname mingw-runtime \
!         $RUNTIME_VERSION src.tar.gz $PACKAGE_DIR | sed s',-[0-9].*,,'`
!       test -r $MINGWRT-*/configure || $RUN prepare $MINGWRT-$RUNTIME_VERSION
!       test -r w32api-*/configure || $RUN prepare "w32api-$W32API_VERSION"
        case $COMPONENT in
  	headers)
***************
*** 127,131 ****
            test -e "$INSTALL_DIR/usr/local" || (
  	    $RUN cd "$INSTALL_DIR/usr" && $RUN ln -s . local )
! 	  $RUN cp -r mingw-runtime-*/include "$INSTALL_DIR" || die $? \
              "$unrecoverable installing mingw-runtime headers"
  	  $RUN cp -r w32api-*/include "$INSTALL_DIR" || die $? \
--- 130,134 ----
            test -e "$INSTALL_DIR/usr/local" || (
  	    $RUN cd "$INSTALL_DIR/usr" && $RUN ln -s . local )
! 	  $RUN cp -r $MINGWRT-*/include "$INSTALL_DIR" || die $? \
              "$unrecoverable installing mingw-runtime headers"
  	  $RUN cp -r w32api-*/include "$INSTALL_DIR" || die $? \
***************
*** 133,143 ****
  	  ;;
  	mingw-runtime)
            test -e w32api || $RUN ln -s w32api-* w32api
  	  ;;
        esac
!       case $COMPONENT in mingw-runtime | w32api)
  	$RUN setbuilddir ${COMPONENT}-*
  	$RUN ../configure --prefix="$INSTALL_DIR" --host="$TARGET" \
!           --build=${BUILD_PLATFORM=`../config.guess`} || die $? \
            "$unrecoverable configuring $COMPONENT"
  	$RUN $MAKE CFLAGS="$CFLAGS_FOR_RUNTIME" \
--- 136,147 ----
  	  ;;
  	mingw-runtime)
+ 	  COMPONENT=$MINGWRT
            test -e w32api || $RUN ln -s w32api-* w32api
  	  ;;
        esac
!       case $COMPONENT in mingw-runtime | mingwrt | w32api)
  	$RUN setbuilddir ${COMPONENT}-*
  	$RUN ../configure --prefix="$INSTALL_DIR" --host="$TARGET" \
!           --build=${BUILD_PLATFORM="`../config.guess`"} || die $? \
            "$unrecoverable configuring $COMPONENT"
  	$RUN $MAKE CFLAGS="$CFLAGS_FOR_RUNTIME" \
***************
*** 151,155 ****
  
    esac; done
!   cd "$WORKING_DIR"; test $LEAN_BUILD && $RUN rm -rf mingw-runtime-* w32api-*
    BUILD_COMPONENTS=`case $BUILD_COMPONENTS in *gcc*) echo gcc ;; esac`
  done
--- 155,160 ----
  
    esac; done
!   cd "$WORKING_DIR"
!   test $LEAN_BUILD && $RUN rm -rf mingw-runtime-* mingwrt-* w32api-*
    BUILD_COMPONENTS=`case $BUILD_COMPONENTS in *gcc*) echo gcc ;; esac`
  done

Index: x86-mingw32-build.sh.dialogue
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.dialogue,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** x86-mingw32-build.sh.dialogue	18 Feb 2009 23:02:46 -0000	1.4
--- x86-mingw32-build.sh.dialogue	22 Feb 2009 15:18:25 -0000	1.5
***************
*** 1,3 ****
! # x86-mingw32-build.sh.dialogue -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.dialogue -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 44,48 ****
      w32api      the runtime libraries supporting the Win32 API.
  
!     mingw-runtime
                  additional libraries specific to the $TARGET target.
  
--- 44,48 ----
      w32api      the runtime libraries supporting the Win32 API.
  
!     mingwrt (a.k.a. mingw-runtime)
                  additional libraries specific to the $TARGET target.
  
***************
*** 60,63 ****
--- 60,70 ----
  fi
  
+ test `newest "$RUNTIME_VERSION" 3.15` = "$RUNTIME_VERSION" \
+   && mingwrt="mingwrt" mingwrt_srctag=${TARGET_OS-"mingw32"}"-src" \
+   || mingwrt="mingw-runtime"
+ 
+ test `newest "$W32API_VERSION" 3.12` = "$W32API_VERSION" \
+   && w32api_srctag=${TARGET_OS-"mingw32"}"-src" \
+ 
  echo "
   Before proceeding to build the cross-compiler, the following packages must
***************
*** 65,78 ****
  "
  case $BUILD_COMPONENTS in *gcc*) echo "\
!     gcc-core-$GCC_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *binutils*) echo "\
!     binutils-$BINUTILS_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *mingw-runtime*) echo "\
!     mingw-runtime-$RUNTIME_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *w32api*) echo "\
!     w32api-$W32API_VERSION-src.tar.gz"
  esac
  ask "
--- 72,85 ----
  "
  case $BUILD_COMPONENTS in *gcc*) echo "\
!     gcc-core-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *binutils*) echo "\
!     binutils-$BINUTILS_VERSION-${binutils_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *mingw-runtime*) echo "\
!     $mingwrt-$RUNTIME_VERSION-${mingwrt_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *w32api*) echo "\
!     w32api-$W32API_VERSION-${w32api_srctag-"src"}.tar.gz"
  esac
  ask "
***************
*** 96,109 ****
  then
    case $BUILD_COMPONENTS in *gcc*)
!     option DOWNLOAD gcc-core-$GCC_VERSION-src.tar.gz
    esac
    case $BUILD_COMPONENTS in *binutils*)
!     option DOWNLOAD binutils-$BINUTILS_VERSION-src.tar.gz
    esac
    case $BUILD_COMPONENTS in *headers* | *mingw-runtime*)
!     option DOWNLOAD mingw-runtime-$RUNTIME_VERSION-src.tar.gz
    esac
    case $BUILD_COMPONENTS in *headers* | *w32api*)
!     option DOWNLOAD w32api-$W32API_VERSION-src.tar.gz
    esac
  
--- 103,116 ----
  then
    case $BUILD_COMPONENTS in *gcc*)
!     option DOWNLOAD gcc-core-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz
    esac
    case $BUILD_COMPONENTS in *binutils*)
!     option DOWNLOAD binutils-$BINUTILS_VERSION-${binutils_srctag-"src"}.tar.gz
    esac
    case $BUILD_COMPONENTS in *headers* | *mingw-runtime*)
!     option DOWNLOAD $mingwrt-$RUNTIME_VERSION-${mingwrt_srctag-"src"}.tar.gz
    esac
    case $BUILD_COMPONENTS in *headers* | *w32api*)
!     option DOWNLOAD w32api-$W32API_VERSION-${w32api_srctag-"src"}.tar.gz
    esac
  
***************
*** 114,122 ****
   packages, if you wish to add support for other optional languages:--
  
!     gcc-ada-$GCC_VERSION-src.tar.gz      (ada)
!     gcc-g++-$GCC_VERSION-src.tar.gz      (C++)
!     gcc-g77-$GCC_VERSION-src.tar.gz      (f77, i.e. FORTRAN-77)
!     gcc-java-$GCC_VERSION-src.tar.gz     (java)
!     gcc-objc-$GCC_VERSION-src.tar.gz     (objc, i.e. Objective-C)
  
   Would you like me to download any of these optional language packages?
--- 121,129 ----
   packages, if you wish to add support for other optional languages:--
  
!     gcc-ada-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (ada)
!     gcc-g++-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (C++)
!     gcc-g77-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (f77, i.e. FORTRAN-77)
!     gcc-java-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz     (java)
!     gcc-objc-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz     (objc, i.e. Objective-C)
  
   Would you like me to download any of these optional language packages?
***************
*** 154,167 ****
  ALLOW_DOWNLOADS=NO
  case $BUILD_COMPONENTS in *gcc*) echo "\
!     gcc-core-$GCC_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *binutils*) echo "\
!     binutils-$BINUTILS_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *mingw-runtime*) echo "\
!     mingw-runtime-$RUNTIME_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *w32api*) echo "\
!     w32api-$W32API_VERSION-src.tar.gz"
  esac
  case $BUILD_COMPONENTS in *gcc*) echo "
--- 161,174 ----
  ALLOW_DOWNLOADS=NO
  case $BUILD_COMPONENTS in *gcc*) echo "\
!     gcc-core-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *binutils*) echo "\
!     binutils-$BINUTILS_VERSION-${binutils_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *mingw-runtime*) echo "\
!     $mingwrt-$RUNTIME_VERSION-${mingwrt_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *headers* | *w32api*) echo "\
!     w32api-$W32API_VERSION-${w32api_srctag-"src"}.tar.gz"
  esac
  case $BUILD_COMPONENTS in *gcc*) echo "
***************
*** 171,182 ****
   then you must use the same version of these supplementary packages):--
  
!     gcc-ada-$GCC_VERSION-src.tar.gz      (ada)
!     gcc-g++-$GCC_VERSION-src.tar.gz      (C++)
!     gcc-g77-$GCC_VERSION-src.tar.gz      (f77, i.e. FORTRAN-77)
!     gcc-java-$GCC_VERSION-src.tar.gz     (java)
!     gcc-objc-$GCC_VERSION-src.tar.gz     (objc, i.e. Objective-C)
  "
  esac
! ask "\
   In which directory will I find these compiler source packages?
  " "$PACKAGE_DIR" PACKAGE_DIR \?
--- 178,189 ----
   then you must use the same version of these supplementary packages):--
  
!     gcc-ada-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (ada)
!     gcc-g++-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (C++)
!     gcc-g77-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz      (f77, i.e. FORTRAN-77)
!     gcc-java-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz     (java)
!     gcc-objc-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz     (objc, i.e. Objective-C)\
  "
  esac
! ask "
   In which directory will I find these compiler source packages?
  " "$PACKAGE_DIR" PACKAGE_DIR \?
***************
*** 207,211 ****
      *) FILE=$COMPONENT ;;
    esac
!   if test -r $PACKAGE_DIR/gcc-$FILE-$GCC_VERSION-src.tar.gz
    then
      if isyes $REPLY
--- 214,218 ----
      *) FILE=$COMPONENT ;;
    esac
!   if test -r $PACKAGE_DIR/gcc-$FILE-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz
    then
      if isyes $REPLY
***************
*** 337,341 ****
    test x$COMPONENT = xgcc && BASE_PACKAGE=gcc-core || BASE_PACKAGE=$COMPONENT
    choose $COMPONENT $VERSION_TAG $BASE_PACKAGE $PACKAGE_DIR src.tar.gz
!   eval 'option DOWNLOAD $BASE_PACKAGE-$'$VERSION_TAG'-src.tar.gz'
    test x$COMPONENT = xgcc && for FILE in $EXTRA_DOWNLOADS
      do option DOWNLOAD gcc-$FILE-$GCC_VERSION-src.tar.gz
--- 344,348 ----
    test x$COMPONENT = xgcc && BASE_PACKAGE=gcc-core || BASE_PACKAGE=$COMPONENT
    choose $COMPONENT $VERSION_TAG $BASE_PACKAGE $PACKAGE_DIR src.tar.gz
!   eval 'option DOWNLOAD `tarname $BASE_PACKAGE $'$VERSION_TAG' src.tar.gz $PACKAGE_DIR`'
    test x$COMPONENT = xgcc && for FILE in $EXTRA_DOWNLOADS
      do option DOWNLOAD gcc-$FILE-$GCC_VERSION-src.tar.gz

Index: x86-mingw32-build.sh.batch
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.batch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x86-mingw32-build.sh.batch	13 Jan 2008 18:16:53 -0000	1.2
--- x86-mingw32-build.sh.batch	22 Feb 2009 15:18:25 -0000	1.3
***************
*** 1,3 ****
! # x86-mingw32-build.sh.batch -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.batch -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 28,49 ****
  . $script.mirrors
  
  if isyes $USE_LATEST_VERSIONS
  then
!   if isyes $ALLOW_DOWNLOADS
!   then
!     option GCC_VERSION "`enumerate $PACKAGE_DIR/gcc-core- -src.tar.gz`"
!     option BINUTILS_VERSION "`enumerate $PACKAGE_DIR/binutils- -src.tar.gz`"
!     option RUNTIME_VERSION "`enumerate $PACKAGE_DIR/mingw-runtime- -src.tar.gz`"
!     option W32API_VERSION "`enumerate $PACKAGE_DIR/w32api- -src.tar.gz`"
!   else
!     GCC_VERSION=`enumerate $PACKAGE_DIR/gcc-core- -src.tar.gz`
!     BINUTILS_VERSION=`enumerate $PACKAGE_DIR/binutils- -src.tar.gz`
!     RUNTIME_VERSION=`enumerate $PACKAGE_DIR/mingw-runtime- -src.tar.gz`
!     W32API_VERSION=`enumerate $PACKAGE_DIR/w32api- -src.tar.gz`
!   fi
!   GCC_VERSION=`newest $GCC_VERSION`
!   BINUTILS_VERSION=`newest $BINUTILS_VERSION`
!   RUNTIME_VERSION=`newest $RUNTIME_VERSION`
!   W32API_VERSION=`newest $W32API_VERSION`
  fi
  
--- 28,46 ----
  . $script.mirrors
  
+ select_newest()
+ {
+   isyes $ALLOW_DOWNLOADS \
+     && option $1 "`enumerate $PACKAGE_DIR/$2- -src.tar.gz`" \
+     || eval $1='`enumerate $PACKAGE_DIR/$2- -src.tar.gz`'
+   option $1 "`enumerate $PACKAGE_DIR/${3-$2}- -${TARGET_OS}-src.tar.gz`"
+   eval 'newest $'$1
+ }
+ 
  if isyes $USE_LATEST_VERSIONS
  then
!   GCC_VERSION=`select_newest GCC_VERSION gcc-core`
!   BINUTILS_VERSION=`select_newest BINUTILS_VERSION binutils`
!   RUNTIME_VERSION=`select_newest RUNTIME_VERSION mingw-runtime mingwrt`
!   W32API_VERSION=`select_newest W32API_VERSION w32api`
  fi
  
***************
*** 52,56 ****
  case $BUILD_COMPONENTS in *gcc*)
    test -n "$GCC_VERSION" && \
!     option DOWNLOAD gcc-core-$GCC_VERSION-src.tar.gz
    option GCC_BASE_OPTIONS "$GCC_USER_OPTIONS"
    for PACKAGE in $GCC_LANGUAGE_OPTIONS
--- 49,53 ----
  case $BUILD_COMPONENTS in *gcc*)
    test -n "$GCC_VERSION" && \
!     option DOWNLOAD gcc-core-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz
    option GCC_BASE_OPTIONS "$GCC_USER_OPTIONS"
    for PACKAGE in $GCC_LANGUAGE_OPTIONS
***************
*** 59,65 ****
      case $PACKAGE in 'c++') FILE='g++' ;; f77) FILE=g77 ;; esac
      if isyes $ALLOW_DOWNLOADS || \
!     test -f $PACKAGE_DIR/gcc-$FILE-$GCC_VERSION-src.tar.gz
      then
!       option DOWNLOAD gcc-$FILE-$GCC_VERSION-src.tar.gz
        option GCC_LANGUAGE_SET $PACKAGE ','
        case $PACKAGE in
--- 56,62 ----
      case $PACKAGE in 'c++') FILE='g++' ;; f77) FILE=g77 ;; esac
      if isyes $ALLOW_DOWNLOADS || \
!     test -f $PACKAGE_DIR/gcc-$FILE-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz
      then
!       option DOWNLOAD gcc-$FILE-$GCC_VERSION-${gcc_srctag-"src"}.tar.gz
        option GCC_LANGUAGE_SET $PACKAGE ','
        case $PACKAGE in
***************
*** 73,88 ****
  esac
  case $BUILD_COMPONENTS in *binutils*)
!   test -n "$BINUTILS_VERSION" && \
!     option DOWNLOAD binutils-$BINUTILS_VERSION-src.tar.gz
    option BINUTILS_BASE_OPTIONS "$BINUTILS_USER_OPTIONS" ;;
  esac
  case $BUILD_COMPONENTS in *mingw-runtime*)
!   test -n "$RUNTIME_VERSION" && \
!     option DOWNLOAD mingw-runtime-$RUNTIME_VERSION-src.tar.gz
    option RUNTIME_BASE_OPTIONS "$RUNTIME_USER_OPTIONS" ;;
  esac
  case $BUILD_COMPONENTS in *w32api*)
!   test -n "$W32API_VERSION" && \
!     option DOWNLOAD w32api-$W32API_VERSION-src.tar.gz
    option W32API_BASE_OPTIONS "$W32API_USER_OPTIONS" ;;
  esac
--- 70,96 ----
  esac
  case $BUILD_COMPONENTS in *binutils*)
!   if test -n "$BINUTILS_VERSION"
!   then
!     option DOWNLOAD binutils-$BINUTILS_VERSION-${binutils_srctag-"src"}.tar.gz
!   fi
    option BINUTILS_BASE_OPTIONS "$BINUTILS_USER_OPTIONS" ;;
  esac
  case $BUILD_COMPONENTS in *mingw-runtime*)
!   if test -n "$RUNTIME_VERSION"
!   then
!     test `newest "$RUNTIME_VERSION" 3.15` = "$RUNTIME_VERSION" \
!       && mingwrt="mingwrt" mingwrt_srctag=${TARGET_OS-"mingw32"}"-src" \
!       || mingwrt="mingw-runtime"
!     option DOWNLOAD $mingwrt-$RUNTIME_VERSION-${mingwrt_srctag-"src"}.tar.gz
!   fi
    option RUNTIME_BASE_OPTIONS "$RUNTIME_USER_OPTIONS" ;;
  esac
  case $BUILD_COMPONENTS in *w32api*)
!   if test -n "$W32API_VERSION"
!   then
!     test `newest "$W32API_VERSION" 3.12` = "$W32API_VERSION" \
!       && w32api_srctag=${TARGET_OS-"mingw32"}"-src"
!     option DOWNLOAD w32api-$W32API_VERSION-${w32api_srctag-"src"}.tar.gz
!   fi
    option W32API_BASE_OPTIONS "$W32API_USER_OPTIONS" ;;
  esac

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	21 Feb 2009 19:33:48 -0000	1.7
--- ChangeLog	22 Feb 2009 15:18:24 -0000	1.8
***************
*** 1,2 ****
--- 1,41 ----
+ 2009-02-22  Keith Marshall  <kei...@us...>
+ 
+ 	Add support for new MinGW.org package naming conventions.
+ 
+ 	* x86-mingw32-build.sh (MINGWRT): New shell variable; define it
+ 	as the requisite package base name for `mingw-runtime' or `mingwrt',
+ 	which is determined by new `tarname' function; use it to resolve all
+ 	subsequent references to the `mingw-runtime' package.
+ 	(COMPONENT) [mingw-runtime]: Make it match `$MINGWRT'; build it for
+ 	whatever package base name that may be specified thereby.
+ 	(LEAN_BUILD) [isyes]: Purge all plausible `$MINGWRT' aliases.
+ 	(TARGET_OS): New shell variable; define it.
+ 	(TARGET): Use it.
+ 
+ 	* x86-mingw32-build.sh.functions (tarname): New function; it
+ 	identifies possible alternative source package names, including the
+ 	`mingwrt' vs. `mingw-runtime' distinction, and names qualified by
+ 	`$TARGET_OS' preceding the `src' suffix.
+ 	(enumerate): Include such package names, qualified by `$TARGET_OS'.
+ 	(choose): Use both of above, to display available package choices.
+ 	(incr, space): Simplify implementation, to avoid error messages.
+ 	(prepare): Accommodate `$TARGET_OS' qualified package names.
+ 
+ 	* x86-mingw32-build.sh.batch (select_newest): New locally defined
+ 	function; use it to facilitate package version selection when...
+ 	(USE_LATEST_VERSIONS) [isyes]: ...this is true.
+ 	(gcc_srctag, binutils_srctag, mingwrt_srctag, w32api_srctag): New
+ 	optionally defined shell variables; define as required; use them in
+ 	all package name references, with default value of "src".
+ 	(mingwrt): New shell variable; define it locally; use it as an
+ 	analogue of `$MINGWRT'.
+ 
+ 	* x86-mingw32-build.sh.dialogue (tarname): Use as appropriate.
+ 	(gcc_srctag, binutils_srctag, mingwrt_srctag, w32api_srctag): New
+ 	optionally defined shell variables; define and use them in same manner
+ 	as it is used in `x86-mingw32-build.sh.batch'.
+ 	(mingwrt): New shell variable; define and use it in same manner as it
+ 	is used in `x86-mingw32-build.sh.batch'.
+ 
  2009-02-21  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7783

Modified Files:
	ChangeLog x86-mingw32-build.sh x86-mingw32-build.sh.conf 
Log Message:
Enable `sysroot' for binutils.


Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** x86-mingw32-build.sh	19 Feb 2009 19:02:27 -0000	1.5
--- x86-mingw32-build.sh	21 Feb 2009 19:33:49 -0000	1.6
***************
*** 81,85 ****
  	$RUN setbuilddir binutils*
  	$RUN ../configure --prefix="$INSTALL_DIR" --target="$TARGET" \
! 	  $GLOBAL_BASE_OPTIONS $BINUTILS_BASE_OPTIONS || die $? \
            "$unrecoverable configuring binutils"
        fi
--- 81,86 ----
  	$RUN setbuilddir binutils*
  	$RUN ../configure --prefix="$INSTALL_DIR" --target="$TARGET" \
! 	  $GLOBAL_BASE_OPTIONS $BINUTILS_BASE_OPTIONS \
! 	  --with-sysroot="${INSTALL_DIR}" || die $? \
            "$unrecoverable configuring binutils"
        fi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	19 Feb 2009 19:02:27 -0000	1.6
--- ChangeLog	21 Feb 2009 19:33:48 -0000	1.7
***************
*** 1,2 ****
--- 1,15 ----
+ 2009-02-21  Keith Marshall  <kei...@us...>
+ 
+ 	Enable `sysroot' for binutils.
+ 
+ 	* x86-mingw32-build.sh (COMPONENT) [binutils]: Add `--with-sysroot'
+ 	option, when running `configure', placing the `sysroot' at...
+ 	(INSTALL_DIR): ...this path assignment.
+ 
+ 	* x86-mingw32-build.sh.conf (BUILD_COMPONENTS): Reschedule...
+ 	(headers): ...this as first component for installation, ahead of...
+ 	(binutils): ...this, which now needs the headers to be pre-installed
+ 	in the designated `sysroot' path, before it is built.
+ 
  2009-02-19  Keith Marshall  <kei...@us...>
  

Index: x86-mingw32-build.sh.conf
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** x86-mingw32-build.sh.conf	18 Feb 2009 23:02:46 -0000	1.5
--- x86-mingw32-build.sh.conf	21 Feb 2009 19:33:49 -0000	1.6
***************
*** 1,3 ****
! # x86-mingw32-build.sh.conf -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.conf -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 76,81 ****
  #    component, you may comment it out.
  #
-      option BUILD_COMPONENTS              binutils
       option BUILD_COMPONENTS              headers
       option BUILD_COMPONENTS              gcc
       option BUILD_COMPONENTS              w32api
--- 76,81 ----
  #    component, you may comment it out.
  #
       option BUILD_COMPONENTS              headers
+      option BUILD_COMPONENTS              binutils
       option BUILD_COMPONENTS              gcc
       option BUILD_COMPONENTS              w32api

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9246

Modified Files:
	ChangeLog x86-mingw32-build.sh x86-mingw32-build.sh.getopts 
Log Message:
Fix MinGW-Bug[2031691]: Dry run may break subsequent build.


Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** x86-mingw32-build.sh	18 Feb 2009 23:02:46 -0000	1.4
--- x86-mingw32-build.sh	19 Feb 2009 19:02:27 -0000	1.5
***************
*** 1,4 ****
  #!/bin/sh
! # x86-mingw32-build.sh -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,4 ----
  #!/bin/sh
! # x86-mingw32-build.sh -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 103,107 ****
  	done
        fi
!       setbuilddir build-gcc .
        $RUN ../gcc-*/configure --prefix="$INSTALL_DIR" --target="$TARGET" \
  	$GLOBAL_BASE_OPTIONS $GCC_BASE_OPTIONS --enable-languages=`
--- 103,107 ----
  	done
        fi
!       $RUN setbuilddir build-gcc .
        $RUN ../gcc-*/configure --prefix="$INSTALL_DIR" --target="$TARGET" \
  	$GLOBAL_BASE_OPTIONS $GCC_BASE_OPTIONS --enable-languages=`
***************
*** 136,140 ****
        esac
        case $COMPONENT in mingw-runtime | w32api)
! 	setbuilddir ${COMPONENT}-*
  	$RUN ../configure --prefix="$INSTALL_DIR" --host="$TARGET" \
            --build=${BUILD_PLATFORM=`../config.guess`} || die $? \
--- 136,140 ----
        esac
        case $COMPONENT in mingw-runtime | w32api)
! 	$RUN setbuilddir ${COMPONENT}-*
  	$RUN ../configure --prefix="$INSTALL_DIR" --host="$TARGET" \
            --build=${BUILD_PLATFORM=`../config.guess`} || die $? \

Index: x86-mingw32-build.sh.getopts
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.getopts,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x86-mingw32-build.sh.getopts	13 Jan 2008 18:16:53 -0000	1.2
--- x86-mingw32-build.sh.getopts	19 Feb 2009 19:02:27 -0000	1.3
***************
*** 1,3 ****
! # x86-mingw32-build.sh.getopts -*- sh -*- -- vim: filetype=sh
  # $Id$
  #
--- 1,3 ----
! # x86-mingw32-build.sh.getopts -*- sh -*- vim: filetype=sh
  # $Id$
  #
***************
*** 61,65 ****
                            BUILD_METHOD=batch ;;
  
!         --dry-run)        RUN=echo ;;
  
          --download)       ALLOW_DOWNLOADS=YES ;;
--- 61,65 ----
                            BUILD_METHOD=batch ;;
  
!         --dry-run)        RUN=echo BUILD_PLATFORM='`../config.guess`' ;;
  
          --download)       ALLOW_DOWNLOADS=YES ;;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog	18 Feb 2009 23:02:45 -0000	1.5
--- ChangeLog	19 Feb 2009 19:02:27 -0000	1.6
***************
*** 1,2 ****
--- 1,11 ----
+ 2009-02-19  Keith Marshall  <kei...@us...>
+ 
+ 	Fix MinGW-Bug[2031691]: Dry run may break subsequent build.
+ 	(Reported by Dave Korn <dav...@us...>)
+ 
+ 	* x86-mingw32-build.sh (setbuilddir): Guard all usage with `$RUN'.
+ 	* x86-mingw32-build.sh.getopts [--dry-run] (BUILD_PLATFORM):
+ 	Pre-define; avoid invocation of `config.guess' at point of use.
+ 
  2009-02-18  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7971

Modified Files:
	ChangeLog x86-mingw32-build.sh x86-mingw32-build.sh.conf 
	x86-mingw32-build.sh.dialogue 
Log Message:
Relocate GDC support to experimental development branch.


Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** x86-mingw32-build.sh	13 Jan 2008 18:16:53 -0000	1.3
--- x86-mingw32-build.sh	18 Feb 2009 23:02:46 -0000	1.4
***************
*** 99,114 ****
  	do
  	  case $GCC_LANGUAGE_SET in *$FILE*) ;; *) FILE=no ;; esac
! 	  case $FILE in
! 	    'c++') FILE='g++' ;;
! 	    # d is not (yet) fully integrated with gcc
! 	    # to support it anyway requires to apply a special patch
! 	    d) FILE=no
! 	      pushd gcc-*
! 	      test -r ./gcc/d/setup-gcc.sh || pushd gcc && \
! 	        $RUN prepare gdc-$GDC_VERSION && popd
! 	      ./gcc/d/setup-gcc.sh
! 	      popd ;;
! 	    f77) FILE=g77 ;;
! 	  esac
  	  test $FILE = no || $RUN prepare gcc-$FILE-$GCC_VERSION
  	done
--- 99,103 ----
  	do
  	  case $GCC_LANGUAGE_SET in *$FILE*) ;; *) FILE=no ;; esac
! 	  case $FILE in 'c++') FILE='g++' ;; f77) FILE=g77 ;; esac
  	  test $FILE = no || $RUN prepare gcc-$FILE-$GCC_VERSION
  	done

Index: x86-mingw32-build.sh.dialogue
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.dialogue,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** x86-mingw32-build.sh.dialogue	13 Jan 2008 18:16:53 -0000	1.3
--- x86-mingw32-build.sh.dialogue	18 Feb 2009 23:02:46 -0000	1.4
***************
*** 120,136 ****
      gcc-objc-$GCC_VERSION-src.tar.gz     (objc, i.e. Objective-C)
  
-  There is experimental support for GDC, the GNU D-language compiler:--
- 
-     gdc-$GDC_VERSION-src.tar.bz2            (D)
- 
-  (*) Note gdc does not yet build with dwarf-2 exception handling (dw2);
-      setjmp/longjmp (sjlj) is required
- 
-  This set of scripts currently does not support automated download of this
-  file. If you wish to build gdc as well, you have to manually download the
-  corresponding sources from
- 
-     http://sourceforge.net/project/showfiles.php?group_id=154306
- 
   Would you like me to download any of these optional language packages?
  " YES REPLY \?
--- 120,123 ----
***************
*** 143,153 ****
    then
      option GCC_LANGUAGE_SET $COMPONENT \,
!     case $COMPONENT in
!       c++) COMPONENT=g++ ;;
!       d) COMPONENT2=gdc-$GDC_VERSION-src.tar.bz2 ;;
!       f77) COMPONENT=g77 ;;
!     esac
!     if [ -n "$COMPONENT2" ]; then option DOWNLOAD $COMPONENT2
!     else option DOWNLOAD gcc-$COMPONENT-$GCC_VERSION-src.tar.gz; fi
    fi
  done; }
--- 130,135 ----
    then
      option GCC_LANGUAGE_SET $COMPONENT \,
!     case $COMPONENT in c++) COMPONENT=g++ ;; f77) COMPONENT=g77 ;; esac
!     option DOWNLOAD gcc-$COMPONENT-$GCC_VERSION-src.tar.gz
    fi
  done; }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	14 Jan 2008 06:16:10 -0000	1.4
--- ChangeLog	18 Feb 2009 23:02:45 -0000	1.5
***************
*** 1,20 ****
  2008-01-13  Michael Gerdau  <mg...@us...>
  
! 	* x86-mingw32-build.sh (COMPONENT): Added support for gdc
  
! 	* x86-mingw32-build.sh.dialogue (BUILD_COMPONENTS): Added support
! 	for gdc
  
  	* x86-mingw32-build.sh.conf (W32API_VERSION): Update to 3.11
  	(RUNTIME_VERSION): Update to 3.14
  	(BINUTILS_VERSION): Update to 2.18.50-20080109
! 	(GDC_VERSION): Newly added as 0.24
! 
! 	* x86-mingw32-build.sh, x86-mingw32-build.sh.batch,
! 	x86-mingw32-build.sh.conf, x86-mingw32-build.sh.detail,
! 	x86-mingw32-build.sh.dialogue, x86-mingw32-build.sh.function,
! 	x86-mingw32-build.sh.getopts, x86-mingw32-build.sh.help,
! 	x86-mingw32-build.sh.mirrors, x86-mingw32-build.sh.version: Added
! 	filetype tag for emacs
  
  2006-12-31  Keith Marshall  <kei...@us...>
--- 1,33 ----
+ 2009-02-18  Keith Marshall  <kei...@us...>
+ 
+ 	Relocate GDC support to experimental development branch; phase 2.
+ 
+ 	* x86-mingw32-build.sh: Revert GDC specific changes from 2008-01-13.
+ 	* x86-mingw32-build.sh.dialogue, x86-mingw32-build.sh.conf: Ditto.
+ 
+ 2009-02-18  Keith Marshall  <kei...@us...>
+ 
+ 	Relocate GDC support to experimental development branch; phase 1.
+ 
+ 	* All files (gdc-experimental): Branch tag assigned at `HEAD'.
+ 
  2008-01-13  Michael Gerdau  <mg...@us...>
  
! 	* x86-mingw32-build.sh: Add file type tag for emacs.
! 	* x86-mingw32-build.sh.batch, x86-mingw32-build.sh.conf: Ditto.
! 	* x86-mingw32-build.sh.detail, x86-mingw32-build.sh.dialogue: Ditto.
! 	* x86-mingw32-build.sh.function, x86-mingw32-build.sh.getopts: Ditto.
! 	* x86-mingw32-build.sh.help, x86-mingw32-build.sh.mirrors: Ditto.
! 	* x86-mingw32-build.sh.version: Ditto.
  
! 2008-01-13  Michael Gerdau  <mg...@us...>
! 
! 	* x86-mingw32-build.sh (COMPONENT): Add support for GDC.
! 	* x86-mingw32-build.sh.dialogue (BUILD_COMPONENTS): Ditto.
  
  	* x86-mingw32-build.sh.conf (W32API_VERSION): Update to 3.11
  	(RUNTIME_VERSION): Update to 3.14
  	(BINUTILS_VERSION): Update to 2.18.50-20080109
! 	(GDC_VERSION): New identifier; define it as 0.24
  
  2006-12-31  Keith Marshall  <kei...@us...>

Index: x86-mingw32-build.sh.conf
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** x86-mingw32-build.sh.conf	13 Jan 2008 18:16:53 -0000	1.4
--- x86-mingw32-build.sh.conf	18 Feb 2009 23:02:46 -0000	1.5
***************
*** 53,57 ****
       assume RUNTIME_VERSION               3.14
       assume W32API_VERSION                3.11
-      assume GDC_VERSION                   0.24
  #
  # 5) Automatic patching of downloaded packages: if any appropriately
--- 53,56 ----
***************
*** 96,100 ****
       option GCC_LANGUAGE_OPTIONS          ada
       option GCC_LANGUAGE_OPTIONS          c++
-      option GCC_LANGUAGE_OPTIONS          d
       option GCC_LANGUAGE_OPTIONS          f77
       option GCC_LANGUAGE_OPTIONS          java
--- 95,98 ----