Patchwork [bitbake-devel] setup.py: fix documentation build

login
register
mail settings
Submitter Andreas Bofjall
Date May 7, 2014, 4:29 a.m.
Message ID <1399436964-10270-1-git-send-email-andreas@gazonk.org>
Download mbox | patch
Permalink /patch/71657/
State New
Headers show

Comments

Andreas Bofjall - May 7, 2014, 4:29 a.m.
setup.py currently aborts when building the documentation:

> ./setup.py build
[..]
error: [Errno 2] No such file or directory:
'/home/jab/src/x/bitbake/doc/manual'

because the doc/manual directory has been renamed to
doc/bitbake-user-manual since commit 452a62a ("doc: Rename user-manual
-> bitbake-user-manual") and its Makefile has been removed as of commit
d419907 ("user-manual: Import YP Docs templates for usermanual
improvements").

Update setup.py to reflect the new name and usage.

Signed-off-by: Andreas Bofjall <andreas@gazonk.org>
---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/setup.py b/setup.py
index 8c26a9b..02de77b 100755
--- a/setup.py
+++ b/setup.py
@@ -33,17 +33,17 @@  class Clean(clean):
     def run(self):
         clean.run(self)
         origpath = os.path.abspath(os.curdir)
-        os.chdir(os.path.join(origpath, 'doc', 'manual'))
+        os.chdir(os.path.join(origpath, 'doc'))
         make = os.environ.get('MAKE') or 'make'
-        os.system('%s clean-%s' % (make, doctype))
+        os.system('%s clean-%s DOC=bitbake-user-manual' % (make, doctype))
 
 class Build(build):
     def run(self):
         build.run(self)
         origpath = os.path.abspath(os.curdir)
-        os.chdir(os.path.join(origpath, 'doc', 'manual'))
+        os.chdir(os.path.join(origpath, 'doc'))
         make = os.environ.get('MAKE') or 'make'
-        ret = os.system('%s %s' % (make, doctype))
+        ret = os.system('%s %s DOC=bitbake-user-manual' % (make, doctype))
         if ret != 0:
             print("ERROR: Unable to generate html documentation.")
             sys.exit(ret)
@@ -58,7 +58,7 @@  setup(name='bitbake',
       py_modules = ["codegen"],
       scripts = ["bin/bitbake", "bin/bitbake-layers", "bin/bitbake-diffsigs", "bin/bitbake-prserv", "bin/bitbake-selftest", "bin/image-writer"],
       data_files = [("share/bitbake", glob("conf/*") + glob("classes/*")),
-                  ("share/doc/bitbake-%s/manual" % __version__, glob("doc/manual/html/*"))],
+                  ("share/doc/bitbake-%s/bitbake-user-manual" % __version__, glob("doc/bitbake-user-manual/html/*"))],
       cmdclass = {
           "build": Build,
           "clean": Clean,