X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=maintainer-scripts%2Fgcc_release;h=cb44b19bc768aba2f7ab00cf7ce3804c66353dd5;hb=6a4f20ec75e4f46f1171d15987bfd35643736348;hp=adba309303da30d64836bebf89ac712393be41b8;hpb=92264cad834c0a11f72bee1702460d1500871471;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index adba309303d..cb44b19bc76 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -9,7 +9,7 @@
 # Contents:
 #   Script to create a GCC release.
 #
-# Copyright (c) 2001, 2002 Free Software Foundation.
+# Copyright (c) 2001, 2002, 2006 Free Software Foundation.
 #
 # This file is part of GCC.
 #
@@ -139,25 +139,14 @@ EOF
       fi
     done
 
-    # Update gcc/DEV-PHASE if it exists, otherwise gcc/version.c.
+    # Update gcc/DEV-PHASE.
 
-    if [ -f ${SOURCE_DIRECTORY}/gcc/DEV-PHASE ]; then
-      [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
-      error "Release number ${RELEASE} does not match BASE-VER"
-      (changedir ${SOURCE_DIRECTORY}/gcc && \
-       : > DEV-PHASE && \
-       ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
-      error "Could not update DEV-PHASE"
-    else
-      for x in gcc/version.c; do 
-        y=`basename ${x}`
-        (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
-            sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
-	    mv ${y}.new ${y} && \
-            ${SVN} -q ci -m 'Update version' ${y}) || \
-	    error "Could not update ${x}"
-      done
-    fi
+    [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
+    error "Release number ${RELEASE} does not match BASE-VER"
+    (changedir ${SOURCE_DIRECTORY}/gcc && \
+     : > DEV-PHASE && \
+     ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
+    error "Could not update DEV-PHASE"
 
     # Make sure we tag the sources for a final release.
     TAG="tags/gcc_`echo ${RELEASE} | tr . _`_release"
@@ -193,26 +182,6 @@ EOF
   contrib/gcc_update --touch
   echo "Obtained from SVN: ${SVNBRANCH} revision ${SVNREV}" > LAST_UPDATED
 
-  # Obtain some documentation files from the wwwdocs module.
-  inform "Retrieving HTML documentation"
-  changedir "${WORKING_DIRECTORY}"
-  for x in bugs faq; do
-    (${CVS} export -r HEAD wwwdocs/htdocs/${x}.html && \
-     cp ${WORKING_DIRECTORY}/wwwdocs/htdocs/${x}.html \
-        ${SOURCE_DIRECTORY}) || \
-      error "Could not retrieve ${x}.html"
-  done
-
-  inform "Generating plain-text documentation from HTML"
-  changedir "${SOURCE_DIRECTORY}"
-  for file in *.html; do
-    newfile=`echo $file | sed -e 's/.html//' | tr "[:lower:]" "[:upper:]"`
-    (${ENV} TERM=vt100 lynx -dump $file \
-       | sed -e "s#file://localhost`/bin/pwd`\(.*\)#http://gcc.gnu.org\1#g" \
-       > $newfile) || \
-     error "Could not generate text-only version of ${file}"
-  done
-
   # For a prerelease or real release, we need to generate additional
   # files not present in SVN.
   changedir "${SOURCE_DIRECTORY}"
@@ -236,7 +205,7 @@ EOF
     inform "Building compiler"
     OBJECT_DIRECTORY=../objdir
     contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \
-      -c "--enable-generated-files-in-srcdir" build || \
+      -c "--enable-generated-files-in-srcdir --disable-multilib" build || \
       error "Could not rebuild GCC"
   fi
 
@@ -263,10 +232,10 @@ EOF
   xargs md5sum >>MD5SUMS
 }
 
-# Buid a single tarfile.  The first argument is the name of the name
-# of the tarfile to build, without any suffixes.  They will be added
-# automatically.  The rest of the arguments are the files or
-# directories to include, and possibly other arguments to tar.
+# Build a single tarfile.  The first argument is the name of the tarfile
+# to build, without any suffixes.  They will be added automatically.  The
+# rest of the arguments are files or directories to include, and possibly
+# other arguments to tar.
 
 build_tarfile() {
   # Get the name of the destination tar file.
@@ -317,7 +286,6 @@ build_tarfiles() {
   # Now, build one for each of the languages.
   maybe_build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS}
   maybe_build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS}
-  maybe_build_tarfile gcc-g77-${RELEASE} ${FORTRAN_DIRS}
   maybe_build_tarfile gcc-fortran-${RELEASE} ${FORTRAN95_DIRS}
   maybe_build_tarfile gcc-java-${RELEASE} ${JAVA_DIRS}
   maybe_build_tarfile gcc-objc-${RELEASE} ${OBJECTIVEC_DIRS}
@@ -325,7 +293,7 @@ build_tarfiles() {
    
   # The core is everything else.
   EXCLUDES=""
-  for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN_DIRS} ${FORTRAN95_DIRS}\
+  for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN95_DIRS}\
 	   ${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do
     EXCLUDES="${EXCLUDES} --exclude $x"
   done
@@ -348,7 +316,7 @@ build_diffs() {
   old_vers=${old_file%.tar.bz2}
   old_vers=${old_vers#gcc-}
   inform "Building diffs against version $old_vers"
-  for f in gcc gcc-ada gcc-g++ gcc-g77 gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
+  for f in gcc gcc-ada gcc-g++ gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
     old_tar=${old_dir}/${f}-${old_vers}.tar.bz2
     new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.bz2
     if [ ! -e $old_tar ]; then
@@ -416,7 +384,7 @@ upload_files() {
   done
 }
 
-#Print description if snapshot exists
+# Print description if snapshot exists.
 snapshot_print() {
   if [ -e ${RELEASE}/$1 ]; then
      printf "%-38s%s\n\n" "$1" "$2" >> ${SNAPSHOT_README}
@@ -473,7 +441,6 @@ with the following options: <code>"svn://gcc.gnu.org/svn/gcc/${SVNBRANCH} revisi
   snapshot_print gcc-ada-${RELEASE}.tar.bz2 "Ada front end and runtime"
   snapshot_print gcc-fortran-${RELEASE}.tar.bz2 "Fortran front end and runtime"
   snapshot_print gcc-g++-${RELEASE}.tar.bz2 "C++ front end and runtime"
-  snapshot_print gcc-g77-${RELEASE}.tar.bz2 "Fortran 77 front end and runtime"
   snapshot_print gcc-java-${RELEASE}.tar.bz2 "Java front end and runtime"
   snapshot_print gcc-objc-${RELEASE}.tar.bz2 "Objective-C front end and runtime"
   snapshot_print gcc-testsuite-${RELEASE}.tar.bz2 "The GCC testsuite"
@@ -518,11 +485,14 @@ Last modified "${TEXT_DATE}"
 # Initialization
 ########################################################################
 
+LC_ALL=C
+export LC_ALL
+
 # Today's date.
 DATE=`date "+%Y%m%d"`
 LONG_DATE=`date "+%Y-%m-%d"`
 
-SVN=${SVN:-/usr/bin/svn}
+SVN=${SVN:-svn}
 # The CVS server containing the GCC repository.
 SVN_SERVER="gcc.gnu.org"
 # The path to the repository on that server.
@@ -566,7 +536,7 @@ TAG=""
 OLD_TARS=""
 
 # The directory that will be used to construct the release.  The
-# release itself will be placed in a subdirectory of this diretory.
+# release itself will be placed in a subdirectory of this directory.
 DESTINATION=${HOME}
 # The subdirectory.
 WORKING_DIRECTORY=""
@@ -577,10 +547,9 @@ SOURCE_DIRECTORY=""
 # tar files.  These are all relative to the top of the source tree.
 ADA_DIRS="gcc/ada libada gnattools"
 CPLUSPLUS_DIRS="gcc/cp libstdc++-v3"
-FORTRAN_DIRS="gcc/f libf2c"
 FORTRAN95_DIRS="gcc/fortran libgfortran"
 JAVA_DIRS="gcc/java libjava libffi fastjar zlib boehm-gc"
-OBJECTIVEC_DIRS="gcc/objc libobjc"
+OBJECTIVEC_DIRS="gcc/objc gcc/objcp libobjc"
 TESTSUITE_DIRS="gcc/testsuite"
 
 # Non-zero if this is the final release, rather than a prerelease.
@@ -696,10 +665,10 @@ if [ $SNAPSHOT -eq 0 ]; then
   # and minor release numbers.
   SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
 
-  # If this is not a final release, set various parameters acordingly.
+  # If this is not a final release, set various parameters accordingly.
   if [ ${FINAL} -ne 1 ]; then
-    RELEASE="${RELEASE}-${DATE}"
-    FTP_PATH="${FTP_PATH}/prerelease-${RELEASE}/"
+    RELEASE="${RELEASE}-RC-${DATE}"
+    FTP_PATH="${SNAPSHOTS_DIR}/${RELEASE}"
   else
     FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
   fi
@@ -709,7 +678,7 @@ else
 
   # If diffs are requested when building locally on gcc.gnu.org, we (usually)
   # know what the last snapshot date was and take the corresponding tarballs,
-  # unless the user specified tarballs explictly.
+  # unless the user specified tarballs explicitly.
   if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ] && [ -z "${OLD_TARS}" ]; then
     LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
     OLD_TARS=${SNAPSHOTS_DIR}/${BRANCH}-${LAST_DATE}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
@@ -724,7 +693,6 @@ SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}"
 # relative to the WORKING_DIRECTORY.
 ADA_DIRS=`adjust_dirs ${ADA_DIRS}`
 CPLUSPLUS_DIRS=`adjust_dirs ${CPLUSPLUS_DIRS}`
-FORTRAN_DIRS=`adjust_dirs ${FORTRAN_DIRS}`
 FORTRAN95_DIRS=`adjust_dirs ${FORTRAN95_DIRS}`
 JAVA_DIRS=`adjust_dirs ${JAVA_DIRS}`
 OBJECTIVEC_DIRS=`adjust_dirs ${OBJECTIVEC_DIRS}`