summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into travis-osxtravis-osxWilliam S Fulton2015-08-1243-404/+1370
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Workaround Appveyor random failures due to nuget install errors Revert "Merge pull request #494 from richardbeare/enumR2015B" This is a modification to support use of tricky enumerations in R. It includes the addition of a _runme for an existing test - preproc_constants that was previously not run. That tests includes a preprocessor based setting of an enumeration which is ignored by the existing r enumeration infrastructure. The new version correctly reports the enumeration value as 4 - previous versions set it to 0. Traditional enumerations are unchanged. [Go] Renamed 'FooBarAbs' to 'FooBarAbstract' in the documentation and examples. [Go] Updated the 'callback' and 'extend' examples to match the 'director' one. [Go] Revert commit 5e88857 to undelete the 'callback' and 'extend' examples. update CHANGES.current check ranges in perlprimtype.swg more carefully to avoid clang warnings capture the current behavior of perlprimtypes.swg is more detail Changes entry for numpydoc conforming docstrings. pep257 & numpydoc conforming docstrings Make (char*, size_t) typemap usable for strings of other types in Java. [Go] update build instructions in Examples/go/index.html [Go] Documentation cleanup of obsolete 'callback' and 'extend' examples. Some minor changes after first code review by ianlancetaylor. Fixed Examples/go/director/Makefile as there might be no copy of director.go during clean if a separate build directory is in use. Fixed Examples/go/director/Makefile as the copy of director.go wasn't cleaned up in separate build directories. Fixed Examples/go/director/Makefile as director.go was missing in separate build directories. Removed empty line in table of contents of the Go documentation. Fleshed out Go's documentation about the director feature and added a director example. Bump version to 3.0.8 Update Scilab test-suite output wording Add 3.0.7 release summary and release date Test case warning suppression for visual c++ fix
| * Workaround Appveyor random failures due to nuget install errorsWilliam S Fulton2015-08-122-1/+29
| | | | | | | | | | Add and use nuget-install.cmd based on https://github.com/appveyor/ci/blob/master/scripts/nuget-restore.cmd
| * Revert "Merge pull request #494 from richardbeare/enumR2015B"Joseph C Wang2015-08-1114-1072/+1065
| | | | | | | | | | This reverts commit cb8973f3139d4d31d731cd8020641a70c7c293b1, reversing changes made to ac3284f78c3af61027ffe4765ba50161670d929e.
| * Merge pull request #494 from richardbeare/enumR2015Bjoequant2015-08-1014-1065/+1072
| |\ | | | | | | replacement for enumR2015 - tidied and rebased
| | * This is a modification to support use of tricky enumerations in R. ItRichard Beare2015-08-1014-1065/+1072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes the addition of a _runme for an existing test - preproc_constants that was previously not run. That tests includes a preprocessor based setting of an enumeration which is ignored by the existing r enumeration infrastructure. The new version correctly reports the enumeration value as 4 - previous versions set it to 0. Traditional enumerations are unchanged. The approach used to deal with these enumerations is similar to that of other languages, and requires a call to a C function at runtime to return the enumeration value. The previous approach figured out the values statically and this is still used where possible. The need for a runtime call leads to changes in when swig code is used in packages - see below. One test that previously passed now fails - namely the R sourcing of preproc_constants.R, as the enumeration code requires the shared library, which isn't loaded by that script. There is also a modification to the way the R _runme.R files are used. The call to R CMD BATCH now includes a --args option that indicates the source folder for the unittest.R file, and the first couple of lines of the _runme.R files deal with correctly locating this. Out of source tests now run correctly. This work was motivated by problems generating the SimpleITK binding, specifically with some of the more complex enumerations. This approach does have some issues wrt to code in packages, but I can't see an alternative. The problem with packages is that the R code setting up the enumeration structures requires the shared library so that the C functions returning enumeration values can be called. The enumeration setup code thus needs to be moved to the package initialisation section. For SimpleITK I do this using an R script, which I think is an acceptable solution. The core part of the process is the following function. I dump all the enumeration stuff into a .onload function. This is only necessary if some of the enumerations are tricky. splitSwigFile <- function(filename, onloadfile, mainfile) { p1 <- parse(file=filename) getdefineEnum <- function(X) { return (is.call(X) & (X[[1]]=="defineEnumeration")) } dd <- sapply(p1, getdefineEnum) enums <- p1[dd] enums <- unlist(lapply(enums, deparse)) enums <- c(".onLoad <- function(libname, pkgname) {", enums, "}") everythingelse <- p1[!dd] everythingelse <- unlist(lapply(everythingelse, deparse)) writeLines(everythingelse, mainfile) writeLines(enums, onloadfile) }
| * | Merge branch 'talby--surgical-perlprimtypes-fix'William S Fulton2015-08-094-15/+101
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * talby--surgical-perlprimtypes-fix: update CHANGES.current check ranges in perlprimtype.swg more carefully to avoid clang warnings capture the current behavior of perlprimtypes.swg is more detail
| | * | update CHANGES.currentRobert Stone2015-08-081-0/+3
| | | |
| | * | check ranges in perlprimtype.swg more carefully to avoid clang warningsRobert Stone2015-08-081-13/+18
| | | |
| | * | capture the current behavior of perlprimtypes.swg is more detailRobert Stone2015-08-082-2/+80
| | | |
| * | | Merge pull request #493 from michael-schaller/dir-examplesIan Lance Taylor2015-08-0922-145/+552
| |\ \ \ | | |/ / | |/| | [Go] Undelete and updated the 'callback' and 'extend' examples.
| | * | [Go] Renamed 'FooBarAbs' to 'FooBarAbstract' in the documentation and examples.Michael Schaller2015-08-095-140/+144
| | | |
| | * | [Go] Updated the 'callback' and 'extend' examples to match the 'director' one.Michael Schaller2015-08-0912-100/+130
| | | | | | | | | | | | | | | | | | | | After the documentation update on how to utilize the director feature with commit @17b1c1c the 'callback' and 'extend' examples needed an update as well.
| | * | [Go] Revert commit 5e88857 to undelete the 'callback' and 'extend' examples.Michael Schaller2015-08-0914-1/+374
| |/ / | | | | | | | | | | | | | | | | | | The 'callback' and 'extend' examples were presumed to be obsoleted by the new 'director' example. The examples are helpful though to have similar examples across target languages and hence the commit @5e88857 which removed these examples got reverted.
| * | Changes entry for numpydoc conforming docstrings.William S Fulton2015-08-071-0/+8
| | | | | | | | | | | | Changes entry for 92328a. Closes #383.
| * | pep257 & numpydoc conforming docstringsxantares2015-08-074-124/+156
| | |
| * | Merge pull request #487 from vadz/char-bin-typeWilliam S Fulton2015-08-077-3/+37
| |\ \ | | |/ | |/| Make (char*, size_t) typemap usable for strings of other types in Java.
| | * Make (char*, size_t) typemap usable for strings of other types in Java.Vadim Zeitlin2015-08-077-3/+37
| |/ | | | | | | | | | | | | Notably it now works for "unsigned char*" strings. Add a test to check that it now works in Java and also showing that it already worked for the other languages with support for this typemap.
| * [Go] update build instructions in Examples/go/index.htmlIan Lance Taylor2015-08-051-17/+25
| |
| * Merge pull request #486 from michael-schaller/dir-cleanupIan Lance Taylor2015-08-0514-376/+3
| |\ | | | | | | [Go] Cleanup of obsolete 'callback' and 'extend' examples.
| | * [Go] Documentation cleanup of obsolete 'callback' and 'extend' examples.Michael Schaller2015-08-0514-376/+3
| |/ | | | | | | | | After commit 17b1c1c (pull request 447; issue 418) the 'callback' and 'extend' examples have been removed in favor of the 'director' example.
| * Merge pull request #447 from michael-schaller/docIan Lance Taylor2015-08-048-22/+743
| |\ | | | | | | Fleshed out Go's documentation about the director feature and added a director example.
| | * Some minor changes after first code review by ianlancetaylor.Michael Schaller2015-08-042-37/+37
| | | | | | | | | | | | | | | Renamed overwritenMethodsOnFooBarAbs to overwrittenMethodsOnFooBarAbs. Changed some line breaks.
| | * Fixed Examples/go/director/Makefile as there might be no copy of director.go ↵Michael Schaller2015-08-041-1/+1
| | | | | | | | | | | | during clean if a separate build directory is in use.
| | * Fixed Examples/go/director/Makefile as the copy of director.go wasn't ↵Michael Schaller2015-08-041-0/+3
| | | | | | | | | | | | cleaned up in separate build directories.
| | * Fixed Examples/go/director/Makefile as director.go was missing in separate ↵Michael Schaller2015-08-041-0/+3
| | | | | | | | | | | | build directories.
| | * Removed empty line in table of contents of the Go documentation.Michael Schaller2015-08-041-1/+0
| | |
| | * Fleshed out Go's documentation about the director feature and added a ↵Michael Schaller2015-08-048-22/+738
| |/ | | | | | | | | | | director example. Fixes issues #418.
| * Bump version to 3.0.8William S Fulton2015-08-036-129/+126
| |
| * Update Scilab test-suite output wordingWilliam S Fulton2015-08-031-2/+2
| |
| * Add 3.0.7 release summary and release datev3.0.7rel-3.0.7William S Fulton2015-08-025-5/+23
| |
| * Test case warning suppression for visual c++ fixWilliam S Fulton2015-08-021-4/+4
| |
* | Merge branch 'master' into travis-osxWilliam S Fulton2015-08-0280-666/+1713
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Test case warning suppression for visual c++ Cosmetic corrections - Mac OS X testcase warning fix HTML fix in docs Tweak configure output for Java Don't check for all the languages in Travis language-specific builds. Skip check for pep8 if Python is disabled in configure. Make configure --without-alllang option actually useful. Cosmetic: fix wrong configure options indentation in --help. Don't duplicate Java headers path under OS X in configure. Fix potential security exploit in generated Java classes SWIG_LIB fix for out of source MinGW builds Move MinGW mixed path conversion code to the pathconvert tool Use JAVA_HOME value in configure to detect Java. Improve configure output when python is not installed Remove executable permission from appveyor.yml. Ocaml configure changes Consistent memory initialization in php typemaps. Initialise all newly created arrays in arrays.i library. Consistent memory intiailization between C and C++ in typemaps Restored broken ignoring of operators etc. Added more comments. Improve python code indentation warning / error messages Function comment header formatting corrections Improve Python docstring indentation handling Avoid gcc uninitialized variable warnings in Python wrappers. Typemap attribute fixes Add documentation and CHANGES for special variables and typemap attributes. Support special variable expansion in special variable macros in typemap attributes. Enable variable and typemap substitution in typemap kwargs, and a test that verifies this works for directorin:descriptor. refactoring: 2 ways of ignoring symbol in add_symbols() merged for clarity explicitly %ignore'd symbol does not get feature:ignore if it is only added to C symbol table Remove callback function from autodoc unit test. Octave 4.0 fails in Travis Make callback unit test pass for PHP backend. Add changes note for Python tp_doc slot and docstring Clearer variable name in Java director generated code warning fixes String / char * usage in parser fixes const char * fixes in the parser Update CHANGES.current and Octave.html to indicate Octave 4.0.0 support Octave: use correct mkoctfile executable Add octave 4.0 to travis Fix compile flags for Travis C++11 testing Travis testing c++11 and gcc5 c++11 test case fixes Fix default_constructor_runme.m test Add #include <climits> for INT_MAX Update print() signature for octave 4.0 Set class docstring in tp_doc slot for python -builtin Travis testing extended to test c++11 and c++14 with gcc-5 Configuring C++11 compiler flags for testing fix Support for octave 4.0.0 Don't generate constructor wrappers if a base class has a private constructor Test-suite fixes for c++11 compilation by g++-5.1 Fix incorrect test case code Set OCAMLC to empty if Ocaml compiler not found Bump version to 3.0.7 Unused method warning suppression for Javascript v8 Add 3.0.6 release notes and release date Html doc fixes Testcase workaround for Solaris parent_class testcase name warning fixes for PHP Use "mixed" path to source directory under Cygwin.
| * Test case warning suppression for visual c++William S Fulton2015-08-022-0/+12
| |
| * Cosmetic corrections - Mac OS XWilliam S Fulton2015-08-029-18/+18
| |
| * testcase warning fixWilliam S Fulton2015-08-021-1/+1
| |
| * HTML fix in docsWilliam S Fulton2015-08-021-1/+1
| |
| * Merge branch 'vadz-better-no-all'William S Fulton2015-08-023-62/+73
| |\ | | | | | | | | | | | | | | | | | | | | | * vadz-better-no-all: Don't check for all the languages in Travis language-specific builds. Skip check for pep8 if Python is disabled in configure. Make configure --without-alllang option actually useful. Cosmetic: fix wrong configure options indentation in --help.
| | * Don't check for all the languages in Travis language-specific builds.Vadim Zeitlin2015-08-021-0/+1
| | | | | | | | | | | | This should speed up configure and shorten its output.
| | * Skip check for pep8 if Python is disabled in configure.Vadim Zeitlin2015-08-021-6/+6
| | | | | | | | | | | | | | | There is no need for it, nor any other Python-related variables, to be defined if Python is not used.
| | * Make configure --without-alllang option actually useful.Vadim Zeitlin2015-08-022-48/+58
| | | | | | | | | | | | | | | | | | | | | | | | Use it to disable all languages by default, but still allow enabling individual languages by explicitly using --with-lang options for them. E.g. to enable tests for Java only "--without-alllang --with-java" can now be used to skip the configure checks for all the other languages.
| | * Cosmetic: fix wrong configure options indentation in --help.Vadim Zeitlin2015-08-021-8/+8
| | | | | | | | | | | | | | | | | | Ensure that help for all options starts in the same column (unless the options are too long, as --with-guile-config=path, but at least avoid indenting it by a tab stop then).
| * | Tweak configure output for JavaWilliam S Fulton2015-08-021-3/+4
| | |
| * | Merge branch 'vadz-java-home'William S Fulton2015-08-022-17/+95
| |\ \ | | |/ | |/| | | | | | | | | | | | | * vadz-java-home: Don't duplicate Java headers path under OS X in configure. Use JAVA_HOME value in configure to detect Java. Remove executable permission from appveyor.yml.
| | * Don't duplicate Java headers path under OS X in configure.Vadim Zeitlin2015-08-021-4/+4
| | | | | | | | | | | | | | | | | | Use /System/Library/Frameworks/JavaVM.framework/Headers in a single place only to make it easier to change it later and, hopefully, make the rather convoluted process of Java detection under OS X slightly more clear.
| | * Use JAVA_HOME value in configure to detect Java.Vadim Zeitlin2015-08-012-17/+95
| | | | | | | | | | | | | | | | | | This is simpler than having to use --with-java, --with-javac and --with-javaincl options and, even more importantly, will usually just work by default.
| | * Remove executable permission from appveyor.yml.Vadim Zeitlin2015-08-011-0/+0
| | | | | | | | | | | | This is not an executable file.
| * | Fix potential security exploit in generated Java classesWilliam S Fulton2015-08-027-27/+42
| | |
| * | Merge branch 'vadz-msw-srcdir'William S Fulton2015-08-021-6/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | * vadz-msw-srcdir: SWIG_LIB fix for out of source MinGW builds Use "mixed" path to source directory under Cygwin.
| | * | SWIG_LIB fix for out of source MinGW buildsWilliam S Fulton2015-08-021-3/+2
| | | |
| | * | Use "mixed" path to source directory under Cygwin.Vadim Zeitlin2015-06-241-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | This allows build to work with both native and Cygwin builds of SWIG and doesn't restrict us to building in the source directory as was the case previously because SWIG_LIB was explicitly not set under Windows.