Merge branch 'master' into matlab

.gitignore

@@ -47,7 +47,6 @@ CCache/autom4te.cache/
 CCache/config.h.in
 CCache/configure
 Source/Include/swigconfig.h.in
-Source/Include/swigconfig.h.in~
 Source/Makefile.in
 Tools/config/compile
 Tools/config/config.guess
@@ -85,8 +84,6 @@ swig.spec
 # Build Artifacts
 .dirstamp
 CCache/ccache-swig
-CCache/ccache-swig.1
-CCache/web/ccache-man.html
 Lib/swigwarn.swg
 Source/CParse/parser.c
 Source/CParse/parser.h
@@ -96,69 +93,112 @@ swig
 Tools/javascript/javascript
 
 # Generated documentation
-Doc/Manual/CCache.html
 Doc/Manual/SWIGDocumentation.html
 Doc/Manual/SWIGDocumentation.pdf
 Doc/Manual/*.book
 
-# Test Suite Generated Files
-Examples/test-suite/allegrocl/*/
-Examples/test-suite/cffi/*/
-Examples/test-suite/chicken/*/
-Examples/test-suite/clisp/*/
-Examples/test-suite/csharp/*/
-Examples/test-suite/d/*/
-Examples/test-suite/go/*/
-Examples/test-suite/guile/*/
-Examples/test-suite/java/*/
-Examples/test-suite/javascript/*/
-Examples/test-suite/lua/*/
-Examples/test-suite/mzscheme/*/
-Examples/test-suite/ocaml/*/
-Examples/test-suite/octave/*/
-Examples/test-suite/perl5/*/
-Examples/test-suite/php/*/
-Examples/test-suite/pike/*/
-Examples/test-suite/python/*/
-Examples/test-suite/r/*/
-Examples/test-suite/ruby/*/
-Examples/test-suite/tcl/*/
-Examples/test-suite/uffi/*/
+# SWIG common generated files
 *_wrap.c
+*_wrap.cpp
 *_wrap.cxx
+*_wrap.h
 *-gypcopy.cxx
 
-# C# generated files
-*_runme.exe.mdb
-*_runme.exe
+# Scratch directories
+Examples/scratch
+
+# Out of source tree build directories
+*build*/
+
+# errors test-suite
+Examples/test-suite/errors/*.newerr
+Examples/test-suite/errors/*.py
+
+########## Language specific files ##########
+
+# C#
+Examples/test-suite/csharp/*/
+*runme.exe.mdb
+*runme.exe
+Examples/csharp/*/*.cs
+!Examples/csharp/*/runme.cs
+
+# D
+Examples/test-suite/d/*/
+Examples/d/**/example.d
+Examples/d/**/example_im.d
+Examples/d/**/runme
+
+# Go
+*.[5689]
+*_gc.c
+Examples/test-suite/go/*.go
+!Examples/test-suite/go/*runme.go
+Examples/test-suite/go/*runme
+Examples/test-suite/go/gopath
+Examples/test-suite/go/testdir
+Examples/go/*/gopath
+Examples/go/*/example.go
+Examples/go/*/runme
+
+# Guile
+Examples/guile/*/my-guile
+
+# Java
+Examples/test-suite/java/*/
+Examples/java/*/*.java
+!Examples/java/*/runme.java
 
-# Javascript generated files
+# Javascript
+Examples/test-suite/javascript/*/
 *.gyp
 
-# Matlab generated files
+# Matlab
 *.mex*
 # module directories
 [+]*/
 # matlab common
 SwigRef.m
 SwigMem.m
 
-# Octave generated files
+# Octave
 swigexample*.oct
 Examples/test-suite/octave/*.oct
 
-# Python generated files, based on:
-#   https://github.com/github/gitignore/blob/master/Python.gitignore
+# Perl5
+Examples/test-suite/perl5/*.pm
+Examples/perl5/*/*.pm
+
+# PHP
+Examples/test-suite/php/php_*.h
+Examples/test-suite/php/*.php
+!Examples/test-suite/php/*runme.php
+!Examples/test-suite/php/skel.php
+Examples/php/*/php_*.h
+Examples/php/*/example.php
+
+# Python
+#   Based on https://github.com/github/gitignore/blob/master/Python.gitignore
 *.py[cod]
 */__pycache__/
 /__pycache__/
+Examples/test-suite/python/*.py
+!Examples/test-suite/python/*runme.py
+Examples/python/*/example.py
+Examples/python/**/bar.py
+Examples/python/**/base.py
+Examples/python/**/foo.py
+Examples/python/**/spam.py
+
+# R
+Examples/test-suite/r/*.R
+Examples/test-suite/r/*.Rout
+!Examples/test-suite/r/*runme.R
+Examples/r/*/example.R
+Examples/r/*/*.Rout
+Examples/r/*/.RData
+
+# Scilab
+Examples/test-suite/scilab/*/
+loader.sce
 
-# Go generated files
-*.[5689]
-*_gc.c
-
-# Scratch directories
-Examples/scratch
-
-# Out of source tree build directories
-*build*/