[Erp5-report] r40089 kazuhiko - /erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Nov 9 13:26:15 CET 2010


Author: kazuhiko
Date: Tue Nov  9 13:26:13 2010
New Revision: 40089

URL: http://svn.erp5.org?rev=40089&view=rev
Log:
simplify mysql-tritonn-hooks.py.
* no need to invoke 'cd' because you are already there.
* no need to specify version for aclocal and automake, because their location should be specified by PATH environment variable.
* convert TAB to white spaces.

Modified:
    erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py

Modified: erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
URL: http://svn.erp5.org/erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py?rev=40089&r1=40088&r2=40089&view=diff
==============================================================================
--- erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] (original)
+++ erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] Tue Nov  9 13:26:13 2010
@@ -4,21 +4,20 @@ import os
 # the comand below assumes there is only one sub-directory under the
 # 'compile-directory', which is why the cd .../* would work.
 CMDS = """
-cd %s/*
 libtoolize -c -f
-which aclocal-1.9 >/dev/null 2>/dev/null && aclocal-1.9 || aclocal
+aclocal
 autoheader
-which automake-1.9 >/dev/null 2>/dev/null && automake-1.9 -c -a -i || automake -c -a -i
+automake -c -a -i
 autoconf
 touch sql/sql_yacc.yy
 """.strip()
 
 def pre_configure_hook(options, buildout):
-    os.system(CMDS % options['compile-directory'])
+    os.system(CMDS)
 
 def post_make_hook(options, buildout):
     try:
-    	os.mkdir("%s/var" % options['location'])
+        os.mkdir("%s/var" % options['location'])
     except OSError, e:
-	if e.errno != errno.EEXIST:
-	    raise
+        if e.errno != errno.EEXIST:
+            raise




More information about the Erp5-report mailing list