Merge lp:~tsarev/percona-server/5.5_fix_bug_800566 into lp:percona-server/5.5

[Oleg Tsarev]

fix bug #800566
sync build & helper scripts between PS 5.1 and PS 5.5

[Oleg Tsarev (tsarev)]

  * [BUILD] http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/18/

=== modified file 'Makefile'
--- Makefile	2011-06-20 08:13:54 +0000
+++ Makefile	2011-06-22 12:01:46 +0000
@@ -2,7 +2,9 @@
 MASTER_SITE=http://www.percona.com/downloads/community
 MYSQL_VERSION=5.5.13
 PERCONA_SERVER_VERSION=rel20.4
-PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
+PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
+PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
+PERCONA_SERVER_SHORT_2 ?=Percona-Server
 DEBUG_DIR ?= $(PERCONA_SERVER)-debug
 RELEASE_DIR ?= $(PERCONA_SERVER)-release
 SERIES ?=series
@@ -70,8 +72,12 @@
 	@echo "Prepare Percona Server sources"
 	rm -rf mysql-$(MYSQL_VERSION)
 	rm -rf $(PERCONA_SERVER);
+	rm -rf $(PERCONA_SERVER_SHORT_1);
+	rm -rf $(PERCONA_SERVER_SHORT_2);
 	tar zxf mysql-$(MYSQL_VERSION).tar.gz
 	mv mysql-$(MYSQL_VERSION) $(PERCONA_SERVER)
+	ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
+	ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
 	(cat `cat $(SERIES)`) | patch -p1 -d $(PERCONA_SERVER)
 	rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h
 

=== modified file 'normalize_patches.sh'
--- normalize_patches.sh	2011-06-21 17:08:45 +0000
+++ normalize_patches.sh	2011-06-22 12:01:46 +0000
@@ -1,30 +1,29 @@
 #!/usr/bin/env bash
-#ls -1 *.patch | grep -v repair | xargs bzr revert
+
 MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
     | cut -d = -f 2)"
-test -z ${MYSQL_DIR} && MYSQL_DIR=mysql-${MYSQL_VERSION}
-test -z ${MYSQL_TAR_GZ} && MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz
-test -z ${SERIES} && SERIES=series
-echo MYSQL_VERSION=$MYSQL_VERSION
-echo MYSQL_DIR=$MYSQL_DIR
-echo MYSQL_TAR_GZ=$MYSQL_TAR_GZ
-echo SERIES=$SERIES
+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "Makefile" \
+    | cut -d = -f 2)"
+PERCONA_SERVER="Percona-Server-${MYSQL_VERSION}-${PERCONA_SERVER_VERSION}"
+MYSQL_DIR=mysql-${MYSQL_VERSION}
+MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz
+
 echo "===== Prepare source code for patch's adaptation...";
 echo "===== Remove 'a' copy...";
 rm -rf a;
 echo "===== Remove 'b' copy..."
 rm -rf b;
-echo "===== Remove 'Percona-Server' copy..."
-rm -rf Percona-Server;
-echo "===== Unpack ${MYSQL_DIR} to Percona-Server..."
+echo "===== Remove '${PERCONA_SERVER}' copy..."
+rm -rf ${PERCONA_SERVER};
+echo "===== Unpack ${MYSQL_DIR} to ${PERCONA_SERVER}..."
 tar zxf ${MYSQL_TAR_GZ};
-mv ${MYSQL_DIR} Percona-Server;
+mv ${MYSQL_DIR} ${PERCONA_SERVER};
 echo "===== Prepare 'a' copy..."
-cp -R Percona-Server a;
+cp -R ${PERCONA_SERVER} a;
 echo "===== Prepare 'b' copy..."
-cp -R Percona-Server b;
+cp -R ${PERCONA_SERVER} b;
 echo "===== Ok, let's go patch adaptation..."
-for patch_name in `cat ${SERIES}`; do
+for patch_name in `cat series`; do
     echo "========================================================="
     echo "===== Check patch $patch_name";
     echo "===== Apply patch $patch_name...";
@@ -38,16 +37,15 @@
 	exit 1;
     fi;
     if [ $hunk -ne 0 ]; then
-	find b -name "*.orig" | xargs rm;
 	./regenerate_patch.sh a b $patch_name
     fi;
-    patch -p1 -d Percona-Server < $patch_name > /dev/null;
+    patch -p1 -d ${PERCONA_SERVER} < $patch_name > /dev/null;
     patch -p1 -d a < $patch_name > /dev/null;
     echo "===== Patch $patch_name regenerated succesfully"
     if [ $hunk -ne 0 ]; then
 	echo "===== Remove temporary 'b' version"
 	rm -rf b;
 	echo "===== Prepare 'b' copy..."
-	cp -R Percona-Server b;
+	cp -R ${PERCONA_SERVER} b;
     fi;
 done;