Merge latest master into doxygen branch again.

Update Doxygen-specific Python unit tests to work with the new indentation.

Update one of Doxygen-specific Java tests to still build with the new handling
of srcdir.

Examples/test-suite/python/doxygen_basic_translate_runme.py

@@ -6,74 +6,74 @@ import sys
 import commentVerifier
 
 commentVerifier.check(doxygen_basic_translate.function.__doc__,
-  """
-  Brief description.
+    """
+    Brief description.
 
-  The comment text.
+    The comment text.
 
-  Author: Some author
+    Author: Some author
 
-  Return: Some number
+    Return: Some number
 
-  See also: function2
-  """
+    See also: function2
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function2.__doc__,
-  """
-  A test of a very very very very very very very very very very very very very very very very
-  very very very very very long comment string.
-  """
+    """
+    A test of a very very very very very very very very very very very very very very very very
+    very very very very very long comment string.
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function3.__doc__,
-  """
-  ----------------------------------------------------------------
-  Overload 1:
-  ----------------------------------------------------------------
-  A test for overloaded functions
-  This is function __one__
+    """
+    ----------------------------------------------------------------
+    Overload 1:
+    ----------------------------------------------------------------
+    A test for overloaded functions
+    This is function __one__
 
-  ----------------------------------------------------------------
-  Overload 2:
-  ----------------------------------------------------------------
-  A test for overloaded functions
-  This is function __two__
+    ----------------------------------------------------------------
+    Overload 2:
+    ----------------------------------------------------------------
+    A test for overloaded functions
+    This is function __two__
 
-  """
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function4.__doc__,
-  """
-  A test of some mixed tag usage
-  If: CONDITION {
-  This _code_ fragment shows us something .
-  Title: Minuses:
-   -it\'s senseless
-   -it\'s stupid
-   -it\'s null
+    """
+    A test of some mixed tag usage
+    If: CONDITION {
+    This _code_ fragment shows us something .
+    Title: Minuses:
+     -it\'s senseless
+     -it\'s stupid
+     -it\'s null
 
-  Warning: This may not work as expected
+    Warning: This may not work as expected
 
-  int main() { while(true); }
+    int main() { while(true); }
 
-  }
-  """
+    }
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function5.__doc__,
-  """
-  This is a post comment. 
-  """
+    """
+    This is a post comment. 
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function6.__doc__,
-  """
-  Test for default args
-  Arguments:
-    a (int) -- Some parameter, default is 42
-  """
+    """
+    Test for default args
+    Arguments:
+      a (int) -- Some parameter, default is 42
+    """
 )
 commentVerifier.check(doxygen_basic_translate.function7.__doc__,
-  """
-  Test for a parameter with difficult type
-  (mostly for python)
-  Arguments:
-    a (Shape::superType *[10]) -- Very strange param
-  """
+    """
+    Test for a parameter with difficult type
+    (mostly for python)
+    Arguments:
+      a (Shape::superType *[10]) -- Very strange param
+    """
 )