X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=2e004e713dfc2e08f71a540bacd1885ee3e7b2c5;hb=daa7377b102271f020b07953d0e397bcefa76156;hp=d4fefa4d59ef63d9b45ae3746eef7b7a55b50a22;hpb=e272ebf71328b82391e598824db2dffe51979e5c;p=odoo%2Fodoo.git

diff --git a/setup.py b/setup.py
index d4fefa4..2e004e7 100755
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,7 @@ required_modules = [
     ('pydot', 'pydot module'),
     ('pytz', 'Timezone handling library for Python'),
     ('reportlab', 'reportlab module'),
+    ('yaml', 'YAML parser and emitter for Python'),
 ]
 
 def check_modules():
@@ -76,7 +77,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__terp__.py' in names:
+        if '__openerp__.py' in names or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -85,7 +86,12 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
-            if os.path.exists(join(empath, mname, '__terp__.py')):
+
+            terp = join(empath, mname, '__openerp__.py')
+            if not os.path.exists(terp):
+                terp = join(empath, mname, '__terp__.py')
+
+            if os.path.exists(terp):
                 yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname
@@ -174,7 +180,7 @@ options = {
                      "lxml.objectify", "decimal", "xml", "encodings",
                      "dateutil", "wizard", "pychart", "PIL", "pyparsing",
                      "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                     "HTMLParser", "select"],
+                     "HTMLParser", "select", "yaml"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }