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
This commit is contained in:
parent
abc9e06fe1
commit
3324735a28
4 changed files with 21 additions and 11 deletions
|
@ -8,7 +8,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
if WANT_DOCS
|
if WANT_DOCS
|
||||||
DOCS = doc
|
DOCS = doc daemon/doc
|
||||||
endif
|
endif
|
||||||
if WANT_GUI
|
if WANT_GUI
|
||||||
GUI = gui
|
GUI = gui
|
||||||
|
@ -52,10 +52,11 @@ dist-hook:
|
||||||
rm -rf `find $(distdir)/kernel -name .svn`
|
rm -rf `find $(distdir)/kernel -name .svn`
|
||||||
rm -rf $(distdir)/packaging/bsd/.svn
|
rm -rf $(distdir)/packaging/bsd/.svn
|
||||||
|
|
||||||
# build a source RPM using Fedora ~/rpmbuild dirs
|
# build a source RPM
|
||||||
.PHONY: rpm
|
.PHONY: rpm
|
||||||
rpm: dist
|
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 core-@CORE_VERSION@.tar.gz ~/rpmbuild/SOURCES
|
||||||
cp -afv packaging/rpm/core.spec ~/rpmbuild/SPECS
|
cp -afv packaging/rpm/core.spec ~/rpmbuild/SPECS
|
||||||
rpmbuild -bs ~/rpmbuild/SPECS/core.spec
|
rpmbuild -bs ~/rpmbuild/SPECS/core.spec
|
||||||
|
|
10
README.rst
10
README.rst
|
@ -55,6 +55,16 @@ Here is what is installed with 'make install':
|
||||||
|
|
||||||
See the manual for the software required for building CORE.
|
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
|
Running CORE
|
||||||
============
|
============
|
||||||
|
|
|
@ -42,7 +42,7 @@ master_doc = 'index'
|
||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'CORE'
|
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
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
# |version| and |release|, also used in various other places throughout the
|
# |version| and |release|, also used in various other places throughout the
|
||||||
|
@ -223,7 +223,7 @@ man_pages = [
|
||||||
epub_title = u'CORE'
|
epub_title = u'CORE'
|
||||||
epub_author = u'core-dev'
|
epub_author = u'core-dev'
|
||||||
epub_publisher = 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
|
# The language of the text. It defaults to the language option
|
||||||
# or en if the language is not set.
|
# or en if the language is not set.
|
||||||
|
|
|
@ -318,6 +318,9 @@ fi
|
||||||
%{python_sitearch}/netns.so
|
%{python_sitearch}/netns.so
|
||||||
%{python_sitearch}/vcmd.so
|
%{python_sitearch}/vcmd.so
|
||||||
%dir %{python_sitelib}/core
|
%dir %{python_sitelib}/core
|
||||||
|
%{python_sitelib}/core/sdt.py*
|
||||||
|
%{python_sitelib}/core/service.py*
|
||||||
|
%{python_sitelib}/core/coreserver.py*
|
||||||
%dir %{python_sitelib}/core/addons
|
%dir %{python_sitelib}/core/addons
|
||||||
%{python_sitelib}/core/addons/__init__.py*
|
%{python_sitelib}/core/addons/__init__.py*
|
||||||
%dir %{python_sitelib}/core/api
|
%dir %{python_sitelib}/core/api
|
||||||
|
@ -379,11 +382,7 @@ fi
|
||||||
%dir %{python_sitelib}/core/phys
|
%dir %{python_sitelib}/core/phys
|
||||||
%{python_sitelib}/core/phys/__init__.py*
|
%{python_sitelib}/core/phys/__init__.py*
|
||||||
%{python_sitelib}/core/phys/pnodes.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_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
|
%dir %{python_sitelib}/core/services
|
||||||
%{python_sitelib}/core/services/bird.py*
|
%{python_sitelib}/core/services/bird.py*
|
||||||
%{python_sitelib}/core/services/__init__.py*
|
%{python_sitelib}/core/services/__init__.py*
|
||||||
|
@ -410,7 +409,7 @@ fi
|
||||||
%{_sbindir}/vnoded
|
%{_sbindir}/vnoded
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* XXX XXX X 2017 CORE Developers <core-dev@nrl.navy.mil> - 5.0
|
* Fri Aug 18 2017 CORE Developers <core-dev@nrl.navy.mil> - 5.0
|
||||||
- Added Ryu SD and Open vSwitch services, code cleanup and refactoring
|
- Added Ryu SD and Open vSwitch services, code cleanup and refactoring
|
||||||
* Fri Jun 5 2015 CORE Developers <core-dev@pf.itd.nrl.navy.mil> - 4.8
|
* Fri Jun 5 2015 CORE Developers <core-dev@pf.itd.nrl.navy.mil> - 4.8
|
||||||
- Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes
|
- Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes
|
||||||
|
|
Loading…
Reference in a new issue