Merge branch 'DOH_POOL_SIZE-increase'
* DOH_POOL_SIZE-increase:
Increase DOH_POOL_SIZE
diff --git a/.travis.yml b/.travis.yml
index 32c6656..cedce51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -428,7 +428,7 @@
env: SWIGLANG=go
- compiler: clang
os: osx
- env: SWIGLANG=guile
+ env: SWIGLANG=guile CSTD=c11
- compiler: clang
os: osx
env: SWIGLANG=java
diff --git a/CHANGES.current b/CHANGES.current
index 5ca41fc..364ec38 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -7,6 +7,9 @@
Version 4.0.2 (in progress)
===========================
+2020-05-24: vapier
+ [JS] #1796 Fix pkg-config invocation in configure.
+
2020-02-18: ryannevell
[Lua] #1728 Add support for LUA lightuserdata to SWIG_Lua_ConvertPtr.
diff --git a/Examples/test-suite/doxygen_misc_constructs.i b/Examples/test-suite/doxygen_misc_constructs.i
index c1b3eea..9cf95de 100644
--- a/Examples/test-suite/doxygen_misc_constructs.i
+++ b/Examples/test-suite/doxygen_misc_constructs.i
@@ -36,7 +36,7 @@
* @param line line number
* @param isGetSize if set, for every object location both address and size are returned
*
- * @link Connection::getId() @endlink <br>
+ * @link Connection::getId() @endlink<br>
*/
void getAddress(int &fileName,
int line,
@@ -62,7 +62,7 @@
* used for unspecified parameters.
* <p>
*
- * @link advancedWinIDEALaunching.py Python example.@endlink <br>
+ * @link advancedWinIDEALaunching.py Python example.@endlink<br>
*/
class CConnectionConfig
{
diff --git a/Examples/test-suite/doxygen_translate_all_tags.i b/Examples/test-suite/doxygen_translate_all_tags.i
index 6cefd8d..b54203d 100644
--- a/Examples/test-suite/doxygen_translate_all_tags.i
+++ b/Examples/test-suite/doxygen_translate_all_tags.i
@@ -210,7 +210,7 @@
*
* \line example
*
- * \link someMember Some description follows \endlink
+ * \link someMember Some description follows\endlink with text after
*
* \mainpage Some title
*
diff --git a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
index fda1fc3..56272bf 100644
--- a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
@@ -93,7 +93,7 @@
" </li><li>With lots of items \n" +
" </li><li>lots of lots of items \n" +
" </li></ul> \n" +
- " {@link someMember Some description follows }\n" +
+ " {@link someMember Some description follows} with text after\n" +
" This will only appear in man\n");
wantedComments.put("doxygen_translate_all_tags.doxygen_translate_all_tags.func07(int, int, int, int)",
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index be06f7e..4c0507c 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -11,7 +11,7 @@
LANGUAGE = python
PYTHON = $(PYBIN)
PYCODESTYLE = @PYCODESTYLE@
-PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,W291,W391
+PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,E741,W291,W391
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py
diff --git a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
index 2b5b3b8..e884cf9 100644
--- a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
+++ b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
@@ -175,7 +175,7 @@
-someMember Some description follows
+someMember Some description follows with text after
diff --git a/Source/Doxygen/doxyparser.cxx b/Source/Doxygen/doxyparser.cxx
index 6bda9d2..35d1836 100644
--- a/Source/Doxygen/doxyparser.cxx
+++ b/Source/Doxygen/doxyparser.cxx
@@ -1196,6 +1196,10 @@
// do it every time.)
if (getBaseCommand(cmd) == CMD_CODE) skipLeadingSpace = true;
else skipLeadingSpace = false;
+ } else if (cmd.substr(0,3) == "end") {
+ // If processing an "end" command such as "endlink", don't skip
+ // the space before the next string
+ skipLeadingSpace = false;
}
if (skipLeadingSpace) {
diff --git a/configure.ac b/configure.ac
index b4cadef..fce5b9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1597,7 +1597,7 @@
if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then
AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
- if pkg-config javascriptcoregtk-1.0; then
+ if $PKGCONFIG javascriptcoregtk-1.0; then
JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0`
JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0`
fi
