diff options
Diffstat (limited to 'utils/release')
| -rwxr-xr-x | utils/release/merge.sh | 74 | ||||
| -rwxr-xr-x | utils/release/tag.sh | 95 | ||||
| -rwxr-xr-x | utils/release/test-release.sh | 292 |
3 files changed, 298 insertions, 163 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh new file mode 100755 index 0000000..2cf39b2 --- /dev/null +++ b/utils/release/merge.sh @@ -0,0 +1,74 @@ +#!/bin/sh +#===-- merge.sh - Test the LLVM release candidates -------------------------===# +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. +# +#===------------------------------------------------------------------------===# +# +# Merge a revision into a project. +# +#===------------------------------------------------------------------------===# + +set -e + +rev="" +proj="" + +function usage() { + echo "usage: `basename $0` [OPTIONS]" + echo " -proj PROJECT The project to merge the result into" + echo " -rev NUM The revision to merge into the project" +} + +while [ $# -gt 0 ]; do + case $1 in + -rev | --rev | -r ) + shift + rev=$1 + ;; + -proj | --proj | -project | --project | -p ) + shift + proj=$1 + ;; + -h | -help | --help ) + usage + ;; + * ) + echo "unknown option: $1" + echo "" + usage + exit 1 + ;; + esac + shift +done + +if [ "x$rev" = "x" -o "x$proj" = "x" ]; then + echo "error: need to specify project and revision" + echo + usage + exit 1 +fi + +if ! svn ls http://llvm.org/svn/llvm-project/$proj/trunk > /dev/null 2>&1 ; then + echo "error: invalid project: $proj" + exit 1 +fi + +tempfile=`mktemp /tmp/merge.XXXXXX` || exit 1 + +echo "Merging r$rev:" > $tempfile +svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 + +cd $proj.src +echo "# Updating tree" +svn up +echo "# Merging r$rev into $proj" +svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1 +echo "# Committing changes" +svn commit -F $tempfile || exit 1 +rm -f $tempfile +exit 0 diff --git a/utils/release/tag.sh b/utils/release/tag.sh new file mode 100755 index 0000000..d2d9911 --- /dev/null +++ b/utils/release/tag.sh @@ -0,0 +1,95 @@ +#!/bin/sh +#===-- tag.sh - Tag the LLVM release candidates ----------------------------===# +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. +# +#===------------------------------------------------------------------------===# +# +# Create branches and release candidates for the LLVM release. +# +#===------------------------------------------------------------------------===# + +set -e + +release="" +rc="" + +base_url="https://llvm.org/svn/llvm-project" + +function usage() { + echo "usage: `basename $0` -release <num>" + echo "usage: `basename $0` -release <num> -rc <num>" + echo " " + echo " -release <num> The version number of the release" + echo " -rc <num> The release candidate number" +} + +function tag_version() { + set -x + for proj in llvm cfe dragonegg test-suite compiler-rt libcxx libcxxabi ; do + if ! svn ls $base_url/$proj/branches/release_$release > /dev/null 2>&1 ; then + svn copy -m "Creating release_$release branch" \ + $base_url/$proj/trunk \ + $base_url/$proj/branches/release_$release + fi + done + set +x +} + +function tag_release_candidate() { + set -x + for proj in llvm cfe dragonegg test-suite compiler-rt libcxx libcxxabi ; do + if ! svn ls $base_url/$proj/tags/RELEASE_$release > /dev/null 2>&1 ; then + svn mkdir -m "Creating release directory for release_$release." $base_url/$proj/tags/RELEASE_$release + fi + if ! svn ls $base_url/$proj/tags/RELEASE_$release/rc$rc > /dev/null 2>&1 ; then + svn copy -m "Creating release candidate $rc from release_$release branch" \ + $base_url/$proj/branches/release_$release \ + $base_url/$proj/tags/RELEASE_$release/rc$rc + fi + done + set +x +} + +while [ $# -gt 0 ]; do + case $1 in + -release | --release ) + shift + release=$1 + ;; + -rc | --rc ) + shift + rc=$1 + ;; + -h | --help | -help ) + usage + exit 0 + ;; + * ) + echo "unknown option: $1" + usage + exit 1 + ;; + esac + shift +done + +if [ "x$release" = "x" ]; then + echo "error: need to specify a release version" + echo + usage + exit 1 +fi + +release=`echo $release | sed -e 's,\.,,g'` + +if [ "x$rc" = "x" ]; then + tag_version +else + tag_release_candidate +fi + +exit 1 diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 21d7fee..4255324 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #===-- test-release.sh - Test the LLVM release candidates ------------------===# # # The LLVM Compiler Infrastructure @@ -12,7 +12,16 @@ # #===------------------------------------------------------------------------===# -set -e # Exit if any command fails +if [ `uname -s` = "FreeBSD" ]; then + MAKE=gmake +else + MAKE=make +fi + +projects="llvm cfe dragonegg test-suite" + +# Base SVN URL for the sources. +Base_url="http://llvm.org/svn/llvm-project" Release="" Release_no_dot="" @@ -20,8 +29,10 @@ RC="" do_checkout="yes" do_ada="no" do_objc="yes" -do_fortran="yes" +do_fortran="no" do_64bit="yes" +do_debug="no" +do_asserts="no" BuildDir="`pwd`" function usage() { @@ -34,8 +45,10 @@ function usage() { echo " -no-checkout Don't checkout the sources from SVN." echo " -no-64bit Don't test the 64-bit version. [default: yes]" echo " -enable-ada Build Ada. [default: disable]" + echo " -enable-fortran Enable Fortran build. [default: disable]" echo " -disable-objc Disable ObjC build. [default: enable]" - echo " -disable-fortran Disable Fortran build. [default: enable]" + echo " -test-debug Test the debug build. [default: no]" + echo " -test-asserts Test with asserts on. [default: no]" } while [ $# -gt 0 ]; do @@ -69,13 +82,17 @@ while [ $# -gt 0 ]; do -enable-ada | --enable-ada ) do_ada="yes" ;; + -enable-fortran | --enable-fortran ) + do_fortran="yes" + ;; -disable-objc | --disable-objc ) do_objc="no" ;; - -disable-fortran | --disable-fortran ) - echo "WARNING: Do you *really* need to disable Fortran?" - sleep 5 - do_fortran="no" + -test-debug | --test-debug ) + do_debug="yes" + ;; + -test-asserts | --test-asserts ) + do_asserts="yes" ;; -help | --help | -h | --h | -\? ) usage @@ -92,11 +109,11 @@ done # Check required arguments. if [ -z "$Release" ]; then - echo "No release number specified!" + echo "error: no release number specified" exit 1 fi if [ -z "$RC" ]; then - echo "No release candidate number specified!" + echo "error: no release candidate number specified" exit 1 fi @@ -114,55 +131,53 @@ if [ -z "$NumJobs" ]; then NumJobs=3 fi -# Location of sources. -llvmCore_srcdir=$BuildDir/llvmCore-$Release-rc$RC.src -llvmgcc42_srcdir=$BuildDir/llvmgcc42-$Release-rc$RC.src +# Go to the build directory (may be different from CWD) +BuildDir=$BuildDir/rc$RC +mkdir -p $BuildDir +cd $BuildDir # Location of log files. -LogDirName="$Release-rc$RC.logs" -LogDir=$BuildDir/$LogDirName +LogDir=$BuildDir/logs mkdir -p $LogDir -# SVN URLs for the sources. -Base_url="http://llvm.org/svn/llvm-project" -llvmCore_RC_url="$Base_url/llvm/tags/RELEASE_$Release_no_dot/rc$RC" -llvmgcc42_RC_url="$Base_url/llvm-gcc-4.2/tags/RELEASE_$Release_no_dot/rc$RC" -clang_RC_url="$Base_url/cfe/tags/RELEASE_$Release_no_dot/rc$RC" -test_suite_RC_url="$Base_url/test-suite/tags/RELEASE_$Release_no_dot/rc$RC" +# Find a compilers. +c_compiler="$CC" +cxx_compiler="$CXX" # Make sure that the URLs are valid. function check_valid_urls() { - echo "# Validating SVN URLs" - if ! svn ls $llvmCore_RC_url > /dev/null 2>&1 ; then - echo "llvm $Release release candidate $RC doesn't exist!" - exit 1 - fi - if ! svn ls $llvmgcc42_RC_url > /dev/null 2>&1 ; then - echo "llvm-gcc-4.2 $Release release candidate $RC doesn't exist!" - exit 1 - fi - if ! svn ls $clang_RC_url > /dev/null 2>&1 ; then - echo "clang $Release release candidate $RC doesn't exist!" - exit 1 - fi - if ! svn ls $test_suite_RC_url > /dev/null 2>&1 ; then - echo "test-suite $Release release candidate $RC doesn't exist!" - exit 1 - fi + for proj in $projects ; do + echo "# Validating $proj SVN URL" + + if ! svn ls $Base_url/$proj/tags/RELEASE_$Release_no_dot/rc$RC > /dev/null 2>&1 ; then + echo "llvm $Release release candidate $RC doesn't exist!" + exit 1 + fi + done } # Export sources to the the build directory. function export_sources() { check_valid_urls - echo "# Exporting llvm $Release-RC$RC sources" - svn export -q $llvmCore_RC_url $llvmCore_srcdir - echo "# Exporting llvm-gcc-4.2 $Release-rc$RC sources" - svn export -q $llvmgcc42_RC_url $llvmgcc42_srcdir - echo "# Exporting clang $Release-rc$RC sources" - svn export -q $clang_RC_url $llvmCore_srcdir/tools/clang - echo "# Exporting llvm test suite $Release-rc$RC sources" - svn export -q $test_suite_RC_url $llvmCore_srcdir/projects/llvm-test + for proj in $projects ; do + echo "# Exporting $proj $Release-RC$RC sources" + if ! svn export -q $Base_url/$proj/tags/RELEASE_$Release_no_dot/rc$RC $proj.src ; then + echo "error: failed to export $proj project" + exit 1 + fi + done + + echo "# Creating symlinks" + cd $BuildDir/llvm.src/tools + if [ ! -h clang ]; then + ln -s $BuildDir/cfe.src clang + fi + cd $BuildDir/llvm.src/projects + if [ ! -h llvm-test ]; then + ln -s $BuildDir/test-suite.src llvm-test + fi + cd $BuildDir } function configure_llvmCore() { @@ -170,7 +185,6 @@ function configure_llvmCore() { Flavor="$2" ObjDir="$3" InstallDir="$4" - llvmgccDir="$5" case $Flavor in Release | Release-64 ) @@ -186,24 +200,26 @@ function configure_llvmCore() { Assertions="yes" ;; * ) - echo "# Invalid flavor $Flavor!" + echo "# Invalid flavor '$Flavor'" echo "" return ;; esac + echo "# Using C compiler: $c_compiler" + echo "# Using C++ compiler: $cxx_compiler" + cd $ObjDir echo "# Configuring llvm $Release-rc$RC $Flavor" - echo "# $llvmCore_srcdir/configure --prefix=$InstallDir \ + echo "# $BuildDir/llvm.src/configure --prefix=$InstallDir \ --enable-optimized=$Optimized \ - --enable-assertions=$Assertions \ - --with-llvmgccdir=$llvmgccDir" - $llvmCore_srcdir/configure --prefix=$InstallDir \ + --enable-assertions=$Assertions" + env CC=$c_compiler CXX=$cxx_compiler \ + $BuildDir/llvm.src/configure --prefix=$InstallDir \ --enable-optimized=$Optimized \ --enable-assertions=$Assertions \ - --with-llvmgccdir=$llvmgccDir \ - > $LogDir/llvm.configure.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - cd - + 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log + cd $BuildDir } function build_llvmCore() { @@ -212,25 +228,21 @@ function build_llvmCore() { ObjDir="$3" ExtraOpts="" - CompilerFlags="" - if [ "$Phase" = "2" ]; then - CompilerFlags="CC=$llvmgccDir/bin/llvm-gcc CXX=$llvmgccDir/bin/llvm-g++" - fi if [ "$Flavor" = "Release-64" ]; then ExtraOpts="EXTRA_OPTIONS=-m64" fi cd $ObjDir echo "# Compiling llvm $Release-rc$RC $Flavor" - echo "# make -j $NumJobs VERBOSE=1 $ExtraOpts" - make -j $NumJobs VERBOSE=1 $ExtraOpts $CompilerFlags \ - > $LogDir/llvm.make.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 + echo "# ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts" + ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts \ + 2>&1 | tee $LogDir/llvm.make-Phase$Phase-$Flavor.log echo "# Installing llvm $Release-rc$RC $Flavor" - echo "# make install" - make install \ - > $LogDir/llvm.install.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - cd - + echo "# ${MAKE} install" + ${MAKE} install \ + 2>&1 | tee $LogDir/llvm.install-Phase$Phase-$Flavor.log + cd $BuildDir } function test_llvmCore() { @@ -239,75 +251,27 @@ function test_llvmCore() { ObjDir="$3" cd $ObjDir - make check \ - > $LogDir/llvm.check.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - make -C tools/clang test \ - > $LogDir/clang.check.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - make unittests \ - > $LogDir/llvm.unittests.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - cd - + ${MAKE} -k check-all \ + 2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log + ${MAKE} -k unittests \ + 2>&1 | tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log + cd $BuildDir } -function configure_llvm_gcc() { - Phase="$1" - Flavor="$2" - ObjDir="$3" - InstallDir="$4" - llvmObjDir="$5" - - languages="c,c++" - if [ "$do_objc" = "yes" ]; then - languages="$languages,objc,obj-c++" - fi - if [ "$do_fortran" = "yes" ]; then - languages="$languages,fortran" - fi - if [ "$do_ada" = "yes" ]; then - languages="$languages,ada" - fi - - cd $ObjDir - echo "# Configuring llvm-gcc $Release-rc$RC $Flavor" - echo "# $llvmgcc42_srcdir/configure --prefix=$InstallDir \ - --program-prefix=llvm- --enable-llvm=$llvmObjDir \ - --enable-languages=$languages" - $llvmgcc42_srcdir/configure --prefix=$InstallDir \ - --program-prefix=llvm- --enable-llvm=$llvmObjDir \ - --enable-languages=$languages \ - > $LogDir/llvm-gcc.configure.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - cd - -} - -function build_llvm_gcc() { - Phase="$1" - Flavor="$2" - ObjDir="$3" - llvmgccDir="$4" - - CompilerFlags="" - if [ "$Phase" = "2" ]; then - CompilerFlags="CC=$llvmgccDir/bin/llvm-gcc CXX=$llvmgccDir/bin/llvm-g++" - fi - - cd $ObjDir - echo "# Compiling llvm-gcc $Release-rc$RC $Flavor" - echo "# make -j $NumJobs bootstrap LLVM_VERSION_INFO=$Release" - make -j $NumJobs bootstrap LLVM_VERSION_INFO=$Release $CompilerFlags \ - > $LogDir/llvm-gcc.make.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - - echo "# Installing llvm-gcc $Release-rc$RC $Flavor" - echo "# make install" - make install \ - > $LogDir/llvm-gcc.install.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1 - cd - -} +set -e # Exit if any command fails if [ "$do_checkout" = "yes" ]; then export_sources fi ( -Flavors="Debug Release Release+Asserts" +Flavors="Release" +if [ "$do_debug" = "yes" ]; then + Flavors="Debug $Flavors" +fi +if [ "$do_asserts" = "yes" ]; then + Flavors="$Flavors Release+Asserts" +fi if [ "$do_64bit" = "yes" ]; then Flavors="$Flavors Release-64" fi @@ -329,69 +293,71 @@ for Flavor in $Flavors ; do llvmCore_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-rc$RC.obj llvmCore_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-rc$RC.install + llvmCore_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-rc$RC.obj + llvmCore_phase3_installdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-rc$RC.install + rm -rf $llvmCore_phase1_objdir rm -rf $llvmCore_phase1_installdir rm -rf $llvmCore_phase2_objdir rm -rf $llvmCore_phase2_installdir + rm -rf $llvmCore_phase3_objdir + rm -rf $llvmCore_phase3_installdir mkdir -p $llvmCore_phase1_objdir mkdir -p $llvmCore_phase1_installdir mkdir -p $llvmCore_phase2_objdir mkdir -p $llvmCore_phase2_installdir - - llvmgcc42_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmgcc42-$Release-rc$RC.obj - llvmgcc42_phase1_installdir=$BuildDir/Phase1/$Flavor/llvmgcc42-$Release-rc$RC.install - - llvmgcc42_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmgcc42-$Release-rc$RC.obj - llvmgcc42_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmgcc42-$Release-rc$RC.install - - rm -rf $llvmgcc42_phase1_objdir - rm -rf $llvmgcc42_phase1_installdir - rm -rf $llvmgcc42_phase2_objdir - rm -rf $llvmgcc42_phase2_installdir - - mkdir -p $llvmgcc42_phase1_objdir - mkdir -p $llvmgcc42_phase1_installdir - mkdir -p $llvmgcc42_phase2_objdir - mkdir -p $llvmgcc42_phase2_installdir + mkdir -p $llvmCore_phase3_objdir + mkdir -p $llvmCore_phase3_installdir ############################################################################ # Phase 1: Build llvmCore and llvmgcc42 echo "# Phase 1: Building llvmCore" configure_llvmCore 1 $Flavor \ - $llvmCore_phase1_objdir $llvmCore_phase1_installdir \ - $llvmgcc42_phase1_installdir + $llvmCore_phase1_objdir $llvmCore_phase1_installdir build_llvmCore 1 $Flavor \ $llvmCore_phase1_objdir - echo "# Phase 1: Building llvmgcc42" - configure_llvm_gcc 1 $Flavor \ - $llvmgcc42_phase1_objdir $llvmgcc42_phase1_installdir \ - $llvmCore_phase1_objdir - build_llvm_gcc 1 $Flavor \ - $llvmgcc42_phase1_objdir $llvmgcc42_phase1_installdir - ############################################################################ - # Phase 2: Build llvmCore with newly built llvmgcc42 from phase 1. + # Phase 2: Build llvmCore with newly built clang from phase 1. + c_compiler=$llvmCore_phase1_installdir/bin/clang + cxx_compiler=$llvmCore_phase1_installdir/bin/clang++ echo "# Phase 2: Building llvmCore" configure_llvmCore 2 $Flavor \ - $llvmCore_phase2_objdir $llvmCore_phase2_installdir \ - $llvmgcc42_phase1_installdir + $llvmCore_phase2_objdir $llvmCore_phase2_installdir build_llvmCore 2 $Flavor \ $llvmCore_phase2_objdir - echo "# Phase 2: Building llvmgcc42" - configure_llvm_gcc 2 $Flavor \ - $llvmgcc42_phase2_objdir $llvmgcc42_phase2_installdir \ - $llvmCore_phase2_objdir - build_llvm_gcc 2 $Flavor \ - $llvmgcc42_phase2_objdir $llvmgcc42_phase1_installdir + ############################################################################ + # Phase 3: Build llvmCore with newly built clang from phase 2. + c_compiler=$llvmCore_phase2_installdir/bin/clang + cxx_compiler=$llvmCore_phase2_installdir/bin/clang++ + echo "# Phase 3: Building llvmCore" + configure_llvmCore 3 $Flavor \ + $llvmCore_phase3_objdir $llvmCore_phase3_installdir + build_llvmCore 3 $Flavor \ + $llvmCore_phase3_objdir - echo "# Testing - built with llvmgcc42" - test_llvmCore 2 $Flavor $llvmCore_phase2_objdir + ############################################################################ + # Testing: Test phase 3 + echo "# Testing - built with clang" + test_llvmCore 3 $Flavor $llvmCore_phase3_objdir + + ############################################################################ + # Compare .o files between Phase2 and Phase3 and report which ones differ. + echo + echo "# Comparing Phase 2 and Phase 3 files" + for o in `find $llvmCore_phase2_objdir -name '*.o'` ; do + p3=`echo $o | sed -e 's,Phase2,Phase3,'` + if ! cmp --ignore-initial=16 $o $p3 > /dev/null 2>&1 ; then + echo "file `basename $o` differs between phase 2 and phase 3" + fi + done done ) 2>&1 | tee $LogDir/testing.$Release-rc$RC.log +set +e + # Woo hoo! echo "### Testing Finished ###" echo "### Logs: $LogDir" |