Apply slapos.recipe.cmmi for mydumper.

component/mariadb/buildout.cfg

@@ -52,9 +52,10 @@ environment =
   LDFLAGS=-L${libaio:location}/lib
 
 [x86-cygwin-mariadb]
+prefix = ${buildout:prefix}/mariadb
 configure-command = /bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  -DCMAKE_INSTALL_PREFIX=${:preifx}
   -DBUILD_CONFIG=mysql_release
   -DDEFAULT_CHARSET=utf8
   -DDEFAULT_COLLATION=utf8_unicode_ci

component/mydumper/buildout.cfg

@@ -10,70 +10,16 @@ extends =
 
 parts = mydumper
 
-# XXX-Antoine:
-# This is really dirty, but it's the only way to install
-# mydumper that works
 [mydumper]
-recipe = slapos.recipe.build
-depends =
-  ${mariadb:version}
+recipe = slapos.recipe.cmmi
 url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
 md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
-buildout-bin-dir = ${buildout:bin-directory}
-cmake-command = ${cmake:location}/bin/cmake
-mysql-config = ${mariadb:location}/bin/mysql_config
-mysqllib = ${mariadb:location}/lib
-path = ${pkgconfig:location}/bin
-pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
-mysql-include-dir = ${mariadb:location}/include
-mydumper-patches =
-   ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
-slapos_promise =
-    directory:bin
-    file:bin/mydumper
-    file:bin/myloader
-script =
-    import os
-    url = self.download(self.options['url'], self.options.get('md5sum'))
-    extract_dir = self.extract(url)
-    workdir = guessworkdir(extract_dir)
-    self.applyPatchList(self.options['mydumper-patches'], cwd=workdir)
-    env['PATH'] = self.options['path'] + ':' + self.options['buildout-bin-dir'] + ':' + env.get('PATH', '')
-    env['PKG_CONFIG_PATH'] = self.options['pkg-config-path'] + ':' + \
-                             env.get('PKG_CONFIG_PATH', '')
-    env['CMAKE_INCLUDE_PATH'] = self.options['includes']
-    env['CMAKE_LIBRARY_PATH'] = self.options['libraries']
-    env['CFLAGS'] = self.options['cflags']
-    command_line = [self.options['cmake-command'],
-                    '-DCMAKE_INSTALL_PREFIX=%%s' %% self.options['location'],
-                    '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
-                    '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
-                    '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
-                    '-DMYSQL_INCLUDE_DIR=%%s' %% self.options['mysql-include-dir'],
-                    '-DBUILD_DOCS=OFF',
-                    '.']
-    call(command_line, cwd=workdir, env=env)
-    call(['make'], cwd=workdir, env=env)
-    call(['make', 'install'], cwd=workdir, env=env)
+configure-command = /bin/cmake
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=/usr/local
+  -DMYSQL_CONFIG=${mariadb:location}/bin/mysql_config
+  -DBUILD_DOCS=OFF
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch
 
-# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
-# and it wasn't working !
-#[mydumper]
-#recipe = hexagonit.recipe.cmmi
-#url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
-#md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
-#strip-top-level-dir = true
-#location = ${buildout:parts-directory}/${:_buildout_section_name_}
-#configure-command =
-#    ${cmake:location}/bin/cmake \
-#    -DCMAKE_INSTALL_PREFIX=${:location} \
-#    -DMYSQL_CONFIG=${mariadb:location}/bin/mysql_config \
-#    -DCMAKE_INCLUDE_PATH=${zlib:location}/include \
-#    -DCMAKE_LIBRARY_PATH=${zlib:location}/lib \
-#    .
-#environment=
-#    PATH=$PATH:${buildout:bin-directory}
-#    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/