Skip to content

Commit

Permalink
rtd backport fix
Browse files Browse the repository at this point in the history
  • Loading branch information
psi29a committed Jul 29, 2017
1 parent 9c94244 commit cf6f368
Show file tree
Hide file tree
Showing 21 changed files with 3 additions and 1,622 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ IF(NOT WIN32 AND NOT APPLE)
# Install icon and desktop file
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.appdata.xml" DESTINATION "${DATAROOTDIR}/appdata" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.appdata.xml" DESTINATION "${DATAROOTDIR}/metainfo" COMPONENT "openmw")
IF(BUILD_OPENCS)
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "opencs")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/openmw-cs.png" DESTINATION "${ICONDIR}" COMPONENT "opencs")
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
breathe
parse_cmake
sphinx
40 changes: 1 addition & 39 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
import glob
import os
import sys

Expand All @@ -21,12 +20,6 @@
project_root = os.path.abspath('../../')
sys.path.insert(0, project_root)


def insensitive_glob(pattern):
def either(c):
return '[%s%s]' % (c.lower(), c.upper()) if c.isalpha() else c
return glob.glob(''.join(map(either, pattern)))

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand All @@ -43,37 +36,6 @@ def either(c):
'sphinx.ext.viewcode',
]

try:
import breathe
extensions.append('breathe')
except ImportError:
print("WARNING: Unable to import breathe, code documentation won't be generated.")

# Where breathe can find the source files
openmw_path = os.path.join(project_root, "apps", "openmw")
openmw_sub_dirs = os.walk(openmw_path).next()[1]
openmw_headers = insensitive_glob(os.path.join(openmw_path, "*.hpp"))
for dir in openmw_sub_dirs:
openmw_headers += insensitive_glob(os.path.join(openmw_path, dir, "*.hpp"))
# massage the headers to get the relative path needed
openmw_headers = [os.path.relpath(x, openmw_path) for x in openmw_headers]

opencs_path = os.path.join(project_root, "apps", "opencs")
opencs_sub_dirs = os.walk(opencs_path).next()[1]
opencs_headers = insensitive_glob(os.path.join(opencs_path, "*.hpp"))
opencs_sub_sub_dirs = []
for dir in opencs_sub_dirs:
opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, "*.hpp"))
opencs_sub_sub_dirs += os.walk(os.path.join(opencs_path, dir)).next()[1]
for sub_dir in opencs_sub_sub_dirs:
opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, sub_dir, "*.hpp"))
opencs_headers = [os.path.relpath(x, opencs_path) for x in opencs_headers]

breathe_projects_source = {
"openmw": (openmw_path, openmw_headers),
"opencs": (opencs_path, opencs_headers),
}

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand All @@ -88,7 +50,7 @@ def either(c):

# General information about the project.
project = u'OpenMW'
copyright = u'2016, OpenMW Team'
copyright = u'2017, OpenMW Team'


# The version info for the project you're documenting, acts as replacement for
Expand Down
11 changes: 1 addition & 10 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@ Sections
--------

.. toctree::
:maxdepth: 2
:maxdepth: 3

manuals/index
reference/index
source/index


Indices and Tables
==================

* :ref:`genindex`
* :ref:`search`

8 changes: 0 additions & 8 deletions docs/source/source/index.rst

This file was deleted.

11 changes: 0 additions & 11 deletions docs/source/source/opencs/index.rst

This file was deleted.

Loading

0 comments on commit cf6f368

Please sign in to comment.