From patchwork Thu Aug 7 13:52:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 35043 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8487221457 for ; Thu, 7 Aug 2014 13:52:52 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id ft15sf23972551pdb.2 for ; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:x-original-sender:x-original-authentication-results; bh=5X0sJeX+mtx7nNwOUWL8/QZZ3hPQlKJPX7w70Hl6vfU=; b=Zj5nRzIW4vVwnvo6G9GZnb8Ucuez7tPPDU3rJ1dkZWTkRrDcBZZNd7dHNC9p90TZSk zA8PWBTQPQ+K+JQjsPsQFEEpfDf9MtNx4mh3Uc3giJJ1OFDoHJp3Hb9e8OUCGznRI/Zm jGREICALL2Op97YvWcor0qw0sdiwSxxNBkP0nJbCFFCTvt5nzySuK34veqbRv54xh+AU rkZ64+ui9hvrpWR5+iM7CVF95VKeSj0ZSkHVBZ+jRRtaAJZY+8dRJ+sFGtdrqJcazHMb PCHjCSUM2tkeBgxSphb5C0MIOqOBYLE1CaIgiowfwUnGLfcJIRQI4d47HM+QD0QyiQqG MDRA== X-Gm-Message-State: ALoCoQkB2nXMTOPs7BO+QWBxg7p2y4yl9JKSxMXrHJjcRXOmqDUj2wtdluKFTVSAFzNcRC7s36gl X-Received: by 10.66.222.9 with SMTP id qi9mr9198439pac.28.1407419571815; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.176 with SMTP id 45ls148119qgx.16.gmail; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr241806vdb.86.1407419571705; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) Received: from mail-vc0-x22e.google.com (mail-vc0-x22e.google.com [2607:f8b0:400c:c03::22e]) by mx.google.com with ESMTPS id db12si1774976vdd.101.2014.08.07.06.52.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Aug 2014 06:52:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22e as permitted sender) client-ip=2607:f8b0:400c:c03::22e; Received: by mail-vc0-f174.google.com with SMTP id la4so6375773vcb.33 for ; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) X-Received: by 10.220.131.207 with SMTP id y15mr358551vcs.71.1407419571570; Thu, 07 Aug 2014 06:52:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp31781vcb; Thu, 7 Aug 2014 06:52:50 -0700 (PDT) X-Received: by 10.68.93.101 with SMTP id ct5mr17728171pbb.27.1407419570270; Thu, 07 Aug 2014 06:52:50 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id zr6si3613550pac.49.2014.08.07.06.52.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Aug 2014 06:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-return-84439-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 5096 invoked by alias); 7 Aug 2014 13:52:33 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Subscribe: List-Archive: List-Post: , List-Help: , Sender: binutils-owner@sourceware.org Delivered-To: mailing list binutils@sourceware.org Received: (qmail 5086 invoked by uid 89); 7 Aug 2014 13:52:32 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 X-HELO: mail-we0-f179.google.com Received: from mail-we0-f179.google.com (HELO mail-we0-f179.google.com) (74.125.82.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 07 Aug 2014 13:52:29 +0000 Received: by mail-we0-f179.google.com with SMTP id u57so4228220wes.24 for ; Thu, 07 Aug 2014 06:52:26 -0700 (PDT) X-Received: by 10.194.122.73 with SMTP id lq9mr3519058wjb.133.1407419545884; Thu, 07 Aug 2014 06:52:25 -0700 (PDT) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id w7sm29142294wiy.6.2014.08.07.06.52.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Aug 2014 06:52:25 -0700 (PDT) From: Will Newton To: gdb-patches@sourcware.org, binutils@sourceware.org Subject: [RFC] src-release.sh: Convert src-release to a shell script Date: Thu, 7 Aug 2014 14:52:21 +0100 Message-Id: <1407419541-27145-1-git-send-email-will.newton@linaro.org> X-IsSubscribed: yes X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22e as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 This began as an attempt to make a few small changes to src-release but heeding the comments at the top of the file it seemed it might be wise to convert it to a shell script instead which should hopefully be more maintainable. This shell script contains most of the functionality of the Makefile version. It can be run like this: # This will build gdb and compress with bzip2, gzip and xz ./src-release.sh -bgx gdb The functionality that has been removed is building tarballs for insight and gnats, which were broken in the current repository layout and gas+binutils which amounted to basically the same thing as binutils so didn't seem worth keeping. The script always builds a tar file, compression is optional, so no need for specific commands to build tar files rather than compressed tar files. The build of gas releases has been fixed, as has extraction of version numbers which had been broken since the switch to configure.ac files and AC_INIT. I also removed the code for distcleaning the intl sub-directory as it seems like that issue has been fixed. The script is capable of compressing with bzip2, gzip and xz which should cover all formats available on gnu.org. I tested it by producing release tarballs which are substantially identical to the ones produced by the src-release script. ChangeLog: 2014-08-07 Will Newton * src-release.sh: New file. --- src-release.sh | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100755 src-release.sh diff --git a/src-release.sh b/src-release.sh new file mode 100755 index 0000000..3d41269 --- /dev/null +++ b/src-release.sh @@ -0,0 +1,353 @@ +#!/bin/bash +# Copyright (C) 1990-2014 Free Software Foundation +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +# This script creates release packages for gdb, binutils, and other +# packages which live in src. It used to be implemented as the src-release +# Makefile and prior to that was part of the top level Makefile, but that +# turned out to be very messy and hard to maintain. + +set -e + +BZIPPROG=bzip2 +GZIPPROG=gzip +XZPROG=xz +MD5PROG=md5sum +MAKE=make +CC=gcc +CXX=g++ + +# Default to avoid splitting info files by setting the threshold high. +MAKEINFOFLAGS=--split-size=5000000 + +# +# Support for building net releases + +# Files in devo used in any net release. +DEVO_SUPPORT="README Makefile.in configure configure.ac \ + config.guess config.sub config move-if-change \ + COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ + mkinstalldirs ltmain.sh missing ylwrap \ + libtool.m4 ltsugar.m4 ltversion.m4 ltoptions.m4 \ + Makefile.def Makefile.tpl src-release config.rpath \ + ChangeLog MAINTAINERS README-maintainer-mode \ + lt~obsolete.m4 ltgcc.m4 depcomp mkdep compile \ + COPYING3 COPYING3.LIB" + +# Files in devo/etc used in any net release. +ETC_SUPPORT="Makefile.in configure configure.in standards.texi \ + make-stds.texi standards.info* configure.texi configure.info* \ + ChangeLog configbuild.* configdev.* fdl.texi texi2pod.pl gnu-oids.texi" + +# Get the version number of a given tool +getver() +{ + tool=$1 + if grep 'AC_INIT.*BFD_VERSION' $tool/configure.ac >/dev/null 2>&1; then + bfd/configure --version | sed -n -e '1s,.* ,,p' + elif test -f $tool/common/create-version.sh; then + $tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp + cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$//' + rm -f VER.tmp + elif test -f $tool/version.in; then + head -1 $tool/version.in + else + echo VERSION + fi +} + +# Setup build directory for building release tarball +do_proto_toplev() +{ + package=$1 + ver=$2 + tool=$3 + support_files=$4 + echo "==> Making $package-$ver/" + # Take out texinfo from a few places. + sed -e '/^all\.normal: /s/\all-texinfo //' \ + -e '/^ install-texinfo /d' \ + tmp + mv -f tmp Makefile.in + # + ./configure i686-pc-linux-gnu + $MAKE configure-host configure-target \ + ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \ + CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX" + # Make links, and run "make diststuff" or "make info" when needed. + rm -rf proto-toplev + mkdir proto-toplev + dirs="$DEVO_SUPPORT $support_files $tool" + for d in $dirs ; do + if [ -d $d ]; then + if [ ! -f $d/Makefile ] ; then + true + elif grep '^diststuff:' $d/Makefile >/dev/null ; then + (cd $d ; $MAKE MAKEINFOFLAGS="$MAKEINFOFLAGS" diststuff) \ + || exit 1 + elif grep '^info:' $d/Makefile >/dev/null ; then + (cd $d ; $MAKE MAKEINFOFLAGS="$MAKEINFOFLAGS" info) \ + || exit 1 + fi + if [ -d $d/proto-$d.dir ]; then + ln -s ../$d/proto-$d.dir proto-toplev/$d + else + ln -s ../$d proto-toplev/$d + fi + else + if (echo x$d | grep / >/dev/null); then + mkdir -p proto-toplev/`dirname $d` + x=`dirname $d` + ln -s ../`echo $x/ | sed -e 's,[^/]*/,../,g'`$d proto-toplev/$d + else + ln -s ../$d proto-toplev/$d + fi + fi + done + (cd etc; $MAKE MAKEINFOFLAGS="$MAKEINFOFLAGS" info) + $MAKE distclean + mkdir proto-toplev/etc + (cd proto-toplev/etc; + for i in $ETC_SUPPORT; do + ln -s ../../etc/$i . + done) + # + # Take out texinfo from configurable dirs + rm proto-toplev/configure.ac + sed -e '/^host_tools=/s/texinfo //' \ + proto-toplev/configure.ac + # + mkdir proto-toplev/texinfo + ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/ + if test -r texinfo/util/tex3patch ; then + mkdir proto-toplev/texinfo/util && \ + ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util + else + true + fi + chmod -R og=u . || chmod og=u `find . -print` + # + # Create .gmo files from .po files. + for f in `find . -name '*.po' -type f -print`; do + msgfmt -o `echo $f | sed -e 's/\.po$/.gmo/'` $f + done + # + rm -f $package-$ver + ln -s proto-toplev $package-$ver +} + +CVS_NAMES='-name CVS -o -name .cvsignore' + +# Add an md5sum to the built tarball +do_md5sum() +{ + echo "==> Adding md5 checksum to top-level directory" + (cd proto-toplev && find * -follow \( $CVS_NAMES \) -prune \ + -o -type f -print \ + | xargs $MD5PROG > ../md5.new) + rm -f proto-toplev/md5.sum + mv md5.new proto-toplev/md5.sum +} + +# Build the release tarball +do_tar() +{ + package=$1 + ver=$2 + echo "==> Making $package-$ver.tar" + rm -f $package-$ver.tar + find $package-$ver -follow \( $CVS_NAMES \) -prune \ + -o -type f -print \ + | tar cTfh - $package-$ver.tar +} + +# Compress the output with bzip2 +do_bz2() +{ + package=$1 + ver=$2 + echo "==> Bzipping $package-$ver.tar.bz2" + rm -f $package-$ver.tar.bz2 + $BZIPPROG -k -v -9 $package-$ver.tar +} + +# Compress the output with gzip +do_gz() +{ + package=$1 + ver=$2 + echo "==> Gzipping $package-$ver.tar.gz" + rm -f $package-$ver.tar.gz + $GZIPPROG -k -v -9 $package-$ver.tar +} + +# Compress the output with xz +do_xz() +{ + package=$1 + ver=$2 + echo "==> Xzipping $package-$ver.tar.xz" + rm -f $package-$ver.tar.xz + $XZPROG -k -v -9 $package-$ver.tar +} + +# Compress the output with all selected compresion methods +do_compress() +{ + package=$1 + ver=$2 + compressors=$3 + for comp in $compressors; do + case $comp in + bz2) + do_bz2 $package $ver;; + gz) + do_gz $package $ver;; + xz) + do_xz $package $ver;; + *) + echo "Unknown compression method: $comp" && exit 1;; + esac + done +} + +# Add djunpack.bat the tarball +do_djunpack() +{ + package=$1 + ver=$2 + echo "==> Adding updated djunpack.bat to top-level directory" + echo - 's /gdb-[0-9\.]*/$package-'"$ver"'/' + sed < djunpack.bat > djunpack.new \ + -e 's/gdb-[0-9][0-9\.]*/$package-'"$ver"'/' + rm -f proto-toplev/djunpack.bat + mv djunpack.new proto-toplev/djunpack.bat +} + +# Create a release package, tar it and compress it +tar_compress() +{ + package=$1 + tool=$2 + support_files=$3 + compressors=$4 + ver=$(getver $tool) + do_proto_toplev $package $ver $tool "$support_files" + do_md5sum + do_tar $package $ver + do_compress $package $ver "$compressors" +} + +# Create a gdb release package, tar it and compress it +gdb_tar_compress() +{ + package=$1 + tool=$2 + support_files=$3 + compressors=$4 + ver=$(getver $tool) + do_proto_toplev $package $ver $tool "$support_files" + do_md5sum + do_djunpack $package $ver + do_tar $package $ver + do_compress $package $ver "$compressors" +} + +# The FSF "binutils" release includes gprof and ld. +BINUTILS_SUPPORT_DIRS="bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu" +binutils_release() +{ + compressors=$1 + package=binutils + tool=binutils + tar_compress $package $tool "$BINUTILS_SUPPORT_DIRS" "$compressors" +} + +GAS_SUPPORT_DIRS="bfd include libiberty opcodes intl setup.com makefile.vms" +gas_release() +{ + compressors=$1 + package=gas + tool=gas + tar_compress $package $tool "$GAS_SUPPORT_DIRS" "$compressors" +} + +GDB_SUPPORT_DIRS="bfd include libiberty opcodes readline sim intl libdecnumber cpu" +gdb_release() +{ + compressors=$1 + package=gdb + tool=gdb + gdb_tar_compress $package $tool "$GDB_SUPPORT_DIRS" "$compressors" +} + +# Corresponding to the CVS "sim" module. +SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms" +sim_release() +{ + compressors=$1 + package=sim + tool=sim + tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" +} + +usage() +{ + echo "src-release.sh " + echo "options:" + echo " -b: Compress with bzip2" + echo " -g: Compress with gzip" + echo " -x: Compress with xz" + exit 1 +} + +build_release() +{ + release=$1 + compressors=$2 + case $release in + binutils) + binutils_release "$compressors";; + gas) + gas_release "$compressors";; + gdb) + gdb_release "$compressors";; + sim) + sim_release "$compressors";; + *) + echo "Unknown release name: $release" && usage;; + esac +} + +compressors="" + +while getopts ":gbx" opt; do + case $opt in + b) + compressors="$compressors bz2";; + g) + compressors="$compressors gz";; + x) + compressors="$compressors xz";; + \?) + echo "Invalid option: -$OPTARG" && usage;; + esac +done +shift $((OPTIND -1)) +release=$1 + +build_release $release "$compressors"