Merge branch 'master' into coverity-scan

* master: (378 commits)
  Restore full Travis testing since javascript branch merge
  Revert "Remove unnecessary Javascript installs on Travis"
  Remove unnecessary Javascript installs on Travis
  Javascript cosmetic changes
  Fix some typos
  Javascript: ensure banner appears before %begin code
  [PHP] The generated __isset() method now returns true for read-only properties.
  Eliminate needless casting away const from string constants
  Fix typos
  Enable Javascript in director_nspace_director_name_collision.i.
  Make javascript 'nspace' conform to corresponding lua example.
  Added some documentation on using 'node-webkit'.
  Fix missing ")" in code example
  Fix comment typos
  Fix m4 quoting of checks for yodl2man and yodl2html versions
  Enable javascript examples 'exception', 'namespace'.
  Fix bug and regression in javascript namespace generator.
  Prettify generated output in JS emitters.
  Fix node-gyp configuration for example 'exception'.
  Fix regression of 226da4.
  Print error when specified multiple js engines.
  Removed obsolete 'node.i'.
  Added a comment about V8_VERSION macro.
  Restore missing copyright info in javascript branch
  beautify javascript.cxx
  Javascript variable naming convention corrections
  Javascript test-suite - warning suppression not needed
  Javascript example Makefiles more consistent with other languages
  Cosmetic code changes in javascript.cxx
  Fix regression in Javascript generator for enums.
  Fix configuration for Javascript/node ctests.
  SKIP_JAVASCRIPT only when there is none of v8/node/jsc.
  Fix generator for Javascript enums.
  Turn on Swig_cparse_cplusplusout for Javascript/v8.
  Fix configuration for ctest with Javascript/v8.
  Add cast to test 'string_simple' to avoid C++ compiler error.
  Add 'fix' for Javascript/v8 to test 'enum_forward'.
  Fixed errors from previous commit.
  Removed all unnecessary asserts
  Remove unused variable
  Another go html fix
  Fix intgosize arg documentation
  Optimize metamethods inheritance resolving
  Updating documentation
  Only disable javascript tests if node-gyp is missing when testing node
  Revert "Javascript node test-suite makefile fixes for parallel make"
  Suppress keyword warning in test-suite
  Restore and fix infinity testcase for Javascript
  Simple C string test
  Javascript node test-suite makefile fixes for parallel make
  Restore missing make code in javascript branch
  Javascript test-suite makefile update
  ADD RUNPIPE and RUNTOOL to Javascript examples
  Remove unnecessary blank lines from Javascript examples
  Detect node-gyp at configure time and show version in javascript_version target
  Fix typo in Javascript exception
  Whitespace cleanup of Example Makefiles
  .gitignore: ignore Lib/swigwarn.swg
  Revert css style changes in javascript branch
  Add missing license info
  Javascript html documentation tidy up
  Improve missing JS engine error message
  a few Javascript clarifications in configure.ac
  Makefile and autoconf file tidy up for Javascript
  Fixing unused variable warnings
  Finish implementation with proxy functions
  Tidy up Example makefile for Javascript
  Alphabetical order for Javascript in -help output
  Remove junk files
  Remove duplicate declarations of strtoimax and strtoumax in inttypes.i
  Ignored enum fixes.
  Further shift operator regression fixes
  Fix use of shift operators in expressions regression since 3.0.0
  Fix seg fault with extra ) brackets and >>
  More efficient end of template bracket (>>) handling
  beautify scanner.c
  Tidy up scanner.c
  DOH readme correction
  Fix typo in -lua -help output
  Remove extra </div>
  Update documentation for deprecation and removal of Close()
  Fix segfault when there are too many closing round brackets in parsed code
  Refix operator<< definition giving a syntax error
  Fix regression in 3.0.0 where legal code following an operator<< definition might give a syntax error.
  Remove unnecessary block from PHP version of SWIG_exception macro
  [PHP] Fix wrapping director constructors with default parameters with a ZTS-enabled build of PHP.
  Travis file code consistency
  Turn on Travis testing on javascript branch
  Add javascript to Sections.html
  Optimized travis before_install for Javascript.
  Document Javascript related preprocessor macros.
  Updated Javascript documentation.
  Insert a workaround for c_delete and c_delete_function for v8.
  Update Javascript.html.
  Remove inadvertently added xcode file.
  Remove gdb pretty printing.
  Remove cmake relict.
  Remove pandoc toolchain.
  Remove Javascript documentation source file.
  Revert "Development version for travis configuration."
  Fix travis configuration.
  Fix regression in custom v8 interpreter.
  Development version for travis configuration.
  Generalized smoke test configuration.
  Add 'version' target for javascript.
  Merged branch 'devel' from https://github.com/oliver----/swig-v8 (squashed commit):
  Add check to skip javascript test-suite if default interpreter is not installed.
  Activate travis matrix for different Javascript interpreters.
  Beautified Javascript module.
  Fix regressions.
  Removed obsolete paragraph from Javascript documentation.
  Fix pandoc filter.
  Minor tweaks in Javascript documentation.
  Adding a chapter about Javascript tests and examples.
  Minor change in Javascript configuration.
  Fix issues that were observed with newer JavascriptCore.
  Add missing copy ctor for Javascript Code Template class.
  Removed CMake.
  Fix regression in Javascript configuration.
  Fix regressions in configuration of some Javascript examples.
  More gitignores filtering Javascript related files.
  Fix custom javascript interpreter configuration for OSX.
  Make examples work with node.js and the custom interpreter.
  Introduced an extra Makefile for the custom javascript interpreter.
  Fix travis configuration.
  Added a comment.
  Fix regressions in Javascript example configuration.
  Fix issue with strange constants under OSX.
  Some fixes in example section of Javascript documentation.
  Add note about '-node' command line flag for Node.js code generation.
  Added examples to Javascript module documentation.
  Simplification in common javascript example Makefile.
  Add an extra argument for enabling nodejs support.
  Add more notes about how to install node.
  Better error message when no Javascript emitter is specified.
  Deactivated broken JS examples.
  Refactored configuration for javascript examples.
  Beginning to document v8 integration.
  Documented extending Node.js and Webkit's Javascript engine.
  Pandoc filter detects shell blocks when not explicitely given.
  Conitnued documenting the Javascript module.
  Not a real change.
  Add a pandoc filter to create compatible html.
  Add Javascript to chapters.
  More Javascript module documentation.
  Next iteration on creating a documentation for the Javascript module.
  Next iteration on creating a documentation for the Javascript module.
  Travis configuration for Javascript branch.
  Javascript examples.
  Javascript documentation.
  CMake configuration.
  Fix regression.
  Fix test configuration.
  Trying to install former working version of nodejs.
  Fix test configuration for nodejs.
  Add stub std_deque.i files.
  Add non pretty printing function to Templates.
  Fix bug with typedefd function pointers.
  Add some test runners.
  Fix emitter for member pointer constants.
  Fix %nspace support and activated relevant tests.
  Disable warnings for some v8 test-cases.
  Fix regression.
  Bugfix in argument marshalling.
  Disable testcase 'typemap_variables' for v8.
  Bugfix for Javascript generator.
  Replace $symname in generated function wrappers.
  Add missing macros.
  Let v8 generated code include stdlib.h
  Add cdata.i typemaps.
  Rearrange generation of init block to have custom init code within the initializer body.
  Make JSC inheritance definition more robust.
  Removed dead code.
  Bugfix for JSC %typemap(out) std::string&.
  Fix typemap declarations for (unsigned) long long.
  Add support for IN/OUTPUT typemaps.
  removed Clear before Dispose from newer v8 code, consider the following code: template <class T> void Persistent<T>::Dispose() {   if (this->IsEmpty()) return; //Clear will trigger this   V8::DisposeGlobal(reinterpret_cast<internal::Object**>(this->val_));   ... }
  fixed newer v8 compilation
  Add stub 'typemaps.i' files.
  Bugfix Javascript generator: valid name for dispatcher functions.
  Fix Javascript generator for smartpointeraccessed variables.
  Bugfix for Javascript generator: avoid duplicate action code generation.
  Bugfix in Javascript generator: detect member setter/getters correctly.
  Fix configuration for nodejs based tests.
  Some fixes and cleanup in Javascript generator.
  Fix settings for building nodejs tests.
  Add support for PackedData to Javascript generator.
  Added two more Javascript tests.
  Some fixes for the Javascript generator.
  Redefined set of Javascript smoke tests.
  Clean up in `javascripttypemaps.swg`.
  Fix v8 generator to use a non clashing name for built-in 'equals' method.
  Fix Javascript generator to use %renamed variable names.
  Activate Javascript test-cases `rename_simple` and `rename_scope`.
  Activate Javascript testcases `rename1-4`.
  Add `infinity` test-case to list of smoke tests.
  Added unit test using C99 INFINITY. This test actually tests a float conversion bug where converting to float imposed overflow checking which should not be there and causes this program to error out. This was seen originally in Javascript, but it turns out Python has the same bug. Lua does not have this bug. Other generators have not been tested.
  Bug-fix for static variables as proposed by Kota Iguchi.
  Let Travis test all three targets.
  Allow to run the test suite with our list of smoke tests.
  ...

Conflicts:
	.travis.yml

1 files changed, 1 insertions, 1 deletions

diff --git a/Examples/lua/import/Makefile b/Examples/lua/import/Makefile
index 0bf47c1a5..0a9aebd57 100644
--- a/Examples/lua/import/Makefile
+++ b/Examples/lua/import/Makefile
@@ -2,7 +2,7 @@ TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SWIGOPT    =
 LIBS       =
- 
+
 check: build
 	$(MAKE) -f $(TOP)/Makefile lua_run