Merge lp:~akopytov/percona-xtrabackup/links-to-percona-site-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/494/

[Alexey Kopytov (akopytov)]

review: Approve

=== renamed file 'innobackupex' => 'innobackupex.pl' (properties changed: +x to -x)
--- innobackupex	2013-11-12 09:12:14 +0000
+++ innobackupex.pl	2013-11-15 12:17:46 +0000
@@ -1641,7 +1641,15 @@
 # print_version subroutine prints program version and copyright.
 #
 sub print_version {
+    my $distribution = "@XB_DISTRIBUTION@";
+
     printf(STDERR $copyright_notice);
+
+    if ($distribution) {
+        printf STDERR "Get the latest version of Percona XtraBackup, ".
+            "documentation, and help resources:\n";
+        printf STDERR "http://www.percona.com/xb/$distribution\n";
+    }
 }
 
 

=== added file 'test/t/distribution_message.sh'
--- test/t/distribution_message.sh	1970-01-01 00:00:00 +0000
+++ test/t/distribution_message.sh	2013-11-15 12:17:46 +0000
@@ -0,0 +1,15 @@
+########################################################################
+# Tests for distribution specific messages in innobackupex
+########################################################################
+
+[ -z ${XB_DISTRIBUTION:-} ] && skip_test "Requires XB_DISTRIBUTION to be set"
+
+# Remove the argument when bug #1223716 is fixed
+innobackupex --version $topdir/backup
+
+link="http://www.percona.com/xb/$XB_DISTRIBUTION"
+
+if ! grep -q $link $OUTFILE
+then
+    die "Could not find '$link' in the innobackupex version message!"
+fi

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-07-20 14:24:26 +0000
+++ utils/build.sh	2013-11-15 12:17:46 +0000
@@ -68,6 +68,24 @@
 fi
 
 xtrabackup_include_dir="$top_dir/src"
+
+# Auto-detect distribution string if not overridden with the XB_DISTRIBUTION
+# environment variable
+XB_DISTRIBUTION=${XB_DISTRIBUTION:-}
+if [ -z "$XB_DISTRIBUTION" ]
+then
+    if which lsb_release >/dev/null 2>&1;
+    then
+        XB_DISTRIBUTION=`lsb_release -i | \
+sed -e 's/Distributor ID:[[:space:]]//' | \
+tr '[:upper:]' '[:lower:]'`
+        case $XB_DISTRIBUTION in
+            centos|redhat)
+                XB_DISTRIBUTION="epel";;
+        esac
+    fi
+fi
+
 CFLAGS="$CFLAGS -I$xtrabackup_include_dir"
 CXXFLAGS="$CXXFLAGS -I$xtrabackup_include_dir"
 
@@ -97,6 +115,26 @@
 }
 
 ################################################################################
+# Process a file specified as the first argument, replace some certain variables
+# with their actual values and store the result in the file specified as the
+# second argument. The optional third argument may be used to set a specific
+# access mode on the resulting files (e.g. '+x")
+########################################################################
+function configure_file()
+{
+    local src=$1
+    local dst=$2
+
+    echo "Configuring $src to $dst"
+    sed 's|@XB_DISTRIBUTION@|'$XB_DISTRIBUTION'|g' $src > $dst
+
+    if [ $# -gt 2 ]
+    then
+        chmod $3 $dst
+    fi
+}
+
+################################################################################
 # Download files specified as arguments from $MASTER_SITE if $AUTO_DOWNLOAD is
 # "yes". Otherwise print an error message and exit.
 ################################################################################
@@ -220,6 +258,8 @@
 
     innodb_dir=$server_dir/storage/$innodb_name
 
+    configure_file innobackupex.pl innobackupex +x
+
     echo "Downloading sources"
     auto_download $server_tarball