Commit 5e53232f authored by Build System's avatar Build System

Fixes typo in doxygen-python, and fixes unitest TestCase().discover on python < 2.7

parent be7d0c8f
...@@ -394,7 +394,7 @@ if( DOXYGEN_FOUND ) ...@@ -394,7 +394,7 @@ if( DOXYGEN_FOUND )
${CMAKE_COMMAND} -E remove_directory doxygen-python ${CMAKE_COMMAND} -E remove_directory doxygen-python
COMMAND PYTHON_SOURCES_TO_DOC=${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_python COMMAND PYTHON_SOURCES_TO_DOC=${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_python
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS Doxyfile.python DEPENDS Doxyfile_python
DEPENDS xml-to-docstrings DEPENDS xml-to-docstrings
DEPENDS pcbnew.py DEPENDS pcbnew.py
......
...@@ -396,7 +396,7 @@ LOOKUP_CACHE_SIZE = 0 ...@@ -396,7 +396,7 @@ LOOKUP_CACHE_SIZE = 0
# normally produced when WARNINGS is set to YES. # normally produced when WARNINGS is set to YES.
# The default value is: NO. # The default value is: NO.
EXTRACT_ALL = NO EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will # If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
# be included in the documentation. # be included in the documentation.
...@@ -408,7 +408,7 @@ EXTRACT_PRIVATE = NO ...@@ -408,7 +408,7 @@ EXTRACT_PRIVATE = NO
# scope will be included in the documentation. # scope will be included in the documentation.
# The default value is: NO. # The default value is: NO.
EXTRACT_PACKAGE = NO EXTRACT_PACKAGE = YES
# If the EXTRACT_STATIC tag is set to YES all static members of a file will be # If the EXTRACT_STATIC tag is set to YES all static members of a file will be
# included in the documentation. # included in the documentation.
...@@ -430,7 +430,7 @@ EXTRACT_LOCAL_CLASSES = YES ...@@ -430,7 +430,7 @@ EXTRACT_LOCAL_CLASSES = YES
# included. # included.
# The default value is: NO. # The default value is: NO.
EXTRACT_LOCAL_METHODS = NO EXTRACT_LOCAL_METHODS = YES
# If this flag is set to YES, the members of anonymous namespaces will be # If this flag is set to YES, the members of anonymous namespaces will be
# extracted and appear in the documentation as a namespace called # extracted and appear in the documentation as a namespace called
...@@ -455,7 +455,7 @@ HIDE_UNDOC_MEMBERS = NO ...@@ -455,7 +455,7 @@ HIDE_UNDOC_MEMBERS = NO
# no effect if EXTRACT_ALL is enabled. # no effect if EXTRACT_ALL is enabled.
# The default value is: NO. # The default value is: NO.
HIDE_UNDOC_CLASSES = NO HIDE_UNDOC_CLASSES = YES
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
# (class|struct|union) declarations. If set to NO these declarations will be # (class|struct|union) declarations. If set to NO these declarations will be
...@@ -796,7 +796,7 @@ EXCLUDE_PATTERNS = ...@@ -796,7 +796,7 @@ EXCLUDE_PATTERNS =
# Note that the wildcards are matched against the file with absolute path, so to # Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories use the pattern */test/* # exclude all test directories use the pattern */test/*
EXCLUDE_SYMBOLS = EXCLUDE_SYMBOLS = _object,SwigPyIterator
# The EXAMPLE_PATH tag can be used to specify one or more files or directories # The EXAMPLE_PATH tag can be used to specify one or more files or directories
# that contain example code fragments that are included (see the \include # that contain example code fragments that are included (see the \include
......
import unittest import unittest
import platform
if platform.python_version() < '2.7':
unittest = __import__('unittest2')
else:
import unittest
if __name__ == '__main__': if __name__ == '__main__':
testsuite = unittest.TestLoader().discover('testcases',pattern="*.py") testsuite = unittest.TestLoader().discover('testcases',pattern="*.py")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment