--
Sebastian Huber, embedded brains GmbH
Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail : sebastian.hu...@embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
From 85d0ca332ec5c86f793fbc00654db889b3e9a786 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.hu...@embedded-brains.de>
Date: Fri, 11 Jan 2019 10:20:08 +0100
Subject: [PATCH] user: Add RSB content as a chapter
Remove the separate RSB manual.
---
rsb/conf.py | 14 ----------
rsb/index.rst | 40 ----------------------------
rsb/wscript | 11 --------
user/index.rst | 33 ++++++++++++-----------
{rsb => user/rsb}/bug-reporting.rst | 0
{rsb => user/rsb}/commands.rst | 0
{rsb => user/rsb}/configuration.rst | 0
{rsb => user/rsb}/cross-canadian-cross.rst | 0
{rsb => user/rsb}/history.rst | 0
rsb/source-builder.rst => user/rsb/index.rst | 15 +++++++++++
{rsb => user/rsb}/project-sets.rst | 0
{rsb => user/rsb}/third-party-packages.rst | 0
{rsb => user/rsb}/why-build-from-source.rst | 0
wscript | 1 -
14 files changed, 33 insertions(+), 81 deletions(-)
delete mode 100644 rsb/conf.py
delete mode 100644 rsb/index.rst
delete mode 100644 rsb/wscript
rename {rsb => user/rsb}/bug-reporting.rst (100%)
rename {rsb => user/rsb}/commands.rst (100%)
rename {rsb => user/rsb}/configuration.rst (100%)
rename {rsb => user/rsb}/cross-canadian-cross.rst (100%)
rename {rsb => user/rsb}/history.rst (100%)
rename rsb/source-builder.rst => user/rsb/index.rst (94%)
rename {rsb => user/rsb}/project-sets.rst (100%)
rename {rsb => user/rsb}/third-party-packages.rst (100%)
rename {rsb => user/rsb}/why-build-from-source.rst (100%)
diff --git a/rsb/conf.py b/rsb/conf.py
deleted file mode 100644
index 2f3258a..0000000
--- a/rsb/conf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import sys, os
-sys.path.append(os.path.abspath('../common/'))
-
-from conf import *
-
-project = "RTEMS Source Builder"
-
-latex_documents = [
- ('index',
- 'rsb.tex',
- u'RTEMS Source Builder',
- u'RTEMS Documentation Project',
- 'manual'),
-]
diff --git a/rsb/index.rst b/rsb/index.rst
deleted file mode 100644
index f4594ed..0000000
--- a/rsb/index.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-.. SPDX-License-Identifier: CC-BY-SA-4.0
-
-.. comment Heading
-.. comment 1 ======
-.. comment 2 ------
-.. comment 3 ~~~~~~
-.. comment 4 ^^^^^^
-
-.. highlight:: shell
-
-=================================
-RTEMS Source Builder (|version|).
-=================================
-
- | **COPYRIGHT (c) 2012 - 2015.**
- | **Chris Johns <chr...@rtems.org>**
- | **COPYRIGHT (c) 2016-2018.**
- | **RTEMS Foundation, The RTEMS Documentation Project**
-
- | **License:**
- | Creative Commons Attribution-ShareAlike 4.0 International Public License
- | https://creativecommons.org/licenses/by-sa/4.0/legalcode
-
-.. include:: ../common/header.rst
-
-.. toctree::
- :maxdepth: 5
- :numbered:
-
- source-builder
- why-build-from-source.rst
- project-sets
- cross-canadian-cross
- third-party-packages
- configuration
- commands
- bug-reporting
- history
-
-* :ref:`genindex`
diff --git a/rsb/wscript b/rsb/wscript
deleted file mode 100644
index 26ab0ca..0000000
--- a/rsb/wscript
+++ /dev/null
@@ -1,11 +0,0 @@
-from sys import path
-from os.path import abspath
-path.append(abspath('../common/'))
-
-from waf import cmd_configure as configure
-from waf import cmd_build as build
-from waf import cmd_options as options
-from waf import spell
-from waf import cmd_spell
-from waf import linkcheck
-from waf import cmd_linkcheck
diff --git a/user/index.rst b/user/index.rst
index 2a92121..e20a22b 100644
--- a/user/index.rst
+++ b/user/index.rst
@@ -6,6 +6,8 @@
RTEMS User Manual (|version|).
==============================
+ | **COPYRIGHT (c) 2012 - 2015.**
+ | **Chris Johns <chr...@rtems.org>**
| **COPYRIGHT (c) 2016-2018.**
| **RTEMS Foundation, The RTEMS Documentation Project**
@@ -16,27 +18,28 @@ RTEMS User Manual (|version|).
.. include:: ../common/header.rst
.. toctree::
- :maxdepth: 5
- :numbered:
+ :maxdepth: 5
+ :numbered:
- overview/index
- ecosys/index
+ overview/index
+ ecosys/index
- start/index
- hosts/index
- installation/index
+ start/index
+ hosts/index
+ installation/index
- hardware/index
- bsps/index
+ hardware/index
+ bsps/index
- exe/index
- testing/index
- tracing/index
+ exe/index
+ testing/index
+ tracing/index
- tools/index
+ tools/index
+ rsb/index
- support/index
+ support/index
- glossary/index
+ glossary/index
* :ref:`genindex`
diff --git a/rsb/bug-reporting.rst b/user/rsb/bug-reporting.rst
similarity index 100%
rename from rsb/bug-reporting.rst
rename to user/rsb/bug-reporting.rst
diff --git a/rsb/commands.rst b/user/rsb/commands.rst
similarity index 100%
rename from rsb/commands.rst
rename to user/rsb/commands.rst
diff --git a/rsb/configuration.rst b/user/rsb/configuration.rst
similarity index 100%
rename from rsb/configuration.rst
rename to user/rsb/configuration.rst
diff --git a/rsb/cross-canadian-cross.rst b/user/rsb/cross-canadian-cross.rst
similarity index 100%
rename from rsb/cross-canadian-cross.rst
rename to user/rsb/cross-canadian-cross.rst
diff --git a/rsb/history.rst b/user/rsb/history.rst
similarity index 100%
rename from rsb/history.rst
rename to user/rsb/history.rst
diff --git a/rsb/source-builder.rst b/user/rsb/index.rst
similarity index 94%
rename from rsb/source-builder.rst
rename to user/rsb/index.rst
index 9b2f096..62a3ccf 100644
--- a/rsb/source-builder.rst
+++ b/user/rsb/index.rst
@@ -2,6 +2,8 @@
.. Copyright (C) 2012, 2016 Chris Johns <chr...@rtems.org>
+.. highlight:: shell
+
RTEMS Source Builder
====================
@@ -76,3 +78,16 @@ configuration can read the remaining sections.
If you think you have found a problem please see :ref:`Bugs, Crashes, and
Build Failures`.
+
+.. toctree::
+ :maxdepth: 5
+ :numbered:
+
+ why-build-from-source.rst
+ project-sets
+ cross-canadian-cross
+ third-party-packages
+ configuration
+ commands
+ bug-reporting
+ history
diff --git a/rsb/project-sets.rst b/user/rsb/project-sets.rst
similarity index 100%
rename from rsb/project-sets.rst
rename to user/rsb/project-sets.rst
diff --git a/rsb/third-party-packages.rst b/user/rsb/third-party-packages.rst
similarity index 100%
rename from rsb/third-party-packages.rst
rename to user/rsb/third-party-packages.rst
diff --git a/rsb/why-build-from-source.rst b/user/rsb/why-build-from-source.rst
similarity index 100%
rename from rsb/why-build-from-source.rst
rename to user/rsb/why-build-from-source.rst
diff --git a/wscript b/wscript
index 1488d3a..e66a3f7 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,6 @@ import waflib
import waf as docs_waf
build_all = ['user',
- 'rsb',
'c-user',
'bsp-howto',
'posix-users',
--
2.13.7
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
