[Erp5-report] r41391 kazuhiko - in /erp5/trunk/buildout: hooks/ software-profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Dec 13 14:11:55 2010
New Revision: 41391

URL: http://svn.erp5.org?rev=41391&view=rev
Log:
no longer use hooks for mysql building.
* environment parameter may not accect hooks in comming hexagonit.recipe.cmmi release (not sure).
* creating var directory should be a part of instance creation recipe.

Removed:
    erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
Modified:
    erp5/trunk/buildout/software-profiles/mysql-5.1.cfg
    erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg

Removed: erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
URL: http://svn.erp5.org/erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py?rev=41390&view=auto
==============================================================================
--- erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] (original)
+++ erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py (removed)
@@ -1,25 +0,0 @@
-import errno
-import os
-
-# the comand below assumes there is only one sub-directory under the
-# 'compile-directory', which is why the cd .../* would work.
-CMDS = """
-libtoolize -c -f
-aclocal %(aclocal-options)s
-autoheader
-automake -c -a -f
-autoconf
-touch sql/sql_yacc.yy
-""".strip()
-
-def pre_configure_hook(options, buildout):
-    os.system(CMDS % {
-        'aclocal-options':options.get('aclocal-options', '').strip(),
-    })
-
-def post_make_hook(options, buildout):
-    try:
-        os.mkdir("%s/var" % options['location'])
-    except OSError, e:
-        if e.errno != errno.EEXIST:
-            raise

Modified: erp5/trunk/buildout/software-profiles/mysql-5.1.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-5.1.cfg?rev=41391&r1=41390&r2=41391&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-5.1.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-5.1.cfg [utf8] Mon Dec 13 14:11:55 2010
@@ -19,26 +19,26 @@ md5sum = 6580393ca93ecf564cad0552b91a563
 filename = mysql-5.1.49-sphinx-1.10.diff
 download-only = true
 
-[mysql-hooks-download]
-recipe = hexagonit.recipe.download
-url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40113
-filename = mysql-tritonn-hooks.py
-md5sum = 309d2dedf145122c6151bb46560a7ff3
-download-only = true
-
 [mysql-5.1]
 recipe = hexagonit.recipe.cmmi
 version = 5.1.53
 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
 md5sum = e5e7c5b0b5c382489e6a66778703bc46
-pre-configure-hook = ${mysql-hooks-download:location}/${mysql-hooks-download:filename}:pre_configure_hook
-post-make-hook = ${mysql-hooks-download:location}/${mysql-hooks-download:filename}:post_make_hook
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
 #  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
+configure-command =
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal -I config/ac-macros
+  autoheader
+  automake -c -a -f
+  autoconf
+  touch sql/sql_yacc.yy
+  ./configure
 # we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
 configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --enable-thread-safe-client
   --enable-local-infile
   --enable-assembler
@@ -53,8 +53,6 @@ configure-options =
 
 make-options =
   LIBTOOL=libtool
-aclocal-options =
-  -I ${libtool:location}/share/aclocal -I config/ac-macros
 
 patch-options = -p1
 patches =

Modified: erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg?rev=41391&r1=41390&r2=41391&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] Mon Dec 13 14:11:55 2010
@@ -39,22 +39,22 @@ md5sum = e7ff31f4853f4391344a6a9a520fc98
 filename = mysql-5.0.87-sphinx-1.10.diff
 download-only = true
 
-[mysql-tritonn-hooks-download]
-recipe = hexagonit.recipe.download
-url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40113
-filename = mysql-tritonn-hooks.py
-md5sum = 309d2dedf145122c6151bb46560a7ff3
-download-only = true
-
 [mysql-tritonn-5.0]
 recipe = hexagonit.recipe.cmmi
 url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz
 md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be
-pre-configure-hook = ${mysql-tritonn-hooks-download:location}/${mysql-tritonn-hooks-download:filename}:pre_configure_hook
-post-make-hook = ${mysql-tritonn-hooks-download:location}/${mysql-tritonn-hooks-download:filename}:post_make_hook
 # configure: how to avoid searching for my.cnf?
 #  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
+configure-command =
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal -I config/ac-macros
+  autoheader
+  automake -c -a -f
+  autoconf
+  touch sql/sql_yacc.yy
+  ./configure
 configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-senna
   --with-openssl=${openssl:location}
   --without-mecab
@@ -72,8 +72,6 @@ configure-options =
 make-options =
   LIBTOOL=libtool
   LN_S='ln -s'
-aclocal-options =
-  -I ${libtool:location}/share/aclocal -I config/ac-macros
 
 patch-options = -p1
 patches =