Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.6-buildscripts-update
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
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.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches