From 46498bd4e36b9f6d6873de3de5acea11d3f546b4 Mon Sep 17 00:00:00 2001
From: Amar Takhar <amar@rtems.org>
Date: Sun, 17 Jan 2016 22:28:28 -0500
Subject: Fix rtemsconfig building.

I'll probably move to a more pythonic way of doing conf.py since this is getting
too complicated.
---
 book/index_book.rst |  2 --
 book/wscript        | 21 +++++++++++++++------
 common/conf.py      |  2 ++
 rtemsconfig/wscript | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/book/index_book.rst b/book/index_book.rst
index 370489c..2dc5511 100644
--- a/book/index_book.rst
+++ b/book/index_book.rst
@@ -22,8 +22,6 @@ Table of Contents
 	develenv/index.rst
 	filesystem/index.rst
 	networking/index.rst
-	new_chapters/index.rst
 	porting/index.rst
 	posix1003_1/index.rst
 	posix_users/index.rst
-	relnotes/index.rst
diff --git a/book/wscript b/book/wscript
index e300add..cc7e438 100644
--- a/book/wscript
+++ b/book/wscript
@@ -4,7 +4,15 @@ 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):
@@ -20,11 +28,9 @@ def build(ctx):
 		"develenv",
 		"filesystem",
 		"networking",
-		"new_chapters",
 		"porting",
 		"posix1003_1",
 		"posix_users",
-		"relnotes"
 	]
 
 	p = ctx.path.parent.abspath()
@@ -34,6 +40,8 @@ def build(ctx):
 
 	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
 
@@ -54,10 +62,11 @@ def build(ctx):
 
 
 	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
 	}
 
 	cmd_build(ctx, sub, source_dir="build")
diff --git a/common/conf.py b/common/conf.py
index 116ed0e..027a29f 100644
--- a/common/conf.py
+++ b/common/conf.py
@@ -2,6 +2,8 @@ import sys, os
 sys.path.append(os.path.abspath('.'))
 sys.path.append(os.path.abspath('../../common/'))
 
+@CONF_EXTRA@
+
 extensions = [
 	"sphinx.ext.autodoc",
 	"sphinx.ext.coverage",
diff --git a/rtemsconfig/wscript b/rtemsconfig/wscript
index 53eb848..a681104 100644
--- a/rtemsconfig/wscript
+++ b/rtemsconfig/wscript
@@ -2,18 +2,32 @@ from sys import path
 from os.path import abspath
 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 = {
 		"VERSION":				"1.0",
 		"RELEASE":				"5.0.0",
 		"DOC":					"RTEMS Config",
 		"FILE_DOC":				"rtemsconfig",
+		"CONF_EXTRA":			"sys.path.append('%s')" % ctx.env.RTEMS_PATH
 	}
 
 	cmd_build(ctx, sub)
-- 
cgit v1.2.3