From 3324735a289bcf3e1a921f98265debb8178a1ac5 Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Fri, 18 Aug 2017 16:35:26 -0700 Subject: [PATCH] updated dates within changelog files, updated readme to show how to build docs, updated root makefile to build the python docs as well, update the base makefile to allow building the source rpm on systems that are not fedora and can build rpms --- Makefile.am | 7 ++++--- README.rst | 12 +++++++++++- doc/conf.py.in | 4 ++-- packaging/rpm/core.spec.in | 9 ++++----- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index f5e415a7..9c49a312 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ # if WANT_DOCS - DOCS = doc + DOCS = doc daemon/doc endif if WANT_GUI GUI = gui @@ -52,10 +52,11 @@ dist-hook: rm -rf `find $(distdir)/kernel -name .svn` rm -rf $(distdir)/packaging/bsd/.svn -# build a source RPM using Fedora ~/rpmbuild dirs +# build a source RPM .PHONY: rpm rpm: dist - rpmdev-setuptree + mkdir -p $(HOME)/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} + echo '%_topdir $(HOME)/rpmbuild' > ~/.rpmmacros cp -afv core-@CORE_VERSION@.tar.gz ~/rpmbuild/SOURCES cp -afv packaging/rpm/core.spec ~/rpmbuild/SPECS rpmbuild -bs ~/rpmbuild/SPECS/core.spec diff --git a/README.rst b/README.rst index 5fb323ac..679a29b4 100644 --- a/README.rst +++ b/README.rst @@ -55,6 +55,16 @@ Here is what is installed with 'make install': See the manual for the software required for building CORE. +Building Documentation +====================== + +Being able to build documentation depends on help2man being installed. + +Once that has been done you can run the following commands: + + ./bootstrap.sh + ./configure + make html Running CORE ============ @@ -63,7 +73,7 @@ First start the CORE services: sudo /etc/init.d/core-daemon start -This automatically runs the core-daemon program. +This automatically runs the core-daemon program. Assuming the GUI is in your PATH, run the CORE GUI by typing the following: core-gui diff --git a/doc/conf.py.in b/doc/conf.py.in index eb0d034c..6dab9d64 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'CORE' -copyright = u'2012, core-dev' +copyright = u'2017, core-dev' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -223,7 +223,7 @@ man_pages = [ epub_title = u'CORE' epub_author = u'core-dev' epub_publisher = u'core-dev' -epub_copyright = u'2012, core-dev' +epub_copyright = u'2017, core-dev' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/packaging/rpm/core.spec.in b/packaging/rpm/core.spec.in index 7c67993c..9105dd97 100644 --- a/packaging/rpm/core.spec.in +++ b/packaging/rpm/core.spec.in @@ -318,6 +318,9 @@ fi %{python_sitearch}/netns.so %{python_sitearch}/vcmd.so %dir %{python_sitelib}/core +%{python_sitelib}/core/sdt.py* +%{python_sitelib}/core/service.py* +%{python_sitelib}/core/coreserver.py* %dir %{python_sitelib}/core/addons %{python_sitelib}/core/addons/__init__.py* %dir %{python_sitelib}/core/api @@ -379,11 +382,7 @@ fi %dir %{python_sitelib}/core/phys %{python_sitelib}/core/phys/__init__.py* %{python_sitelib}/core/phys/pnodes.py* -%{python_sitelib}/core/pycore.py* %{python_sitelib}/core_python-@COREDPY_VERSION@-py%{python_version}.egg-info -%{python_sitelib}/core/sdt.py* -%{python_sitelib}/core/service.py* -%{python_sitelib}/core/coreserver.py* %dir %{python_sitelib}/core/services %{python_sitelib}/core/services/bird.py* %{python_sitelib}/core/services/__init__.py* @@ -410,7 +409,7 @@ fi %{_sbindir}/vnoded %changelog -* XXX XXX X 2017 CORE Developers - 5.0 +* Fri Aug 18 2017 CORE Developers - 5.0 - Added Ryu SD and Open vSwitch services, code cleanup and refactoring * Fri Jun 5 2015 CORE Developers - 4.8 - Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes