Merge lp:~ignacio-nin/percona-server/5.6-buildscripts-update into lp:percona-server/5.6

Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: 361
Merged at revision: 362
Proposed branch: lp:~ignacio-nin/percona-server/5.6-buildscripts-update
Merge into: lp:percona-server/5.6
Diff against target: 154 lines (+32/-32)
4 files modified
build/build-binary.sh (+8/-8)
build/build-rpm.sh (+2/-2)
build/debian/control (+14/-14)
build/debian/rules (+8/-8)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-buildscripts-update
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+166586@code.launchpad.net

Description of the change

Cosmetic changes for bringing build scripts in 5.5 and 5.6 closer in content

To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/build-binary.sh'
2--- build/build-binary.sh 2013-05-13 04:25:56 +0000
3+++ build/build-binary.sh 2013-05-30 19:28:49 +0000
4@@ -40,20 +40,20 @@
5 TARGET="i686"
6 TARGET_CFLAGS="-m32 -march=i686"
7 ;;
8- -q | --quiet )
9- shift
10- QUIET=''
11- ;;
12 -d | --debug )
13 shift
14+ CMAKE_BUILD_TYPE='Debug'
15 BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
16- CMAKE_BUILD_TYPE='Debug'
17 ;;
18 -v | --valgrind )
19 shift
20 CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_VALGRIND=ON"
21 BUILD_COMMENT="${BUILD_COMMENT:-}-valgrind"
22 ;;
23+ -q | --quiet )
24+ shift
25+ QUIET=''
26+ ;;
27 -j | --with-jemalloc )
28 shift
29 WITH_JEMALLOC="$1"
30@@ -86,14 +86,14 @@
31 exit 1
32 fi
33
34- WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
35-
36 else
37 echo >&2 "Usage: $0 [target dir]"
38 exit 1
39
40 fi
41
42+WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
43+
44 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
45 test -e "$SOURCEDIR/Makefile" || exit 2
46
47@@ -109,7 +109,7 @@
48 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
49 PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}.$(uname -s).$TARGET"
50 COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
51-COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
52+COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
53
54 # Compilation flags
55 export CC=${CC:-gcc}
56
57=== modified file 'build/build-rpm.sh'
58--- build/build-rpm.sh 2013-05-10 13:29:38 +0000
59+++ build/build-rpm.sh 2013-05-30 19:28:49 +0000
60@@ -24,7 +24,7 @@
61 # Check if we have a functional getopt(1)
62 if ! getopt --test
63 then
64- go_out="$(getopt --options="iKqH" --longoptions=i686,nosign,quiet \
65+ go_out="$(getopt --options="iKq" --longoptions=i686,nosign,quiet \
66 --name="$(basename "$0")" -- "$@")"
67 test $? -eq 0 || exit 1
68 eval set -- $go_out
69@@ -143,7 +143,7 @@
70 cd "$WORKDIR"
71
72 # Issue RPM command
73- rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
74+ rpmbuild -ba --clean $TARGET $SIGN $QUIET \
75 "$SOURCEDIR/build/percona-server.spec" \
76 --define "_topdir $WORKDIR_ABS" \
77 --define "redhat_version $REDHAT_RELEASE" \
78
79=== modified file 'build/debian/control'
80--- build/debian/control 2013-05-10 13:29:38 +0000
81+++ build/debian/control 2013-05-30 19:28:49 +0000
82@@ -59,20 +59,6 @@
83 This package includes files needed by all versions of the client library
84 (e.g. /etc/mysql/my.cnf).
85
86-Package: percona-server-test-5.6
87-Architecture: any
88-Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version})
89-Provides: mysql-client
90-Description: Percona Server database test suite
91- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
92- database server. SQL (Structured Query Language) is the most popular database
93- query language in the world. The main goals of Percona Server are speed,
94- robustness and ease of use.
95- .
96- This package includes the Percona Server test framework that provides
97- a means for verifying that Percona Server and its client programs
98- operate according to expectations
99-
100 Package: percona-server-client-5.6
101 Architecture: any
102 Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libmysqlclient18, ${shlib:Depends}, ${misc:Depends}
103@@ -132,6 +118,19 @@
104 about which Percona Server version you want, as this is the one we consider
105 to be in the best shape.
106
107+Package: percona-server-test-5.6
108+Architecture: any
109+Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version})
110+Description: Percona Server database test suite
111+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
112+ database server. SQL (Structured Query Language) is the most popular database
113+ query language in the world. The main goals of Percona Server are speed,
114+ robustness and ease of use.
115+ .
116+ This package includes the Percona Server test framework that provides
117+ a means for verifying that Percona Server and its client programs
118+ operate according to expectations
119+
120 Package: percona-server-5.6-dbg
121 Architecture: any
122 Section: debug
123@@ -143,3 +142,4 @@
124 robustness and ease of use.
125 .
126 This package contains the debugging symbols for the Percona Server binaries.
127+
128
129=== modified file 'build/debian/rules'
130--- build/debian/rules 2013-05-29 20:13:58 +0000
131+++ build/debian/rules 2013-05-30 19:28:49 +0000
132@@ -39,14 +39,14 @@
133 mkdir release
134 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
135 -DINSTALL_LAYOUT=DEB \
136- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
137- -DWITH_EMBEDDED_SERVER=OFF \
138- -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
139- -DFEATURE_SET=$(feature_set) \
140- -DCOMPILATION_COMMENT=$(compilation_comment_release) \
141- -DMYSQL_SERVER_SUFFIX=$(server_suffix) \
142- -DWITH_PAM=ON
143-
144+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
145+ -DWITH_EMBEDDED_SERVER=OFF \
146+ -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
147+ -DFEATURE_SET=$(feature_set) \
148+ -DCOMPILATION_COMMENT=$(compilation_comment_release) \
149+ -DMYSQL_SERVER_SUFFIX=$(server_suffix) \
150+ -DWITH_PAM=ON
151+
152 override_dh_auto_build:
153 ifeq ($(SKIP_DEBUG_BINARY),)
154 cd debug && make $(MAKE_JFLAG)

Subscribers

People subscribed via source and target branches