Commit graph

21,396 commits

Author SHA1 Message Date
John McFarland
3476565665 Remove extra newline before code block in doxygen python output
Remove a newline character that was added to the translated comments
prior to the code block.  This way the structure of the pydoc output
more closely resembles that of the original doxygen comments.
Updating tests accordingly.
2019-05-27 13:06:32 -05:00
John McFarland
08ac56b7f2 Clarify python doxygen code block indentation handling
Clarify usage and comments for the codeIndent string, the intent of
which was not clear after recent updates.
2019-05-26 08:19:07 -05:00
John McFarland
0c6930d966 Cleanup of pydoc translator newline trimming
Simplify python doxygen translation code by using functions to erase
leading and trailing newlines.  No change to logic.
2019-05-26 07:52:57 -05:00
John McFarland
64b2113e66 Correction to recently added doxygen python test case
The _runme.py code for the recently added test case was using
references to an old module name for the test case, which was later
changed but not updated in the runme file.
2019-05-26 07:52:57 -05:00
John McFarland
0395c48124 Adjust expected python output for doxygen style2 test
Observed that with this second comment style, there is no line break
after the function overload headings in the translated
comments. Updating the test results accordingly.
2019-05-25 16:25:54 -05:00
John McFarland
91a90b8d27 Adding test for second doxygen comment style
This style looks like:

/** Line 1
 *  Line 2
 */

This is needed to verify fixes to some of the indentation in the
translated comments.

The test is copied from doxygen_basic_translate.i.  One adjustment was
made to change the comment style on the last function that left out
the intermediate "*" characters.  This does not produce correct output
when combined with this style of starting the text on the first
comment line.

Test results are copied directly from doxygen_basic_translate.  A
minor difference in the Python results will be updated in a subsequent
commit.
2019-05-25 16:25:54 -05:00
John McFarland
98ae66b6fc Fix bug in doxygen python code block indent
If a certain doxygen comment style was used that included an
additional space, then translated Python comment code block indent was
not correct (it included the extra space).  This doxygen comment style
was not previously represented in the test cases; a new test case will
be added in a subsequent commit.
2019-05-25 16:25:54 -05:00
John McFarland
08fc4a02b4 Eliminate extra newlines around doxygen python block math
Eliminate extra leading and trailing newlines around the \f[ and \f{
block math commands for doxygen comment translation for python.
Update tests accordingly.
2019-05-25 16:25:54 -05:00
John McFarland
c52bed2e66 Eliminate extra newlines in doxygen python \verbatim blocks
Eliminate extra leading and trailing newlines present in translated
doxygen \verbatim comments for python.  Updating doxygen python tests
accordingly.
2019-05-25 16:25:54 -05:00
John McFarland
321cb096a8 Remove extra newline from end of doxygen python \code command
Remove the extra newline at the end of translation of doxygen \code
\endcode command for Python.  Update test output accordingly.
2019-05-25 16:25:54 -05:00
John McFarland
3d64a2c037 Remove extra newline in beginning of doxygen python \code command
If \code is used as a block command (probably the main use case), an
extra newline was included in the translated Python comments.  This is
now removed and doxygen python test case output updated.
2019-05-25 16:14:02 -05:00
John McFarland
e62c88883f Fix python doxygen indentation for inline \code command
If \code was used inline, it produced an extra indent versus block
usage.  This extra indent was also stored in the test output.  This
update resolves this by simply removing a space that was being added
unnecessarily in handleTagVerbatim.  Updating test case output
accordingly.
2019-05-25 16:11:20 -05:00
William S Fulton
9829bdf5b1 Add Octave detection fixes to changes file 2019-05-24 19:36:36 +01:00
William S Fulton
2cd59b636e Travis Octave testing changes
- Keep testing Octave 4.0 on Xenial, but the Octave headers break the C++11
  tests, so just test C++98.
- Drop Octave 4.2 testing on Trusty.
- Keep Octave 4.4 testing on Trusty - it is the only C++11 Octave testing
  done and is just fast enough to beat the 50 minute limit.
- Add latest Octave version (5.1) testing by using MacOS and brew. It takes
  about 49 minutes to run for C++98 testing.
  Unfortunately it takes longer than the Travis 50 minute limit to test C++11.

I can't find a Xenial or MacOS solution for testing Octave and C++11, so we'll
keep it on Travis for now. Octave is available as a Flatpak's, but Flatpak
doesn't work on Travis as it requires a reboot after installing the flatpak
package.
2019-05-24 19:30:47 +01:00
William S Fulton
6489730892 Fix Octave detection for non-GNU sed on MacOS 2019-05-24 19:30:47 +01:00
Orion Poplawski
ae7c04e204 Adapt OCTAVE_LDFLAGS for Octave 5.1 2019-05-24 19:30:47 +01:00
William S Fulton
e23ae76159 Ruby 1.9 and later testing on Travis xenial
There were (a few) failures using 1.8.7, so document 1.9 and later as
working in SWIG 4.0.
Trusty failure in 2.3.0 was fixed in later versions of Ruby 2.3.x
(expansion of RARRAY_PTR).
2019-05-24 19:30:47 +01:00
Olly Betts
8cae5989b2 Add CHANGES entry for previous commit
Closes https://github.com/swig/swig/pull/1528
2019-05-22 11:38:10 +12:00
Frederik Schubert
b3a3c4f09e Don't add a closing php-tag
This PR removes the closing `?>` PHP tag from generated files. [PSR-2](https://www.php-fig.org/psr/psr-2/) states:

> The closing `?>` tag MUST be omitted from files containing only PHP.

A problem might occur if files with any character after the closing tag are used with `include` or `require`. It might trigger an output and disallow HTTP header manipulation. See the popular [_headers already sent_](https://stackoverflow.com/a/8028987/1847340) debate on SO.
2019-05-22 11:35:08 +12:00
Olly Betts
e87811223c [php] Update docs about undefined constants
PHP 7.2 made these a warning instead of just a notice, and apparently it
will throw an Error in a future version of PHP.
2019-05-22 11:13:55 +12:00
Olly Betts
1dd5d50c99 Fix details of ZEND_MODULE_GLOBALS_ACCESSOR change
This is actually needed when using a ZTS build of any PHP 7.x
release, nothing specific to PHP 7.2 at all.
2019-05-22 11:02:29 +12:00
Zackery Spytz
f042543c6f
Merge pull request #1474 from ZackerySpytz/OCaml-INPUT-OUTPUT-INOUT-primitives
[OCaml] Add missing INPUT, OUTPUT, and INOUT typemaps for primitives
2019-05-13 21:44:02 -06:00
William S Fulton
6a127b75f1 Travis Go testing moved to xenial
The default Go 1.11 version on Travis doesn't work with C++11/C++14:

  gcc_libinit.c:110:3: error: implicit declaration of function ‘nanosleep’

so switch to another gimme version of Go.
2019-05-09 07:41:17 +01:00
William S Fulton
3ccc904b06 Fix php pragmas example include path
Was not working for out of source builds
2019-05-09 07:35:24 +01:00
Zackery Spytz
2f48bec666 Merge remote-tracking branch 'upstream/master' into OCaml-INPUT-OUTPUT-INOUT-primitives 2019-05-08 14:05:02 -06:00
William S Fulton
f06330e720 Move Scilab Travis testing from trusty to xenial 2019-05-07 23:05:53 +01:00
William S Fulton
ed1fabe867 Switch php 7.2 testing to xenial 2019-05-07 19:42:07 +01:00
William S Fulton
ccbc451c7c Disable Travis php 7.2 testing
There is a certificate error on the unsupported Ubuntu Trusty machines.
Php 7.2 is segfaulting on Ubuntu Xenial, so there is work to be done.
2019-05-07 19:38:37 +01:00
William S Fulton
49195c5361 Specify Go version to test with c++11
Default version of Go 1.11.1 on Travis is broken for c++11 testing.

gcc_libinit.c: In function ‘_cgo_try_pthread_create’:
gcc_libinit.c:110:3: error: implicit declaration of function ‘nanosleep’ [-Werror=implicit-function-declaration]
   nanosleep(&ts, nil);
2019-05-04 22:47:19 +01:00
William S Fulton
32c9e2ada8 Travis testing GCC=5 not needed for xenial.
Default compiler is gcc 5 on xenial.
2019-05-04 22:31:48 +01:00
William S Fulton
0cf01afc54 Windows documentation minor improvement 2019-05-04 22:28:35 +01:00
William S Fulton
4539041c50 Travis output optimisation during configure 2019-05-02 21:57:58 +01:00
William S Fulton
00fb2e5629 Travis output optimisation 2019-05-02 21:57:58 +01:00
William S Fulton
25c0397ec4 Travis testing gcc versions
gcc-4.5 has package dependency problems
Add gcc-4.9
2019-05-02 21:57:58 +01:00
William S Fulton
256446d290 Expand Travis testing of core SWIG compilation to include more gcc versions 2019-05-02 21:57:58 +01:00
William S Fulton
48e61eea1d Travis gcc version refactor
Use GCC env variable to hold gcc version to install instead of SWIG_CC
and SWIG_CXX.
2019-05-02 21:57:53 +01:00
William S Fulton
be019a03ce Appveyor testing - make sure language tests are not mistakenly skipped 2019-05-02 19:15:49 +01:00
William S Fulton
78a1515f46 OCaml testing requires camlp4 2019-05-02 07:41:35 +01:00
William S Fulton
dbb5fdda01 Fix php pragmas example
. is not always in the include_path by default
2019-04-30 23:44:41 +01:00
William S Fulton
5d976b0ebe Fix php testcase warning 2019-04-30 23:44:41 +01:00
William S Fulton
9d0cf2ce61 Remove duplicate Travis xenial Octave testing 2019-04-30 23:44:41 +01:00
William S Fulton
6606a164f0 Migrate Travis tests from trusty to xenial
Ubuntu trusty 14.04 is end of life April 2019.
Ubuntu xenial 16.04 is the main platform for Travis now.
Some languages are not working on xenial, so I've left them on trusty
for now.
2019-04-30 23:44:33 +01:00
William S Fulton
6a91723fcf Bump version to 4.0.1 2019-04-28 21:01:21 +01:00
William S Fulton
9c3faeb0ee Travis testing of Go changes
Use gimme to install a version of Go to test. Travis already uses gimme
to pre-install a version of Go.
Switch some of the Go testing from travis to xenial.
2019-04-26 19:48:33 +01:00
William S Fulton
2937f05296 Add 4.0.0 release date 2019-04-26 19:21:40 +01:00
William S Fulton
11b54b0cbd Fix command line error handling to work like in 3.0.12
Output is once again:

  $ swig -versioon
  Unable to find option or file '-versioon', Use 'swig -help' for more information.

instead of

  $ swig -versioon
  No target language specified
2019-04-25 23:13:51 +01:00
Ian Lance Taylor
8a1c09e280 Fix Go tests to run in module mode
Stop using relative imports and add a go.mod file.

Tested against Go 1.6 through Go pre-1.13, and gccgo.
2019-04-24 21:43:38 -07:00
William S Fulton
b04cc850ab Add recent doxygen fixes to changes file 2019-04-24 08:13:19 +01:00
William S Fulton
fbed720b98 Merge branch 'enum-trailing-comma-doxygen'
* enum-trailing-comma-doxygen:
  Fix parsing of enums with trailing comma with -doxygen
2019-04-24 08:08:18 +01:00
William S Fulton
8df627eab8 HTML section numbering update 2019-04-24 08:06:10 +01:00