Merge lp:~linuxjedi/mydumper/mydumper-cmake into lp:~mydumper/mydumper/trunk

[Andrew Hutchings]

Build using CMAKE, checks required dependencies first
Moved version number to CMakeLists.txt which gets added to mydumper.c via config.h

[Lenz Grimmer (lenzgr)]

Hi,

On 03/21/2010 11:45 AM, LinuxJedi wrote:

> LinuxJedi has proposed merging lp:~thelinuxjedi/mydumper/mydumper-cmake into lp:mydumper.
>
> Requested reviews:
> MySQL Data Dumper Team (mydumper)
>
>
> Build using CMAKE, checks required dependencies first
> Moved version number to CMakeLists.txt which gets added to mydumper.c via config.h

Good idea, my Makefile improvements were a bit hacky anyway :)

Bye,
 LenZ
--
  Lenz Grimmer <email address hidden> - http://www.lenzg.net/

[Andrew Hutchings (linuxjedi)]

Hey Lenz,

> Good idea, my Makefile improvements were a bit hacky anyway :)

Thanks :)

Your Makefile improvements were really necessary and gave me the idea to do this :) I thought it would be a good idea so that we can keep things simple as the code gets more features and users should have an easier time building.

[Lenz Grimmer (lenzgr)]

Hi,

On 03/22/2010 04:33 PM, LinuxJedi wrote:

> Your Makefile improvements were really necessary and gave me the idea to do
> this :) I thought it would be a good idea so that we can keep things
> simple as the code gets more features and users should have an easier time
> building.

Good idea.

I tested your changes and noticed some warnings when running "cmake ." on my
openSUSE system (cmake version 2.6-patch 4):

lenz@thebe:~/my/bzr/mydumper-shared/mydumper-cmake> cmake .
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found MySQL: /usr/include/mysql, /usr/lib/libmysqlclient_r.so
-- WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig
-- WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig
-- Found GLIB2: /usr/lib/libglib-2.0.so
-- checking for modules 'QUIET;libpcre'
-- package 'QUIET' not found
-- Found PCRE: /usr/include
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/lenz/my/bzr/mydumper-shared/mydumper-cmake

(Not sure if they are urgent to fix, though)

Bye,
 LenZ
--
  Lenz Grimmer <email address hidden> - http://www.lenzg.net/

[Lenz Grimmer (lenzgr)]

Hi,

On 03/22/2010 04:57 PM, LenZ wrote:

> On 03/22/2010 04:33 PM, LinuxJedi wrote:
>
>> Your Makefile improvements were really necessary and gave me the idea to do
>> this :) I thought it would be a good idea so that we can keep things
>> simple as the code gets more features and users should have an easier time
>> building.
>
> I tested your changes and noticed some warnings when running "cmake ." on my
> openSUSE system (cmake version 2.6-patch 4):

Also, "make install" currently uses a strange default path
(/usr/local/mydumper-0.1.7/bin) - I suggest that should be changed to
/usr/local/bin instead.

Also, where's my "make dist" target? :)

To my knowledge, CMake provides a built-in packaging mechanism:

http://www.itk.org/Wiki/CMake:Packaging_With_CPack

Bye,
 LenZ
--
  Lenz Grimmer <email address hidden> - http://www.lenzg.net/

[Andrew Hutchings (linuxjedi)]

I was aware of the deprecation warning, but not of CPack (which looks really cool). I'll sort that out tonight and re-propose the merge.

[Andrew Hutchings (linuxjedi)]

Need to fix due to Lenz's commens

review: Needs Fixing

[Lenz Grimmer (lenzgr)]

Hi,

On 03/22/2010 05:19 PM, LinuxJedi wrote:

> I was aware of the deprecation warning, but not of CPack (which looks
> really cool).

Yes, it looks like it will come in handy for building binary distributions.

> I'll sort that out tonight and re-propose the merge.

I've committed a fix for the "make dist" stuff (not using CPack, as it's quite
clumsy to use):

  bzr+ssh://bazaar.launchpad.net/~lenzgr/mydumper/build-fixes/

Bye,
 LenZ
--
  Lenz Grimmer <email address hidden> - http://www.lenzg.net/

[Andrew Hutchings (linuxjedi)]

Resubmitted branch:

1. Merged in LenZ's fixes
2. Fixed deprecation warnings in the GLIB2 search
3. Fixed bug in PCRE search

Note: we can set required versions of these libraries really easily in this now. Not sure if we have a required minimum version of libs yet.

[Leith (mleith)]

This doesn't seem to work for me on OSX:

Cerberus:mydumper-cmake mark$ cmake .
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found MySQL: /usr/local/mysql/include/mysql, /usr/local/mysql/lib/mysql/libmysqlclient_r.dylib
-- checking for one of the modules 'glib-2.0'
-- found glib-2.0, version 2.20.2
-- checking for one of the modules 'gthread-2.0'
-- found gthread-2.0, version 2.20.2
-- checking for module 'libpcre'
-- found libpcre, version 7.9
-- Found PCRE: /opt/local/include
-- Configuring done
-- Generating done
-- Build files have been written to: /Users/mark/Dev/mydumper/mydumper-cmake
Cerberus:mydumper-cmake mark$ make
Scanning dependencies of target mydumper
[100%] Building C object CMakeFiles/mydumper.dir/mydumper.c.o
Linking C executable mydumper
ld: library not found for -lglib-2.0
collect2: ld returned 1 exit status
make[2]: *** [mydumper] Error 1
make[1]: *** [CMakeFiles/mydumper.dir/all] Error 2
make: *** [all] Error 2

review: Needs Fixing

[Leith (mleith)]

Also, I believe we were using 0.1.8 as the version from the last push, not sure why we go back to 0.1.7 here.

[lp:~linuxjedi/mydumper/mydumper-cmake]

60. By Andrew Hutchings <linuxjedi@linuxjedi-laptop> on 2010-03-23

Fixes to GLIB2 library search

61. By Andrew Hutchings <linuxjedi@linuxjedi-laptop> on 2010-03-23

Add ZLIB requirement / linking

62. By Andrew Hutchings <linuxjedi@linuxjedi-laptop> on 2010-03-24

Fix version number

[Leith (mleith)]

All looks good now - approved! Merging now.

review: Approve

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2010-03-24 09:46:28 +0000
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.6)
+project(mydumper)
+set(VERSION 0.1.8)
+set(ARCHIVE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
+
+#Required packages
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+find_package(MySQL)
+find_package(ZLIB)
+find_package(GLIB2)
+find_package(PCRE)
+
+set(CMAKE_C_FLAGS "-Wall -Werror -O3 -g")
+
+include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+
+SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Install path" FORCE)
+MARK_AS_ADVANCED(CMAKE)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+add_executable(mydumper mydumper.c)
+target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES})
+INSTALL(TARGETS mydumper
+  RUNTIME DESTINATION bin
+)
+
+add_custom_target(dist
+  COMMAND bzr export --root=${ARCHIVE_NAME}
+    ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

=== removed file 'Makefile'
--- Makefile	2010-03-18 17:07:25 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Build flags
-CFLAGS=-Wall -Werror `mysql_config --cflags` `pkg-config --cflags glib-2.0 gthread-2.0` `pcre-config --cflags`
-LDFLAGS=`mysql_config --libs_r` `pkg-config --libs glib-2.0 gthread-2.0` `pcre-config --libs`
-OPTFLAGS=-O3 -g
-
-# Various defines
-NAME=mydumper
-VERSION = $(shell grep 'define VERSION' mydumper.c | cut -d'"' -f2)
-CLEANFILES= $(NAME) dump *~ *BAK *.dSYM *.o
-DISTFILES = Makefile $(NAME).c README
-bindir = $(prefix)/bin
-distdir = $(NAME)-$(VERSION)
-prefix = /usr/local
-
-# Required programs
-CP = /bin/cp
-GZIP = /bin/gzip
-INSTALL = /usr/bin/install
-INSTALL_PROGRAM = $(INSTALL) -m 755
-RM = /bin/rm
-TAR = /bin/tar
-
-all: $(NAME)
-
-mydumper: mydumper.o
-	$(CC) $(CFLAGS) $(OPTFLAGS) -o $(NAME) $(NAME).o $(LDFLAGS)
-
-install: all
-	test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) $(NAME) $(DESTDIR)$(bindir)
-
-distdir:
-	if test -d $(distdir) ; then $(RM) -rf $(distdir) ; fi
-	mkdir $(distdir)
-	$(CP) -a $(DISTFILES) $(distdir)
-
-dist: distdir
-	$(TAR) chof - $(distdir) | $(GZIP) -c > $(distdir).tar.gz
-	$(RM) -rf $(distdir)
-
-uninstall:
-	$(RM) -f $(DESTDIR)$(bindir)/$(NAME)
-
-clean:
-	$(RM) -f $(CLEANFILES)
-
-maintainer-clean: clean
-	$(RM) -f $(distdir).tar.gz

=== modified file 'README'
--- README	2010-03-18 16:32:53 +0000
+++ README	2010-03-24 09:46:28 +0000
@@ -10,6 +10,7 @@
 == How to build it? ==
 
 Run:
+ cmake .
  make
 
 One needs to install development versions of required libaries (MySQL, GLib, ZLib, PCRE):

=== added directory 'cmake'
=== added directory 'cmake/modules'
=== added file 'cmake/modules/FindGLIB2.cmake'
--- cmake/modules/FindGLIB2.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindGLIB2.cmake	2010-03-24 09:46:28 +0000
@@ -0,0 +1,22 @@
+# - Try to find the GLIB2 libraries
+
+if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES AND GTHREAD2_LIBRARIES)
+    # Already in cache, be silent
+    set(GLIB2_FIND_QUIETLY TRUE)
+endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES AND GTHREAD2_LIBRARIES)
+
+if (NOT WIN32)
+   include(FindPkgConfig)
+   pkg_search_module(PC_GLIB2 REQUIRED glib-2.0)
+   pkg_search_module(PC_GTHREAD2 REQUIRED gthread-2.0)
+endif(NOT WIN32)
+
+set(GLIB2_INCLUDE_DIR ${PC_GLIB2_INCLUDE_DIRS})
+
+find_library(GLIB2_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB2_LIBDIR} ${PC_GLIB2_LIBRARY_DIRS})
+
+find_library(GTHREAD2_LIBRARIES NAMES gthread-2.0 HINTS ${PC_GTHREAD2_LIBDIR} ${PC_GTHREAD2_LIBRARY_DIRS})
+
+
+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES GTHREAD2_LIBRARIES)
+

=== added file 'cmake/modules/FindMySQL.cmake'
--- cmake/modules/FindMySQL.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindMySQL.cmake	2010-03-24 09:46:28 +0000
@@ -0,0 +1,81 @@
+# - Try to find MySQL / MySQL Embedded library
+# Find the MySQL includes and client library
+# This module defines
+#  MYSQL_INCLUDE_DIR, where to find mysql.h
+#  MYSQL_LIBRARIES, the libraries needed to use MySQL.
+#  MYSQL_LIB_DIR, path to the MYSQL_LIBRARIES
+#  MYSQL_EMBEDDED_LIBRARIES, the libraries needed to use MySQL Embedded.
+#  MYSQL_EMBEDDED_LIB_DIR, path to the MYSQL_EMBEDDED_LIBRARIES
+#  MYSQL_FOUND, If false, do not try to use MySQL.
+#  MYSQL_EMBEDDED_FOUND, If false, do not try to use MySQL Embedded.
+
+# Copyright (c) 2006-2008, Jarosław Staniek <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(CheckCXXSourceCompiles)
+
+if(WIN32)
+   find_path(MYSQL_INCLUDE_DIR mysql.h
+      PATHS
+      $ENV{MYSQL_INCLUDE_DIR}
+      $ENV{MYSQL_DIR}/include
+      $ENV{ProgramFiles}/MySQL/*/include
+      $ENV{SystemDrive}/MySQL/*/include
+   )
+else(WIN32)
+   find_path(MYSQL_INCLUDE_DIR mysql.h
+      PATHS
+      $ENV{MYSQL_INCLUDE_DIR}
+      $ENV{MYSQL_DIR}/include
+      /usr/local/mysql/include
+      /opt/mysql/mysql/include
+      PATH_SUFFIXES
+      mysql
+   )
+endif(WIN32)
+
+if(WIN32)
+   set(MYSQL_LIB_PATHS
+      $ENV{MYSQL_DIR}/lib/opt
+      $ENV{MYSQL_DIR}/client/release
+      $ENV{ProgramFiles}/MySQL/*/lib/opt
+      $ENV{SystemDrive}/MySQL/*/lib/opt
+   )
+   find_library(MYSQL_LIBRARIES NAMES mysqlclient_r
+      PATHS
+      ${MYSQL_LIB_PATHS}
+   )
+else(WIN32)
+   set(MYSQL_LIB_PATHS
+      $ENV{MYSQL_DIR}/libmysql_r/.libs
+      $ENV{MYSQL_DIR}/lib
+      $ENV{MYSQL_DIR}/lib/mysql
+      /usr/local/mysql/lib
+      /opt/mysql/mysql/lib
+      PATH_SUFFIXES
+      mysql
+   )
+   find_library(MYSQL_LIBRARIES NAMES mysqlclient_r
+      PATHS
+      ${MYSQL_LIB_PATHS}
+   )
+endif(WIN32)
+
+if(MYSQL_LIBRARIES)
+   get_filename_component(MYSQL_LIB_DIR ${MYSQL_LIBRARIES} PATH)
+endif(MYSQL_LIBRARIES)
+
+set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} )
+
+if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+   set(MYSQL_FOUND TRUE)
+   message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
+else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+   set(MYSQL_FOUND FALSE)
+   message(STATUS "MySQL not found.")
+endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+
+mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
+

=== added file 'cmake/modules/FindPCRE.cmake'
--- cmake/modules/FindPCRE.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindPCRE.cmake	2010-03-24 09:46:28 +0000
@@ -0,0 +1,45 @@
+# - Try to find the PCRE regular expression library
+# Once done this will define
+#
+#  PCRE_FOUND - system has the PCRE library
+#  PCRE_INCLUDE_DIR - the PCRE include directory
+#  PCRE_LIBRARIES - The libraries needed to use PCRE
+
+# Copyright (c) 2006, Alexander Neundorf, <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+  # Already in cache, be silent
+  set(PCRE_FIND_QUIETLY TRUE)
+endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+
+
+if (NOT WIN32)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  find_package(PkgConfig)
+
+  pkg_check_modules(PC_PCRE REQUIRED libpcre)
+
+  set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
+
+endif (NOT WIN32)
+
+find_path(PCRE_INCLUDE_DIR pcre.h 
+          HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS} 
+          PATH_SUFFIXES pcre)
+
+find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+
+set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
+
+mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
+

=== added file 'config.h.in'
--- config.h.in	1970-01-01 00:00:00 +0000
+++ config.h.in	2010-03-24 09:46:28 +0000
@@ -0,0 +1,6 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#cmakedefine VERSION "@VERSION@"
+
+#endif

=== modified file 'mydumper.c'
--- mydumper.c	2010-03-19 12:57:57 +0000
+++ mydumper.c	2010-03-24 09:46:28 +0000
@@ -16,8 +16,6 @@
 			Mark Leith, Sun Microsystems (leith at sun dot com)
 */
 
-#define VERSION "0.1.8"
-
 #define _LARGEFILE64_SOURCE
 #define _FILE_OFFSET_BITS 64
 
@@ -32,6 +30,7 @@
 #include <zlib.h>
 #include <pcre.h>
 #include <glib/gstdio.h>
+#include "config.h"
 
 struct configuration {
 	char use_any_index;