Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-463

diff --git a/.bzrignore b/.bzrignore
index 652e9d91312315becbd2101f7a2769ed3b7f736d..a140236c0d35f7962a035afb1b19c3c830c5007e 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -32,6 +32,7 @@ Makefile.in
 TAGS
 aclocal.m4
 aminclude.am
+artifacts
 autom4te.cache
 autoscan.log
 build-aux/

diff --git a/Makefile.am b/Makefile.am
index a64dc9c36912b3eb3101704921ea00671216e3bc..895debbc01a83515345979683eec4401ec62dccd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -96,7 +96,6 @@ merge-clean:
        @find ./ | $(GREP) \.moved | xargs rm -r -f
        @find ./ | $(GREP) \\.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
-       @rm -f *\.rpm
        @find ./ | $(GREP) \.THIS | xargs rm -f
        @find ./ | $(GREP) \.OTHER | xargs rm -f
        @find ./ | $(GREP) \.BASE | xargs rm -f
@@ -126,7 +125,6 @@ DISTCLEANFILES+= config/top.h
 
 maintainer-clean-local:
        find . -type f -name '*~' -exec rm -f '{}' \;
-       -rm -f @PACKAGE@-*.tar.gz
        -rm -f man/*.1
        -rm -f man/*.3
        -rm -f man/*.8
@@ -154,3 +152,4 @@ maintainer-clean-local:
        -rm -f m4/test-driver
        -rmdir build-aux
        -rm -rf ${top_builddir}/html
+       -rm -f $(DIST_ARCHIVES)

diff --git a/bootstrap.sh b/bootstrap.sh
index 5a7cb779f7885a8b690732be9e4fc646d34f9d3c..6f6821b765ff3fe10ab1650f868c6fb413e1f232 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1014,7 +1014,10 @@ make_rpm ()
       mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon}
 
       run_configure_if_required
-      make_target 'rpm'
+      make_target 'dist-rpm'
+
+      mkdir artifacts
+      cp *gz *rpm artifacts
 
       if $jenkins_build_environment; then
         make_target 'clean'

diff --git a/configure.ac b/configure.ac
index 4d241ea7bb9f013559639f908fa2784ef4681912..17b7351e3eabd1ece46ffaf636a456a60b2f1a78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@
 # the COPYING file in this directory for full text.
 
 m4_include([version.m4])
+
 AC_PREREQ([2.61])
 AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
 
@@ -49,6 +50,7 @@ AC_SUBST([MEMCACHED_LIBRARY_VERSION])
 
 AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
 AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+AC_SUBST([RPM_RELEASE],[1])
 
 m4_include([libhashkit/include.m4])
 
@@ -122,6 +124,9 @@ AC_CHECK_PROGS([PERL],[perl])
 AC_CHECK_PROGS([VALGRIND],['valgrind'])
 AC_CHECK_PROGS([WINE],['wine'])
 AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
+AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
+AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
+AC_CHECK_PROGS([RPM],[rpm])
 AC_PROG_AWK
 AC_PROG_MKDIR_P
 AC_PROG_SED

diff --git a/rpm/include.am b/rpm/include.am
deleted file mode 100644 (file)
index 2d60a1c..0000000
--- a/rpm/include.am
+++ /dev/null
@@ -1,42 +0,0 @@
-# vim:ft=automake
-
-$(PACKAGE)-$(VERSION).tar.gz: Makefile
-       $(MAKE) $(AM_MAKEFLAGS) dist-gzip
-
-$(PACKAGE)-$(VERSION)-1.x86_64.rpm: support/$(PACKAGE).spec $(DIST_ARCHIVES)
-       @rm -f *.rpm
-       @rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm
-       @rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm
-       @mkdir -p ~/rpmbuild/BUILD/
-       @mkdir -p ~/rpmbuild/RPMS/i386/
-       @mkdir -p ~/rpmbuild/RPMS/i686/
-       @mkdir -p ~/rpmbuild/RPMS/noarch/
-       @mkdir -p ~/rpmbuild/RPMS/x86_64/
-       @mkdir -p ~/rpmbuild/SOURCES/
-       @mkdir -p ~/rpmbuild/SPECS/
-       @mkdir -p ~/rpmbuild/SRPMS/
-       @cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-       @rpmbuild -ba support/$(PACKAGE).spec
-       @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm .
-       -cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
-
-.PHONY: rpm-sign
-rpm-sign: rpm-build
-       @rpm --addsign *.rpm
-       @rpm --checksig *.rpm
-
-.PHONY: clean-rpm
-clean-rpm:
-       @rm -f libmemcached*.rpm
-
-.PHONY: rpm
-rpm: $(PACKAGE)-$(VERSION)-1.x86_64.rpm
-
-.PHONY: release
-release: rpm rpm-sign
-
-.PHONY: auto-rpmbuild
-auto-rpmbuild:
-       @auto-br-rpmbuild -ba support/libmemcached.spec

diff --git a/rpm/include.mk b/rpm/include.mk
new file mode 100644 (file)
index 0000000..27b6bd0
--- /dev/null
+++ b/rpm/include.mk
@@ -0,0 +1,52 @@
+# vim:ft=automake
+
+RPM_BUILDDIR= ~/rpmbuild
+
+RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+RPM_SOURCE= $(RPM_BUILDDIR)/SOURCES/$(DIST_ARCHIVES)
+
+RPMS=
+RPMS+= $(RPM_BUILD_TARGET)
+RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
+
+SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm
+
+RPM_DIST= $(RPMS) $(SRPMS)
+
+BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator)))
+BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator)))
+BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@
+
+$(RPM_BUILDDIR):
+       @@RPMDEV_SETUPTREE@
+
+$(DIST_ARCHIVES): $(DISTFILES)
+       $(MAKE) $(AM_MAKEFLAGS) dist-gzip
+
+$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
+       @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
+       @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
+
+$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
+       @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
+       @cp $(BUILD_RPMS) $(BUILD_SRPMS) .
+
+.PHONY: rpm-sign
+rpm-sign: $(RPM_BUILD_TARGET)
+       @@RPM@ --addsign $(RPM_DIST)
+       @@RPM@ --checksig $(RPM_DIST)
+
+.PHONY: clean-rpm
+clean-rpm:
+       -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
+
+rpm: $(RPM_BUILD_TARGET)
+dist-rpm: $(RPM_BUILD_TARGET)
+
+.PHONY: release
+release: rpm rpm-sign
+
+.PHONY: auto-rpmbuild
+auto-rpmbuild: support/@PACKAGE@.spec
+       @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 6f0ebd8d5d9d6d90d852d7d36f045ebf4745b43b..a89e58d89d3ce3f58d03841f115e2d3cc2c83200 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -1,7 +1,7 @@
 Name:      libmemcached
 Summary:   memcached C library and command line tools
 Version:   @VERSION@
-Release:   1
+Release:   @RPM_RELEASE@
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://launchpad.net/libmemcached