Changeset 46498bd in rtems-docs

Timestamp:

01/18/16 03:28:28 (8 years ago)

Author:

Amar Takhar <amar@…>

Branches:

4.11, 5, master

Children:

3a71759

Parents:

6c6246c

git-author:

Amar Takhar <amar@…> (01/18/16 03:28:28)

git-committer:

Amar Takhar <verm@…> (05/03/16 00:51:24)

Message:

Fix rtemsconfig building.

I'll probably move to a more pythonic way of doing conf.py since this is getting
too complicated.

Files:

• book/index_book.rst (modified) (1 diff)
• book/wscript (modified) (4 diffs)
• common/conf.py (modified) (1 diff)
• rtemsconfig/wscript (modified) (2 diffs)

book/index_book.rst

@@ -23 +23 @@
         filesystem/index.rst
         networking/index.rst
-        new_chapters/index.rst
         porting/index.rst
         posix1003_1/index.rst
         posix_users/index.rst
-        relnotes/index.rst

book/wscript

@@ -5 +5 @@
 from waf import cmd_configure, cmd_build
 
+
+def options(ctx):
+        ctx.add_option('--rtems-path-py', type='string', help="Path to py/ in RTEMS.")
+
 def configure(ctx):
+        if not ctx.options.rtems_path_py:
+                ctx.fatal("--rtems-path-py is required")
+
+        ctx.env.RTEMS_PATH = ctx.options.rtems_path_py
         cmd_configure(ctx)
 
@@ -21 +29 @@
                 "filesystem",
                 "networking",
-                "new_chapters",
                 "porting",
                 "posix1003_1",
                 "posix_users",
-                "relnotes"
         ]
 
@@ -35 +41 @@
         for dir in dirs:
                 files = ctx.path.parent.find_node(dir).ant_glob("**/*.rst")
+                files += ctx.path.parent.find_node(dir).ant_glob("**/*.jpg")
+                files += ctx.path.parent.find_node(dir).ant_glob("**/*.png")
                 files = [x for x in files if x.name.find("/build/") == -1]
                 ctx.path.get_bld().make_node(dir).mkdir() # dirs
@@ -55 +63 @@
 
         sub = {
-                "VERSION":                              "1.0",
-                "RELEASE":                              "5.0.0",
-                "DOC":                                  "Manual",
-                "FILE_DOC":                             "rtemsmanual",
+                "VERSION":                      "1.0",
+                "RELEASE":                      "5.0.0",
+                "DOC":                          "Manual",
+                "FILE_DOC":                     "rtemsmanual",
+                "CONF_EXTRA":           "sys.path.append('%s')" % ctx.env.RTEMS_PATH
         }
 

common/conf.py

@@ -2 +2 @@
 sys.path.append(os.path.abspath('.'))
 sys.path.append(os.path.abspath('../../common/'))
+
+@CONF_EXTRA@
 
 extensions = [

rtemsconfig/wscript

@@ -3 +3 @@
 path.append(abspath('../common/'))
 
+
 from waf import cmd_configure, cmd_build
 
+def options(ctx):
+            ctx.add_option('--rtems-path-py', type='string', help="Path to py/ in RTEMS.")
+
 def configure(ctx):
+
+        if not ctx.options.rtems_path_py:
+                ctx.fatal("--rtems-path-py is required")
+
+        ctx.env.RTEMS_PATH = ctx.options.rtems_path_py
+
         cmd_configure(ctx)
 
+
+
 def build(ctx):
+#       path.append(ctx.env.RTEMS_PATH)
 
         sub = {
@@ -15 +28 @@
                 "DOC":                                  "RTEMS Config",
                 "FILE_DOC":                             "rtemsconfig",
+                "CONF_EXTRA":                   "sys.path.append('%s')" % ctx.env.RTEMS_PATH
         }