From 8c07470f4aa2df05a8b0c77382bdac8e4529b468 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 28 2017 08:53:36 +0000 Subject: Update to 3.0.12 Drop Patch1 and Patch2, applied in upstream-tarball --- diff --git a/.gitignore b/.gitignore index f9b4dec..2687fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ swig-2.0.0.tar.gz /swig-3.0.9.tar.gz /swig-3.0.10.tar.gz /swig-3.0.11.tar.gz +/swig-3.0.12.tar.gz diff --git a/sources b/sources index e4912b3..11d5c8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (swig-3.0.11.tar.gz) = 36771bd29fcec159d283f0f8d056937c6c913fec717f1f3b97a9b17fa27a8a85aa5f7b79bec3c46d70b625c36c26e9e856a4750cbd0872070ca18e9174842a52 +SHA512 (swig-3.0.12.tar.gz) = 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb diff --git a/swig-3.0.11_octave-no-core-dump.patch b/swig-3.0.11_octave-no-core-dump.patch deleted file mode 100644 index 108619d..0000000 --- a/swig-3.0.11_octave-no-core-dump.patch +++ /dev/null @@ -1,1395 +0,0 @@ -From 9e66af3fefa07fad0103f97eef8e1dc86b3498ba Mon Sep 17 00:00:00 2001 -From: Karl Wette -Date: Sun, 1 Jan 2017 19:06:51 +1300 -Subject: [PATCH] Octave: do not dump Octave core in examples/test suite - scripts - -- If Octave segfaults during cleanup, it usually cannot dump its core - and therefore just freezes, which hold up e.g Travis build jobs ---- - Examples/octave/callback/runme.m | 5 ++++- - Examples/octave/class/runme.m | 5 ++++- - Examples/octave/constants/runme.m | 5 ++++- - Examples/octave/contract/runme.m | 5 ++++- - Examples/octave/enum/runme.m | 5 ++++- - Examples/octave/extend/runme.m | 5 ++++- - Examples/octave/funcptr/runme.m | 5 ++++- - Examples/octave/funcptr2/runme.m | 5 ++++- - Examples/octave/functor/runme.m | 5 +++++ - Examples/octave/module_load/runme.m | 5 ++++- - Examples/octave/operator/runme.m | 5 +++++ - Examples/octave/pointer/runme.m | 5 ++++- - Examples/octave/reference/runme.m | 5 ++++- - Examples/octave/simple/runme.m | 5 ++++- - Examples/octave/template/runme.m | 5 ++++- - Examples/octave/variables/runme.m | 5 ++++- - Examples/test-suite/octave/abstract_typedef2_runme.m | 5 +++++ - Examples/test-suite/octave/abstract_typedef_runme.m | 5 +++++ - Examples/test-suite/octave/abstract_virtual_runme.m | 5 +++++ - Examples/test-suite/octave/arrays_global_runme.m | 5 +++++ - Examples/test-suite/octave/class_ignore_runme.m | 5 +++++ - Examples/test-suite/octave/complextest_runme.m | 5 +++++ - Examples/test-suite/octave/constover_runme.m | 5 +++++ - Examples/test-suite/octave/constructor_copy_runme.m | 5 +++++ - Examples/test-suite/octave/default_args_runme.m | 5 +++++ - Examples/test-suite/octave/default_constructor_runme.m | 5 +++++ - Examples/test-suite/octave/director_abstract_runme.m | 5 +++++ - Examples/test-suite/octave/director_classic_runme.m | 5 +++++ - Examples/test-suite/octave/director_extend_runme.m | 5 +++++ - Examples/test-suite/octave/director_stl_runme.m | 5 +++++ - Examples/test-suite/octave/director_string_runme.m | 5 +++++ - Examples/test-suite/octave/director_wstring_runme.m | 5 +++++ - Examples/test-suite/octave/dynamic_cast_runme.m | 5 +++++ - Examples/test-suite/octave/empty_c_runme.m | 5 +++++ - Examples/test-suite/octave/empty_runme.m | 5 +++++ - Examples/test-suite/octave/enum_template_runme.m | 5 +++++ - Examples/test-suite/octave/exception_order_runme.m | 5 +++++ - Examples/test-suite/octave/extend_template_ns_runme.m | 5 +++++ - Examples/test-suite/octave/friends_runme.m | 5 +++++ - Examples/test-suite/octave/global_ns_arg_runme.m | 5 +++++ - Examples/test-suite/octave/grouping_runme.m | 5 +++++ - Examples/test-suite/octave/input_runme.m | 5 +++++ - Examples/test-suite/octave/li_attribute_runme.m | 5 +++++ - Examples/test-suite/octave/li_boost_shared_ptr_runme.m | 5 +++++ - Examples/test-suite/octave/li_carrays_cpp_runme.m | 5 +++++ - Examples/test-suite/octave/li_carrays_runme.m | 5 +++++ - Examples/test-suite/octave/li_cmalloc_runme.m | 5 +++++ - Examples/test-suite/octave/li_cpointer_runme.m | 5 +++++ - Examples/test-suite/octave/li_cstring_runme.m | 5 +++++ - Examples/test-suite/octave/li_cwstring_runme.m | 5 +++++ - Examples/test-suite/octave/li_factory_runme.m | 5 +++++ - Examples/test-suite/octave/li_implicit_runme.m | 5 +++++ - Examples/test-suite/octave/li_std_pair_extra_runme.m | 5 +++++ - Examples/test-suite/octave/li_std_vector_enum_runme.m | 5 +++++ - Examples/test-suite/octave/li_std_wstring_runme.m | 5 +++++ - Examples/test-suite/octave/minherit_runme.m | 5 +++++ - Examples/test-suite/octave/mod_runme.m | 5 +++++ - Examples/test-suite/octave/multi_import_runme.m | 5 +++++ - Examples/test-suite/octave/naturalvar_runme.m | 5 +++++ - Examples/test-suite/octave/null_pointer_runme.m | 5 +++++ - Examples/test-suite/octave/octave_cell_deref_runme.m | 5 +++++ - Examples/test-suite/octave/overload_complicated_runme.m | 5 +++++ - Examples/test-suite/octave/overload_extend_c_runme.m | 5 +++++ - Examples/test-suite/octave/overload_extend_runme.m | 5 +++++ - Examples/test-suite/octave/overload_simple_cast_runme.m | 5 +++++ - Examples/test-suite/octave/overload_subtype_runme.m | 5 +++++ - Examples/test-suite/octave/preproc_runme.m | 5 +++++ - Examples/test-suite/octave/refcount_runme.m | 5 +++++ - Examples/test-suite/octave/ret_by_value_runme.m | 5 +++++ - Examples/test-suite/octave/smart_pointer_extend_runme.m | 5 +++++ - Examples/test-suite/octave/smart_pointer_overload_runme.m | 5 +++++ - Examples/test-suite/octave/smart_pointer_rename_runme.m | 5 +++++ - Examples/test-suite/octave/smart_pointer_simple_runme.m | 5 +++++ - Examples/test-suite/octave/smart_pointer_typedef_runme.m | 5 +++++ - Examples/test-suite/octave/sneaky1_runme.m | 5 +++++ - Examples/test-suite/octave/static_const_member_2_runme.m | 5 +++++ - Examples/test-suite/octave/std_containers_runme.m | 5 +++++ - Examples/test-suite/octave/struct_value_runme.m | 5 +++++ - Examples/test-suite/octave/swigobject_runme.m | 5 +++++ - Examples/test-suite/octave/template_default_arg_runme.m | 5 +++++ - Examples/test-suite/octave/template_extend1_runme.m | 5 +++++ - Examples/test-suite/octave/template_extend2_runme.m | 5 +++++ - Examples/test-suite/octave/template_inherit_runme.m | 5 +++++ - Examples/test-suite/octave/template_matrix_runme.m | 5 +++++ - Examples/test-suite/octave/template_ns4_runme.m | 5 +++++ - Examples/test-suite/octave/template_opaque_runme.m | 5 +++++ - Examples/test-suite/octave/template_ref_type_runme.m | 5 +++++ - Examples/test-suite/octave/template_static_runme.m | 5 +++++ - Examples/test-suite/octave/template_typedef_cplx4_runme.m | 5 +++++ - Examples/test-suite/octave/template_typedef_import_runme.m | 5 +++++ - Examples/test-suite/octave/typedef_class_runme.m | 5 +++++ - Examples/test-suite/octave/typedef_inherit_runme.m | 5 +++++ - Examples/test-suite/octave/typename_runme.m | 5 +++++ - Examples/test-suite/octave/using1_runme.m | 5 +++++ - Examples/test-suite/octave/using2_runme.m | 5 +++++ - Examples/test-suite/octave/using_composition_runme.m | 5 +++++ - Examples/test-suite/octave/using_extend_runme.m | 5 +++++ - Examples/test-suite/octave/using_protected_runme.m | 5 +++++ - Examples/test-suite/octave/voidtest_runme.m | 5 +++++ - 99 files changed, 481 insertions(+), 14 deletions(-) - -diff --git a/Examples/octave/callback/runme.m b/Examples/octave/callback/runme.m -index 1039853..a9f2d98 100644 ---- a/Examples/octave/callback/runme.m -+++ b/Examples/octave/callback/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - # This file illustrates the cross language polymorphism using directors. - -diff --git a/Examples/octave/class/runme.m b/Examples/octave/class/runme.m -index 04221b4..62b2db0 100644 ---- a/Examples/octave/class/runme.m -+++ b/Examples/octave/class/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - # This file illustrates the proxy class C++ interface generated - # by SWIG. -diff --git a/Examples/octave/constants/runme.m b/Examples/octave/constants/runme.m -index c6ed245..535280b 100644 ---- a/Examples/octave/constants/runme.m -+++ b/Examples/octave/constants/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/contract/runme.m b/Examples/octave/contract/runme.m -index fa36bbe..f388e61 100644 ---- a/Examples/octave/contract/runme.m -+++ b/Examples/octave/contract/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/enum/runme.m b/Examples/octave/enum/runme.m -index 0108135..f0c4101 100644 ---- a/Examples/octave/enum/runme.m -+++ b/Examples/octave/enum/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/extend/runme.m b/Examples/octave/extend/runme.m -index 4536f27..bc73184 100644 ---- a/Examples/octave/extend/runme.m -+++ b/Examples/octave/extend/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - # This file illustrates the cross language polymorphism using directors. - -diff --git a/Examples/octave/funcptr/runme.m b/Examples/octave/funcptr/runme.m -index 4e2e28f..670a099 100644 ---- a/Examples/octave/funcptr/runme.m -+++ b/Examples/octave/funcptr/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/funcptr2/runme.m b/Examples/octave/funcptr2/runme.m -index 574635e..3977b5b 100644 ---- a/Examples/octave/funcptr2/runme.m -+++ b/Examples/octave/funcptr2/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/functor/runme.m b/Examples/octave/functor/runme.m -index 8b41691..f5ab56d 100644 ---- a/Examples/octave/functor/runme.m -+++ b/Examples/octave/functor/runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - # Operator overloading example - swigexample - -diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m -index 30b7bad..0e327ef 100644 ---- a/Examples/octave/module_load/runme.m -+++ b/Examples/octave/module_load/runme.m -@@ -1,4 +1,7 @@ --# file: runme_args.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - # load module - clear all; -diff --git a/Examples/octave/operator/runme.m b/Examples/octave/operator/runme.m -index 83197b4..e17494a 100644 ---- a/Examples/octave/operator/runme.m -+++ b/Examples/octave/operator/runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - # Operator overloading example - swigexample - -diff --git a/Examples/octave/pointer/runme.m b/Examples/octave/pointer/runme.m -index a76de67..1673915 100644 ---- a/Examples/octave/pointer/runme.m -+++ b/Examples/octave/pointer/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample; - -diff --git a/Examples/octave/reference/runme.m b/Examples/octave/reference/runme.m -index 630ee0c..3f66d83 100644 ---- a/Examples/octave/reference/runme.m -+++ b/Examples/octave/reference/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - # This file illustrates the manipulation of C++ references in Octave - -diff --git a/Examples/octave/simple/runme.m b/Examples/octave/simple/runme.m -index 6345df0..3536519 100644 ---- a/Examples/octave/simple/runme.m -+++ b/Examples/octave/simple/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/template/runme.m b/Examples/octave/template/runme.m -index b0abbf2..b7261b7 100644 ---- a/Examples/octave/template/runme.m -+++ b/Examples/octave/template/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/octave/variables/runme.m b/Examples/octave/variables/runme.m -index c678839..71ac72f 100644 ---- a/Examples/octave/variables/runme.m -+++ b/Examples/octave/variables/runme.m -@@ -1,4 +1,7 @@ --# file: runme.m -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif - - swigexample - -diff --git a/Examples/test-suite/octave/abstract_typedef2_runme.m b/Examples/test-suite/octave/abstract_typedef2_runme.m -index 7f364db..e2b41fe 100644 ---- a/Examples/test-suite/octave/abstract_typedef2_runme.m -+++ b/Examples/test-suite/octave/abstract_typedef2_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - abstract_typedef2 - - a = A_UF(); -diff --git a/Examples/test-suite/octave/abstract_typedef_runme.m b/Examples/test-suite/octave/abstract_typedef_runme.m -index f28cf3c..e57f715 100644 ---- a/Examples/test-suite/octave/abstract_typedef_runme.m -+++ b/Examples/test-suite/octave/abstract_typedef_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - abstract_typedef - e = Engine(); - -diff --git a/Examples/test-suite/octave/abstract_virtual_runme.m b/Examples/test-suite/octave/abstract_virtual_runme.m -index 9845a58..d99ca1c 100644 ---- a/Examples/test-suite/octave/abstract_virtual_runme.m -+++ b/Examples/test-suite/octave/abstract_virtual_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - abstract_virtual - - -diff --git a/Examples/test-suite/octave/arrays_global_runme.m b/Examples/test-suite/octave/arrays_global_runme.m -index 619d381..b4f2346 100644 ---- a/Examples/test-suite/octave/arrays_global_runme.m -+++ b/Examples/test-suite/octave/arrays_global_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - arrays_global - - arrays_global.cvar.array_i = arrays_global.cvar.array_const_i; -diff --git a/Examples/test-suite/octave/class_ignore_runme.m b/Examples/test-suite/octave/class_ignore_runme.m -index 76bbcd3..3e52047 100644 ---- a/Examples/test-suite/octave/class_ignore_runme.m -+++ b/Examples/test-suite/octave/class_ignore_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - class_ignore - - a = class_ignore.Bar(); -diff --git a/Examples/test-suite/octave/complextest_runme.m b/Examples/test-suite/octave/complextest_runme.m -index cd0f9f4..6a5433f 100644 ---- a/Examples/test-suite/octave/complextest_runme.m -+++ b/Examples/test-suite/octave/complextest_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - complextest - - a = complex(-1,2); -diff --git a/Examples/test-suite/octave/constover_runme.m b/Examples/test-suite/octave/constover_runme.m -index febcdae..47fdb6f 100644 ---- a/Examples/test-suite/octave/constover_runme.m -+++ b/Examples/test-suite/octave/constover_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - constover - - p = constover.test("test"); -diff --git a/Examples/test-suite/octave/constructor_copy_runme.m b/Examples/test-suite/octave/constructor_copy_runme.m -index 5d52ab5..e450214 100644 ---- a/Examples/test-suite/octave/constructor_copy_runme.m -+++ b/Examples/test-suite/octave/constructor_copy_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - constructor_copy - - f1 = Foo1(3); -diff --git a/Examples/test-suite/octave/default_args_runme.m b/Examples/test-suite/octave/default_args_runme.m -index f8a6560..3d00f63 100644 ---- a/Examples/test-suite/octave/default_args_runme.m -+++ b/Examples/test-suite/octave/default_args_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - default_args - - -diff --git a/Examples/test-suite/octave/default_constructor_runme.m b/Examples/test-suite/octave/default_constructor_runme.m -index ebe553b..b0feaf5 100644 ---- a/Examples/test-suite/octave/default_constructor_runme.m -+++ b/Examples/test-suite/octave/default_constructor_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - default_constructor - - dc = default_constructor; -diff --git a/Examples/test-suite/octave/director_abstract_runme.m b/Examples/test-suite/octave/director_abstract_runme.m -index 00fb676..657e2e1 100644 ---- a/Examples/test-suite/octave/director_abstract_runme.m -+++ b/Examples/test-suite/octave/director_abstract_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_abstract - - MyFoo=@() subclass(director_abstract.Foo(),@ping); -diff --git a/Examples/test-suite/octave/director_classic_runme.m b/Examples/test-suite/octave/director_classic_runme.m -index c1f8e95..167c8ea 100644 ---- a/Examples/test-suite/octave/director_classic_runme.m -+++ b/Examples/test-suite/octave/director_classic_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_classic - - TargetLangPerson=@() subclass(Person(),'id',@(self) "TargetLangPerson"); -diff --git a/Examples/test-suite/octave/director_extend_runme.m b/Examples/test-suite/octave/director_extend_runme.m -index 1cbeac8..3b23e56 100644 ---- a/Examples/test-suite/octave/director_extend_runme.m -+++ b/Examples/test-suite/octave/director_extend_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_extend - - MyObject=@() subclass(SpObject(),'getFoo',@(self) 123); -diff --git a/Examples/test-suite/octave/director_stl_runme.m b/Examples/test-suite/octave/director_stl_runme.m -index e8f4c5e..23990c2 100644 ---- a/Examples/test-suite/octave/director_stl_runme.m -+++ b/Examples/test-suite/octave/director_stl_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_stl - - MyFoo=@() subclass(director_stl.Foo(),\ -diff --git a/Examples/test-suite/octave/director_string_runme.m b/Examples/test-suite/octave/director_string_runme.m -index c2d4e9c..a078c26 100644 ---- a/Examples/test-suite/octave/director_string_runme.m -+++ b/Examples/test-suite/octave/director_string_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_string - - -diff --git a/Examples/test-suite/octave/director_wstring_runme.m b/Examples/test-suite/octave/director_wstring_runme.m -index b59ff6e..99b8e99 100644 ---- a/Examples/test-suite/octave/director_wstring_runme.m -+++ b/Examples/test-suite/octave/director_wstring_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - director_wstring - - -diff --git a/Examples/test-suite/octave/dynamic_cast_runme.m b/Examples/test-suite/octave/dynamic_cast_runme.m -index dad0ba2..b53120b 100644 ---- a/Examples/test-suite/octave/dynamic_cast_runme.m -+++ b/Examples/test-suite/octave/dynamic_cast_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - dynamic_cast - - f = dynamic_cast.Foo(); -diff --git a/Examples/test-suite/octave/empty_c_runme.m b/Examples/test-suite/octave/empty_c_runme.m -index 81264de..9ff6572 100644 ---- a/Examples/test-suite/octave/empty_c_runme.m -+++ b/Examples/test-suite/octave/empty_c_runme.m -@@ -1,2 +1,7 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - empty_c - -diff --git a/Examples/test-suite/octave/empty_runme.m b/Examples/test-suite/octave/empty_runme.m -index e7b64f1..10f72a2 100644 ---- a/Examples/test-suite/octave/empty_runme.m -+++ b/Examples/test-suite/octave/empty_runme.m -@@ -1,2 +1,7 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - empty - -diff --git a/Examples/test-suite/octave/enum_template_runme.m b/Examples/test-suite/octave/enum_template_runme.m -index ca10f1f..a9f940a 100644 ---- a/Examples/test-suite/octave/enum_template_runme.m -+++ b/Examples/test-suite/octave/enum_template_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - enum_template - - if (enum_template.MakeETest() != 1) -diff --git a/Examples/test-suite/octave/exception_order_runme.m b/Examples/test-suite/octave/exception_order_runme.m -index 5ef85f4..b352d52 100644 ---- a/Examples/test-suite/octave/exception_order_runme.m -+++ b/Examples/test-suite/octave/exception_order_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - exception_order - - function check_lasterror(expected) -diff --git a/Examples/test-suite/octave/extend_template_ns_runme.m b/Examples/test-suite/octave/extend_template_ns_runme.m -index 401ea63..e79a00d 100644 ---- a/Examples/test-suite/octave/extend_template_ns_runme.m -+++ b/Examples/test-suite/octave/extend_template_ns_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - extend_template_ns - - f = Foo_One(); -diff --git a/Examples/test-suite/octave/friends_runme.m b/Examples/test-suite/octave/friends_runme.m -index e18f47a..3121156 100644 ---- a/Examples/test-suite/octave/friends_runme.m -+++ b/Examples/test-suite/octave/friends_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - friends - - a = friends.A(2); -diff --git a/Examples/test-suite/octave/global_ns_arg_runme.m b/Examples/test-suite/octave/global_ns_arg_runme.m -index b8f7cfa..bd90b64 100644 ---- a/Examples/test-suite/octave/global_ns_arg_runme.m -+++ b/Examples/test-suite/octave/global_ns_arg_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - global_ns_arg - - a = foo(1); -diff --git a/Examples/test-suite/octave/grouping_runme.m b/Examples/test-suite/octave/grouping_runme.m -index 26b896c..6d1a2d6 100644 ---- a/Examples/test-suite/octave/grouping_runme.m -+++ b/Examples/test-suite/octave/grouping_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - grouping - - x = grouping.test1(42); -diff --git a/Examples/test-suite/octave/input_runme.m b/Examples/test-suite/octave/input_runme.m -index 7578621..1a92d03 100644 ---- a/Examples/test-suite/octave/input_runme.m -+++ b/Examples/test-suite/octave/input_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - input - - f = Foo(); -diff --git a/Examples/test-suite/octave/li_attribute_runme.m b/Examples/test-suite/octave/li_attribute_runme.m -index 548e733..ed051d9 100644 ---- a/Examples/test-suite/octave/li_attribute_runme.m -+++ b/Examples/test-suite/octave/li_attribute_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_attribute - - aa = li_attribute.A(1,2,3); -diff --git a/Examples/test-suite/octave/li_boost_shared_ptr_runme.m b/Examples/test-suite/octave/li_boost_shared_ptr_runme.m -index 1da0a57..b6d5455 100644 ---- a/Examples/test-suite/octave/li_boost_shared_ptr_runme.m -+++ b/Examples/test-suite/octave/li_boost_shared_ptr_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - 1; - li_boost_shared_ptr; - -diff --git a/Examples/test-suite/octave/li_carrays_cpp_runme.m b/Examples/test-suite/octave/li_carrays_cpp_runme.m -index d5b9213..b3b5209 100644 ---- a/Examples/test-suite/octave/li_carrays_cpp_runme.m -+++ b/Examples/test-suite/octave/li_carrays_cpp_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_carrays_cpp - - d = doubleArray(10); -diff --git a/Examples/test-suite/octave/li_carrays_runme.m b/Examples/test-suite/octave/li_carrays_runme.m -index 8ec7e59..c6b5f16 100644 ---- a/Examples/test-suite/octave/li_carrays_runme.m -+++ b/Examples/test-suite/octave/li_carrays_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_carrays - - d = doubleArray(10); -diff --git a/Examples/test-suite/octave/li_cmalloc_runme.m b/Examples/test-suite/octave/li_cmalloc_runme.m -index 45faf73..92bcd95 100644 ---- a/Examples/test-suite/octave/li_cmalloc_runme.m -+++ b/Examples/test-suite/octave/li_cmalloc_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_cmalloc - - p = malloc_int(); -diff --git a/Examples/test-suite/octave/li_cpointer_runme.m b/Examples/test-suite/octave/li_cpointer_runme.m -index bf660a6..ce055cd 100644 ---- a/Examples/test-suite/octave/li_cpointer_runme.m -+++ b/Examples/test-suite/octave/li_cpointer_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_cpointer - - -diff --git a/Examples/test-suite/octave/li_cstring_runme.m b/Examples/test-suite/octave/li_cstring_runme.m -index 0d2bdb7..8aea6b7 100644 ---- a/Examples/test-suite/octave/li_cstring_runme.m -+++ b/Examples/test-suite/octave/li_cstring_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_cstring - - -diff --git a/Examples/test-suite/octave/li_cwstring_runme.m b/Examples/test-suite/octave/li_cwstring_runme.m -index 4cfef7f..1fb0962 100644 ---- a/Examples/test-suite/octave/li_cwstring_runme.m -+++ b/Examples/test-suite/octave/li_cwstring_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_cwstring - - if (count("ab\0ab\0ab\0", 0) != 3) -diff --git a/Examples/test-suite/octave/li_factory_runme.m b/Examples/test-suite/octave/li_factory_runme.m -index d87920d..5ea9b77 100644 ---- a/Examples/test-suite/octave/li_factory_runme.m -+++ b/Examples/test-suite/octave/li_factory_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_factory - - circle = Geometry_create(Geometry.CIRCLE); -diff --git a/Examples/test-suite/octave/li_implicit_runme.m b/Examples/test-suite/octave/li_implicit_runme.m -index 2ca8b59..dd4393a 100644 ---- a/Examples/test-suite/octave/li_implicit_runme.m -+++ b/Examples/test-suite/octave/li_implicit_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_implicit - b = B(); - ai = A(1); -diff --git a/Examples/test-suite/octave/li_std_pair_extra_runme.m b/Examples/test-suite/octave/li_std_pair_extra_runme.m -index 0f9e9a2..473b5e4 100644 ---- a/Examples/test-suite/octave/li_std_pair_extra_runme.m -+++ b/Examples/test-suite/octave/li_std_pair_extra_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_std_pair_extra - - p = {1,2}; -diff --git a/Examples/test-suite/octave/li_std_vector_enum_runme.m b/Examples/test-suite/octave/li_std_vector_enum_runme.m -index 471e7bf..0de7704 100644 ---- a/Examples/test-suite/octave/li_std_vector_enum_runme.m -+++ b/Examples/test-suite/octave/li_std_vector_enum_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_std_vector_enum - - function check(a, b) -diff --git a/Examples/test-suite/octave/li_std_wstring_runme.m b/Examples/test-suite/octave/li_std_wstring_runme.m -index e46c1f2..cbccc0c 100644 ---- a/Examples/test-suite/octave/li_std_wstring_runme.m -+++ b/Examples/test-suite/octave/li_std_wstring_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - li_std_wstring - - x="h"; -diff --git a/Examples/test-suite/octave/minherit_runme.m b/Examples/test-suite/octave/minherit_runme.m -index 24d2091..025db8a 100644 ---- a/Examples/test-suite/octave/minherit_runme.m -+++ b/Examples/test-suite/octave/minherit_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - minherit - - a = minherit.Foo(); -diff --git a/Examples/test-suite/octave/mod_runme.m b/Examples/test-suite/octave/mod_runme.m -index faebf70..6120eee 100644 ---- a/Examples/test-suite/octave/mod_runme.m -+++ b/Examples/test-suite/octave/mod_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - mod_a - mod_b - -diff --git a/Examples/test-suite/octave/multi_import_runme.m b/Examples/test-suite/octave/multi_import_runme.m -index 08149aa..2b7a610 100644 ---- a/Examples/test-suite/octave/multi_import_runme.m -+++ b/Examples/test-suite/octave/multi_import_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - multi_import_a; - multi_import_b; - -diff --git a/Examples/test-suite/octave/naturalvar_runme.m b/Examples/test-suite/octave/naturalvar_runme.m -index 889563f..6059b02 100644 ---- a/Examples/test-suite/octave/naturalvar_runme.m -+++ b/Examples/test-suite/octave/naturalvar_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - naturalvar - - f = Foo(); -diff --git a/Examples/test-suite/octave/null_pointer_runme.m b/Examples/test-suite/octave/null_pointer_runme.m -index 51b6eaf..9d55d8b 100644 ---- a/Examples/test-suite/octave/null_pointer_runme.m -+++ b/Examples/test-suite/octave/null_pointer_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - null_pointer; - - assert(func([])); -diff --git a/Examples/test-suite/octave/octave_cell_deref_runme.m b/Examples/test-suite/octave/octave_cell_deref_runme.m -index 5a98c0a..d00d172 100644 ---- a/Examples/test-suite/octave/octave_cell_deref_runme.m -+++ b/Examples/test-suite/octave/octave_cell_deref_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - octave_cell_deref; - - assert(func("hello")); -diff --git a/Examples/test-suite/octave/overload_complicated_runme.m b/Examples/test-suite/octave/overload_complicated_runme.m -index 0313be9..879bdc8 100644 ---- a/Examples/test-suite/octave/overload_complicated_runme.m -+++ b/Examples/test-suite/octave/overload_complicated_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - overload_complicated - - pInt = None; -diff --git a/Examples/test-suite/octave/overload_extend_c_runme.m b/Examples/test-suite/octave/overload_extend_c_runme.m -index aa6bb5b..79b92ca 100644 ---- a/Examples/test-suite/octave/overload_extend_c_runme.m -+++ b/Examples/test-suite/octave/overload_extend_c_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - overload_extend_c - - f = overload_extend_c.Foo(); -diff --git a/Examples/test-suite/octave/overload_extend_runme.m b/Examples/test-suite/octave/overload_extend_runme.m -index 42c7938..d995980 100644 ---- a/Examples/test-suite/octave/overload_extend_runme.m -+++ b/Examples/test-suite/octave/overload_extend_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - overload_extend - - f = overload_extend.Foo(); -diff --git a/Examples/test-suite/octave/overload_simple_cast_runme.m b/Examples/test-suite/octave/overload_simple_cast_runme.m -index 65bc422..2183510 100644 ---- a/Examples/test-suite/octave/overload_simple_cast_runme.m -+++ b/Examples/test-suite/octave/overload_simple_cast_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - overload_simple_cast - - Ai=@(x) subclass('x',x,'__int',@(self) self.x); -diff --git a/Examples/test-suite/octave/overload_subtype_runme.m b/Examples/test-suite/octave/overload_subtype_runme.m -index b34be97..d1b2091 100644 ---- a/Examples/test-suite/octave/overload_subtype_runme.m -+++ b/Examples/test-suite/octave/overload_subtype_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - overload_subtype - - f = Foo(); -diff --git a/Examples/test-suite/octave/preproc_runme.m b/Examples/test-suite/octave/preproc_runme.m -index 791b38b..e9af66e 100644 ---- a/Examples/test-suite/octave/preproc_runme.m -+++ b/Examples/test-suite/octave/preproc_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - preproc - - if (preproc.cvar.endif != 1) -diff --git a/Examples/test-suite/octave/refcount_runme.m b/Examples/test-suite/octave/refcount_runme.m -index 3ce5bcd..9fc01e2 100644 ---- a/Examples/test-suite/octave/refcount_runme.m -+++ b/Examples/test-suite/octave/refcount_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - refcount - # - # very innocent example -diff --git a/Examples/test-suite/octave/ret_by_value_runme.m b/Examples/test-suite/octave/ret_by_value_runme.m -index d17c9f2..67f80aa 100644 ---- a/Examples/test-suite/octave/ret_by_value_runme.m -+++ b/Examples/test-suite/octave/ret_by_value_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - ret_by_value - - a = ret_by_value.get_test(); -diff --git a/Examples/test-suite/octave/smart_pointer_extend_runme.m b/Examples/test-suite/octave/smart_pointer_extend_runme.m -index c30cd9f..6c9258e 100644 ---- a/Examples/test-suite/octave/smart_pointer_extend_runme.m -+++ b/Examples/test-suite/octave/smart_pointer_extend_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - smart_pointer_extend - - f = Foo(); -diff --git a/Examples/test-suite/octave/smart_pointer_overload_runme.m b/Examples/test-suite/octave/smart_pointer_overload_runme.m -index 214437d..a5df0de 100644 ---- a/Examples/test-suite/octave/smart_pointer_overload_runme.m -+++ b/Examples/test-suite/octave/smart_pointer_overload_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - smart_pointer_overload - - f = Foo(); -diff --git a/Examples/test-suite/octave/smart_pointer_rename_runme.m b/Examples/test-suite/octave/smart_pointer_rename_runme.m -index 260ee3e..5eb6d4c 100644 ---- a/Examples/test-suite/octave/smart_pointer_rename_runme.m -+++ b/Examples/test-suite/octave/smart_pointer_rename_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - smart_pointer_rename - - f = Foo(); -diff --git a/Examples/test-suite/octave/smart_pointer_simple_runme.m b/Examples/test-suite/octave/smart_pointer_simple_runme.m -index 26f32e0..30b1387 100644 ---- a/Examples/test-suite/octave/smart_pointer_simple_runme.m -+++ b/Examples/test-suite/octave/smart_pointer_simple_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - smart_pointer_simple - - f = Foo(); -diff --git a/Examples/test-suite/octave/smart_pointer_typedef_runme.m b/Examples/test-suite/octave/smart_pointer_typedef_runme.m -index 8fa6ca2..0e1c8a6 100644 ---- a/Examples/test-suite/octave/smart_pointer_typedef_runme.m -+++ b/Examples/test-suite/octave/smart_pointer_typedef_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - smart_pointer_typedef - - f = Foo(); -diff --git a/Examples/test-suite/octave/sneaky1_runme.m b/Examples/test-suite/octave/sneaky1_runme.m -index e044370..dfbbf82 100644 ---- a/Examples/test-suite/octave/sneaky1_runme.m -+++ b/Examples/test-suite/octave/sneaky1_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - sneaky1 - x = sneaky1.add(3,4); - y = sneaky1.subtract(3,4); -diff --git a/Examples/test-suite/octave/static_const_member_2_runme.m b/Examples/test-suite/octave/static_const_member_2_runme.m -index b242bfc..73260ba 100644 ---- a/Examples/test-suite/octave/static_const_member_2_runme.m -+++ b/Examples/test-suite/octave/static_const_member_2_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - static_const_member_2 - - c = Test_int(); -diff --git a/Examples/test-suite/octave/std_containers_runme.m b/Examples/test-suite/octave/std_containers_runme.m -index 074f0fd..eae3d5d 100644 ---- a/Examples/test-suite/octave/std_containers_runme.m -+++ b/Examples/test-suite/octave/std_containers_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - std_containers - - -diff --git a/Examples/test-suite/octave/struct_value_runme.m b/Examples/test-suite/octave/struct_value_runme.m -index 7340a36..ff34404 100644 ---- a/Examples/test-suite/octave/struct_value_runme.m -+++ b/Examples/test-suite/octave/struct_value_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - struct_value - - b = struct_value.Bar(); -diff --git a/Examples/test-suite/octave/swigobject_runme.m b/Examples/test-suite/octave/swigobject_runme.m -index 614e2a4..73167e4 100644 ---- a/Examples/test-suite/octave/swigobject_runme.m -+++ b/Examples/test-suite/octave/swigobject_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - swigobject - - a = A(); -diff --git a/Examples/test-suite/octave/template_default_arg_runme.m b/Examples/test-suite/octave/template_default_arg_runme.m -index e500662..b202216 100644 ---- a/Examples/test-suite/octave/template_default_arg_runme.m -+++ b/Examples/test-suite/octave/template_default_arg_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_default_arg - - -diff --git a/Examples/test-suite/octave/template_extend1_runme.m b/Examples/test-suite/octave/template_extend1_runme.m -index e672da7..5035deb 100644 ---- a/Examples/test-suite/octave/template_extend1_runme.m -+++ b/Examples/test-suite/octave/template_extend1_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_extend1 - - a = template_extend1.lBaz(); -diff --git a/Examples/test-suite/octave/template_extend2_runme.m b/Examples/test-suite/octave/template_extend2_runme.m -index 93c44d7..24472a9 100644 ---- a/Examples/test-suite/octave/template_extend2_runme.m -+++ b/Examples/test-suite/octave/template_extend2_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_extend2 - - a = template_extend2.lBaz(); -diff --git a/Examples/test-suite/octave/template_inherit_runme.m b/Examples/test-suite/octave/template_inherit_runme.m -index ce7931e..368cce2 100644 ---- a/Examples/test-suite/octave/template_inherit_runme.m -+++ b/Examples/test-suite/octave/template_inherit_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_inherit - a = FooInt(); - b = FooDouble(); -diff --git a/Examples/test-suite/octave/template_matrix_runme.m b/Examples/test-suite/octave/template_matrix_runme.m -index b8fb3d3..96e7bd9 100644 ---- a/Examples/test-suite/octave/template_matrix_runme.m -+++ b/Examples/test-suite/octave/template_matrix_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_matrix - passVector([1,2,3]); - passMatrix({[1,2],[1,2,3]}); -diff --git a/Examples/test-suite/octave/template_ns4_runme.m b/Examples/test-suite/octave/template_ns4_runme.m -index 58ced7c..b574642 100644 ---- a/Examples/test-suite/octave/template_ns4_runme.m -+++ b/Examples/test-suite/octave/template_ns4_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_ns4 - - d = make_Class_DD(); -diff --git a/Examples/test-suite/octave/template_opaque_runme.m b/Examples/test-suite/octave/template_opaque_runme.m -index 1c123b3..4e8511e 100644 ---- a/Examples/test-suite/octave/template_opaque_runme.m -+++ b/Examples/test-suite/octave/template_opaque_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_opaque - - v = template_opaque.OpaqueVectorType(10); -diff --git a/Examples/test-suite/octave/template_ref_type_runme.m b/Examples/test-suite/octave/template_ref_type_runme.m -index ef77e06..9135fb0 100644 ---- a/Examples/test-suite/octave/template_ref_type_runme.m -+++ b/Examples/test-suite/octave/template_ref_type_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_ref_type - - xr = template_ref_type.XC(); -diff --git a/Examples/test-suite/octave/template_static_runme.m b/Examples/test-suite/octave/template_static_runme.m -index c54139a..8d22fed 100644 ---- a/Examples/test-suite/octave/template_static_runme.m -+++ b/Examples/test-suite/octave/template_static_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_static - - Foo_bar_double(1); -diff --git a/Examples/test-suite/octave/template_typedef_cplx4_runme.m b/Examples/test-suite/octave/template_typedef_cplx4_runme.m -index 4db276d..e0c9a32 100644 ---- a/Examples/test-suite/octave/template_typedef_cplx4_runme.m -+++ b/Examples/test-suite/octave/template_typedef_cplx4_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_typedef_cplx4 - - # -diff --git a/Examples/test-suite/octave/template_typedef_import_runme.m b/Examples/test-suite/octave/template_typedef_import_runme.m -index 0574ab1..0b3f215 100644 ---- a/Examples/test-suite/octave/template_typedef_import_runme.m -+++ b/Examples/test-suite/octave/template_typedef_import_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - template_typedef_cplx2 - template_typedef_import - -diff --git a/Examples/test-suite/octave/typedef_class_runme.m b/Examples/test-suite/octave/typedef_class_runme.m -index 97d2aed..55878a2 100644 ---- a/Examples/test-suite/octave/typedef_class_runme.m -+++ b/Examples/test-suite/octave/typedef_class_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - typedef_class - - a = typedef_class.RealA(); -diff --git a/Examples/test-suite/octave/typedef_inherit_runme.m b/Examples/test-suite/octave/typedef_inherit_runme.m -index 6c4c47a..fbe5436 100644 ---- a/Examples/test-suite/octave/typedef_inherit_runme.m -+++ b/Examples/test-suite/octave/typedef_inherit_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - typedef_inherit - - a = typedef_inherit.Foo(); -diff --git a/Examples/test-suite/octave/typename_runme.m b/Examples/test-suite/octave/typename_runme.m -index c47f817..305cd41 100644 ---- a/Examples/test-suite/octave/typename_runme.m -+++ b/Examples/test-suite/octave/typename_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - typename - f = typename.Foo(); - b = typename.Bar(); -diff --git a/Examples/test-suite/octave/using1_runme.m b/Examples/test-suite/octave/using1_runme.m -index 0c37daf..9253a1d 100644 ---- a/Examples/test-suite/octave/using1_runme.m -+++ b/Examples/test-suite/octave/using1_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - using1 - - if (using1.spam(37) != 37) -diff --git a/Examples/test-suite/octave/using2_runme.m b/Examples/test-suite/octave/using2_runme.m -index 205c6d7..7cc6689 100644 ---- a/Examples/test-suite/octave/using2_runme.m -+++ b/Examples/test-suite/octave/using2_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - using2 - - if (using2.spam(37) != 37) -diff --git a/Examples/test-suite/octave/using_composition_runme.m b/Examples/test-suite/octave/using_composition_runme.m -index 9b58d6d..63192ad 100644 ---- a/Examples/test-suite/octave/using_composition_runme.m -+++ b/Examples/test-suite/octave/using_composition_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - using_composition - - f = FooBar(); -diff --git a/Examples/test-suite/octave/using_extend_runme.m b/Examples/test-suite/octave/using_extend_runme.m -index b9c13fa..9b8f402 100644 ---- a/Examples/test-suite/octave/using_extend_runme.m -+++ b/Examples/test-suite/octave/using_extend_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - using_extend - - f = FooBar(); -diff --git a/Examples/test-suite/octave/using_protected_runme.m b/Examples/test-suite/octave/using_protected_runme.m -index ed4b1c3..b5138c1 100644 ---- a/Examples/test-suite/octave/using_protected_runme.m -+++ b/Examples/test-suite/octave/using_protected_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - using_protected - - f = FooBar(); -diff --git a/Examples/test-suite/octave/voidtest_runme.m b/Examples/test-suite/octave/voidtest_runme.m -index e62f8a5..fb411ee 100644 ---- a/Examples/test-suite/octave/voidtest_runme.m -+++ b/Examples/test-suite/octave/voidtest_runme.m -@@ -1,3 +1,8 @@ -+# do not dump Octave core -+if exist("crash_dumps_octave_core", "builtin") -+ crash_dumps_octave_core(0); -+endif -+ - voidtest - - voidtest.globalfunc(); diff --git a/swig-3.0.11_octave42.patch b/swig-3.0.11_octave42.patch deleted file mode 100644 index 3bc7645..0000000 --- a/swig-3.0.11_octave42.patch +++ /dev/null @@ -1,731 +0,0 @@ -Index: swig-3.0.11/.travis.yml -=================================================================== ---- swig-3.0.11.orig/.travis.yml -+++ swig-3.0.11/.travis.yml -@@ -77,13 +77,19 @@ matrix: - dist: trusty - - compiler: gcc - os: linux -- env: SWIGLANG=octave SWIGJOBS=-j2 # 3.2 -+ env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8 -+ sudo: required -+ dist: trusty - - compiler: gcc - os: linux -- env: SWIGLANG=octave SWIGJOBS=-j2 VER=3.8 -+ env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0 -+ sudo: required -+ dist: trusty - - compiler: gcc - os: linux -- env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0 -+ env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.2 CPP11=1 -+ sudo: required -+ dist: trusty - - compiler: gcc - os: linux - env: SWIGLANG=perl5 -Index: swig-3.0.11/Doc/Manual/Octave.html -=================================================================== ---- swig-3.0.11.orig/Doc/Manual/Octave.html -+++ swig-3.0.11/Doc/Manual/Octave.html -@@ -64,8 +64,15 @@ Also, there are a dozen or so examples i - - -

--As of SWIG 3.0.7, the Octave module is regularly tested with Octave versions 3.2.4, 3.8.1, and 4.0.0. --Use of older Octave versions is not recommended, as these versions are no longer tested with SWIG. -+SWIG is regularly tested against the following versions of Octave: 3.8, 4.0, 4.2. -+

-+ -+

-+Every effort is made to maintain backward compatibility with older versions of Octave. -+This cannot be guaranteed however, as in recent times new Octave releases have required nontrivial updates to SWIG, which may break backward compatibility for older Octave versions against which SWIG is not regularly tested. -+

-+ -+

- The SWIG runtime exports the function swig_octave_prereq() for checking the version of Octave. -

- -Index: swig-3.0.11/Tools/travis-linux-install.sh -=================================================================== ---- swig-3.0.11.orig/Tools/travis-linux-install.sh -+++ swig-3.0.11/Tools/travis-linux-install.sh -@@ -64,7 +64,7 @@ case "$SWIGLANG" in - ;; - "octave") - if [[ -z "$VER" ]]; then -- sudo apt-get -qq install octave3.2 octave3.2-headers -+ sudo apt-get -qq install liboctave-dev - else - sudo add-apt-repository -y ppa:kwwette/octaves - sudo apt-get -qq update -Index: swig-3.0.11/CHANGES.current -=================================================================== ---- swig-3.0.11.orig/CHANGES.current -+++ swig-3.0.11/CHANGES.current -@@ -4,6 +4,31 @@ See the RELEASENOTES file for a summary - Issue # numbers mentioned below can be found on Github. For more details, add - the issue number to the end of the URL: https://github.com/swig/swig/issues/ - -+ -+Backported from https://github.com/swig/swig/pull/875 -+===================================================== -+ -+2016-12-31: kwwette -+ [Octave] add support for version 4.2.0 -+ - C++11 compiler is required to compile examples/test suite -+ - Octave has dropped support for << and >> operators, so SWIG now -+ ignores them -+ - The Octave error() function now raises C++ exceptions to propagate -+ Octave errors, so %exception directives may need to be modified. -+ For convenience the SWIG_RETHROW_OCTAVE_EXCEPTIONS macro can be used -+ to rethrow any Octave exceptions for Octave itself to handle, e.g.: -+ -+ try { -+ $action // may call error() -+ } -+ SWIG_RETHROW_OCTAVE_EXCEPTIONS // error() exceptions are rethrown -+ catch(...) { -+ ... // all other exceptions -+ } -+ -+ *** POTENTIAL INCOMPATIBILITY *** -+ -+ - Version 3.0.11 (29 Dec 2016) - ============================ - -Index: swig-3.0.11/Examples/test-suite/exception_order.i -=================================================================== ---- swig-3.0.11.orig/Examples/test-suite/exception_order.i -+++ swig-3.0.11/Examples/test-suite/exception_order.i -@@ -23,7 +23,17 @@ - user's throw declarations. - */ - --#if defined(SWIGUTL) -+#if defined(SWIGOCTAVE) -+%exception { -+ try { -+ $action -+ } -+ SWIG_RETHROW_OCTAVE_EXCEPTIONS -+ catch(...) { -+ SWIG_exception(SWIG_RuntimeError,"postcatch unknown"); -+ } -+} -+#elif defined(SWIGUTL) - %exception { - try { - $action -Index: swig-3.0.11/Lib/octave/exception.i -=================================================================== ---- swig-3.0.11.orig/Lib/octave/exception.i -+++ swig-3.0.11/Lib/octave/exception.i -@@ -1,6 +1,14 @@ - %include - -- - %insert("runtime") { - %define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; )) - } -+ -+%define SWIG_RETHROW_OCTAVE_EXCEPTIONS -+ /* rethrow any exceptions thrown by Octave */ -+%#if SWIG_OCTAVE_PREREQ(4,2,0) -+ catch (octave::execution_exception& _e) { throw; } -+ catch (octave::exit_exception& _e) { throw; } -+ catch (octave::interrupt_exception& _e) { throw; } -+%#endif -+%enddef -Index: swig-3.0.11/Lib/octave/octopers.swg -=================================================================== ---- swig-3.0.11.orig/Lib/octave/octopers.swg -+++ swig-3.0.11/Lib/octave/octopers.swg -@@ -25,8 +25,6 @@ - // __div__ a / b - // __pow__ a ^ b - // __ldiv__ a \ b --// __lshift__ a << b --// __rshift__ a >> b - // __lt__ a < b - // __le__ a <= b - // __eq__ a == b -@@ -51,8 +49,6 @@ - %rename(__mul__) *::operator*; - %rename(__div__) *::operator/; - %rename(__mod__) *::operator%; --%rename(__lshift__) *::operator<<; --%rename(__rshift__) *::operator>>; - %rename(__el_and__) *::operator&&; - %rename(__el_or__) *::operator||; - %rename(__xor__) *::operator^; -@@ -84,5 +80,7 @@ - // Ignored operators - %ignoreoperator(EQ) operator=; - %ignoreoperator(ARROWSTAR) operator->*; -+%ignoreoperator(LSHIFT) operator<<; -+%ignoreoperator(RSHIFT) operator>>; - - #endif /* __cplusplus */ -Index: swig-3.0.11/Lib/octave/octrun.swg -=================================================================== ---- swig-3.0.11.orig/Lib/octave/octrun.swg -+++ swig-3.0.11/Lib/octave/octrun.swg -@@ -1,87 +1,3 @@ -- --#include -- --// Macro for enabling features which require Octave version >= major.minor.patch --#define SWIG_OCTAVE_PREREQ(major, minor, patch) \ -- ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + OCTAVE_PATCH_VERSION >= ((major)<<16) + ((minor)<<8) + (patch) ) -- --// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1 --#if !defined(OCTAVE_MAJOR_VERSION) -- --# if !defined(OCTAVE_API_VERSION_NUMBER) -- --// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet --// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER --# include --# if defined(octave_ov_h) --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 8 --# define OCTAVE_PATCH_VERSION 0 --# else -- --// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed --# define ComplexLU __ignore --# include --# undef ComplexLU --# if defined(octave_Complex_LU_h) -- --// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 1 --# define OCTAVE_PATCH_VERSION 99 -- --# else -- --// OCTAVE_API_VERSION_NUMBER == 37 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 2 --# define OCTAVE_PATCH_VERSION 0 -- --# endif // defined(octave_Complex_LU_h) -- --# endif // defined(octave_ov_h) -- --// Correlation between Octave API and version numbers extracted from Octave's --// ChangeLogs; version is the *earliest* released Octave with that API number --# elif OCTAVE_API_VERSION_NUMBER >= 48 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 6 --# define OCTAVE_PATCH_VERSION 0 -- --# elif OCTAVE_API_VERSION_NUMBER >= 45 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 4 --# define OCTAVE_PATCH_VERSION 1 -- --# elif OCTAVE_API_VERSION_NUMBER >= 42 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 3 --# define OCTAVE_PATCH_VERSION 54 -- --# elif OCTAVE_API_VERSION_NUMBER >= 41 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 3 --# define OCTAVE_PATCH_VERSION 53 -- --# elif OCTAVE_API_VERSION_NUMBER >= 40 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 3 --# define OCTAVE_PATCH_VERSION 52 -- --# elif OCTAVE_API_VERSION_NUMBER >= 39 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 3 --# define OCTAVE_PATCH_VERSION 51 -- --# else // OCTAVE_API_VERSION_NUMBER == 38 --# define OCTAVE_MAJOR_VERSION 3 --# define OCTAVE_MINOR_VERSION 3 --# define OCTAVE_PATCH_VERSION 50 -- --# endif // !defined(OCTAVE_API_VERSION_NUMBER) -- --#endif // !defined(OCTAVE_MAJOR_VERSION) -- - #if !SWIG_OCTAVE_PREREQ(3,2,0) - #define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc) - #else -@@ -824,6 +740,24 @@ SWIGRUNTIME void swig_acquire_ownership_ - return ret.scalar_value(); - } - -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ virtual octave_value as_double(void) const { -+ octave_value ret; -+ if (!dispatch_unary_op("__float__", ret)) { -+ error("__float__ method not defined"); -+ } -+ return ret.as_double(); -+ } -+ -+ virtual octave_value as_single(void) const { -+ octave_value ret; -+ if (!dispatch_unary_op("__float__", ret)) { -+ error("__float__ method not defined"); -+ } -+ return ret.as_single(); -+ } -+#endif -+ - #if SWIG_OCTAVE_PREREQ(3,8,0) - virtual octave_value map(octave_base_value::unary_mapper_t umap) const { - const std::string opname = std::string("__") + octave_base_value::get_umap_name(umap) + std::string("__"); -@@ -1092,6 +1026,14 @@ SWIGRUNTIME void swig_acquire_ownership_ - virtual double scalar_value(bool frc_str_conv = false) const - { return ptr->scalar_value(frc_str_conv); } - -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ virtual octave_value as_double(void) const -+ { return ptr->as_double(); } -+ -+ virtual octave_value as_single(void) const -+ { return ptr->as_single(); } -+#endif -+ - #if SWIG_OCTAVE_PREREQ(3,8,0) - virtual octave_value map(octave_base_value::unary_mapper_t umap) const - { return ptr->map(umap); } -@@ -1340,8 +1282,10 @@ octave_value_typeinfo::register_binary_o - swig_binary_op(div); - swig_binary_op(pow); - swig_binary_op(ldiv); -+#if !SWIG_OCTAVE_PREREQ(4,2,0) - swig_binary_op(lshift); - swig_binary_op(rshift); -+#endif - swig_binary_op(lt); - swig_binary_op(le); - swig_binary_op(eq); -@@ -1371,8 +1315,10 @@ octave_value_typeinfo::register_binary_o - swigreg_binary_op(div); - swigreg_binary_op(pow); - swigreg_binary_op(ldiv); -+#if !SWIG_OCTAVE_PREREQ(4,2,0) - swigreg_binary_op(lshift); - swigreg_binary_op(rshift); -+#endif - swigreg_binary_op(lt); - swigreg_binary_op(le); - swigreg_binary_op(eq); -Index: swig-3.0.11/Lib/octave/octruntime.swg -=================================================================== ---- swig-3.0.11.orig/Lib/octave/octruntime.swg -+++ swig-3.0.11/Lib/octave/octruntime.swg -@@ -1,7 +1,93 @@ - %insert(runtime) %{ -+ - #include - #include -+ - #include -+#include -+ -+// Macro for enabling features which require Octave version >= major.minor.patch -+// - Use (OCTAVE_PATCH_VERSION + 0) to handle both '' (released) and '+' (in development) patch numbers -+#define SWIG_OCTAVE_PREREQ(major, minor, patch) \ -+ ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + (OCTAVE_PATCH_VERSION + 0) >= ((major)<<16) + ((minor)<<8) + (patch) ) -+ -+// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1 -+#if !defined(OCTAVE_MAJOR_VERSION) -+ -+# if !defined(OCTAVE_API_VERSION_NUMBER) -+ -+// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet -+// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER -+# include -+# if defined(octave_ov_h) -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 8 -+# define OCTAVE_PATCH_VERSION 0 -+# else -+ -+// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed -+# define ComplexLU __ignore -+# include -+# undef ComplexLU -+# if defined(octave_Complex_LU_h) -+ -+// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 1 -+# define OCTAVE_PATCH_VERSION 99 -+ -+# else -+ -+// OCTAVE_API_VERSION_NUMBER == 37 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 2 -+# define OCTAVE_PATCH_VERSION 0 -+ -+# endif // defined(octave_Complex_LU_h) -+ -+# endif // defined(octave_ov_h) -+ -+// Correlation between Octave API and version numbers extracted from Octave's -+// ChangeLogs; version is the *earliest* released Octave with that API number -+# elif OCTAVE_API_VERSION_NUMBER >= 48 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 6 -+# define OCTAVE_PATCH_VERSION 0 -+ -+# elif OCTAVE_API_VERSION_NUMBER >= 45 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 4 -+# define OCTAVE_PATCH_VERSION 1 -+ -+# elif OCTAVE_API_VERSION_NUMBER >= 42 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 3 -+# define OCTAVE_PATCH_VERSION 54 -+ -+# elif OCTAVE_API_VERSION_NUMBER >= 41 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 3 -+# define OCTAVE_PATCH_VERSION 53 -+ -+# elif OCTAVE_API_VERSION_NUMBER >= 40 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 3 -+# define OCTAVE_PATCH_VERSION 52 -+ -+# elif OCTAVE_API_VERSION_NUMBER >= 39 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 3 -+# define OCTAVE_PATCH_VERSION 51 -+ -+# else // OCTAVE_API_VERSION_NUMBER == 38 -+# define OCTAVE_MAJOR_VERSION 3 -+# define OCTAVE_MINOR_VERSION 3 -+# define OCTAVE_PATCH_VERSION 50 -+ -+# endif // !defined(OCTAVE_API_VERSION_NUMBER) -+ -+#endif // !defined(OCTAVE_MAJOR_VERSION) -+ - #include - #include - #include -@@ -9,8 +95,16 @@ - #include - #include - #include -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+#include -+#else - #include -+#endif - #include -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+#include -+#endif -+ - %} - - %insert(runtime) "swigrun.swg"; -@@ -24,27 +118,34 @@ - static bool SWIG_init_user(octave_swig_type* module_ns); - - SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { -- bool retn; -+ bool retn = false; - { --#if !SWIG_OCTAVE_PREREQ(3,3,50) -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ octave::unwind_protect frame; -+ frame.protect_var(discard_error_messages); discard_error_messages = true; -+ frame.protect_var(discard_warning_messages); discard_warning_messages = true; -+#elif SWIG_OCTAVE_PREREQ(3,3,50) -+ unwind_protect frame; -+ frame.protect_var(error_state); error_state = 0; -+ frame.protect_var(warning_state); warning_state = 0; -+ frame.protect_var(discard_error_messages); discard_error_messages = true; -+ frame.protect_var(discard_warning_messages); discard_warning_messages = true; -+#else - unwind_protect::begin_frame("SWIG_Octave_LoadModule"); -- unwind_protect_int(error_state); -- unwind_protect_int(warning_state); -- unwind_protect_bool(discard_error_messages); -- unwind_protect_bool(discard_warning_messages); -+ unwind_protect_int(error_state); error_state = 0; -+ unwind_protect_int(warning_state); warning_state = 0; -+ unwind_protect_bool(discard_error_messages); discard_error_messages = true; -+ unwind_protect_bool(discard_warning_messages); discard_warning_messages = true; -+#endif -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ try { -+ feval(name, octave_value_list(), 0); -+ retn = true; -+ } catch (octave::execution_exception&) { } - #else -- unwind_protect frame; -- frame.protect_var(error_state); -- frame.protect_var(warning_state); -- frame.protect_var(discard_error_messages); -- frame.protect_var(discard_warning_messages); --#endif -- error_state = 0; -- warning_state = 0; -- discard_error_messages = true; -- discard_warning_messages = true; - feval(name, octave_value_list(), 0); - retn = (error_state == 0); -+#endif - #if !SWIG_OCTAVE_PREREQ(3,3,50) - unwind_protect::run_frame("SWIG_Octave_LoadModule"); - #endif -@@ -56,31 +157,37 @@ SWIGINTERN bool SWIG_Octave_LoadModule(s - } - - SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { -- bool retn; -+ bool retn = false; - { --#if !SWIG_OCTAVE_PREREQ(3,3,50) -- unwind_protect::begin_frame("SWIG_Octave_InstallFunction"); -- unwind_protect_int(error_state); -- unwind_protect_int(warning_state); -- unwind_protect_bool(discard_error_messages); -- unwind_protect_bool(discard_warning_messages); --#else -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ octave::unwind_protect frame; -+ frame.protect_var(discard_error_messages); discard_error_messages = true; -+ frame.protect_var(discard_warning_messages); discard_warning_messages = true; -+#elif SWIG_OCTAVE_PREREQ(3,3,50) - unwind_protect frame; -- frame.protect_var(error_state); -- frame.protect_var(warning_state); -- frame.protect_var(discard_error_messages); -- frame.protect_var(discard_warning_messages); --#endif -- error_state = 0; -- warning_state = 0; -- discard_error_messages = true; -- discard_warning_messages = true; -+ frame.protect_var(error_state); error_state = 0; -+ frame.protect_var(warning_state); warning_state = 0; -+ frame.protect_var(discard_error_messages); discard_error_messages = true; -+ frame.protect_var(discard_warning_messages); discard_warning_messages = true; -+#else -+ unwind_protect::begin_frame("SWIG_Octave_LoadModule"); -+ unwind_protect_int(error_state); error_state = 0; -+ unwind_protect_int(warning_state); warning_state = 0; -+ unwind_protect_bool(discard_error_messages); discard_error_messages = true; -+ unwind_protect_bool(discard_warning_messages); discard_warning_messages = true; -+#endif - octave_value_list args; - args.append(name); - args.append(octloadfcn->fcn_file_name()); -- error_state = 0; -+#if SWIG_OCTAVE_PREREQ(4,2,0) -+ try { -+ feval("autoload", args, 0); -+ retn = true; -+ } catch (octave::execution_exception&) { } -+#else - feval("autoload", args, 0); - retn = (error_state == 0); -+#endif - #if !SWIG_OCTAVE_PREREQ(3,3,50) - unwind_protect::run_frame("SWIG_Octave_InstallFunction"); - #endif -@@ -211,10 +318,11 @@ DEFUN_DLD( SWIG_name, args, nargout, SWI - - // workaround to prevent octave seg-faulting on exit: set Octave exit function - // octave_exit to _Exit, which exits immediately without trying to cleanup memory. -- // definitely affects version 3.2.*, not sure about 3.3.*, seems to be fixed in -- // version 3.4.* and above. can be turned off with macro definition. -+ // definitely affecteds version 3.2.*, not sure about 3.3.*, seems to be fixed in -+ // version 3.4.*, but reappeared in 4.2.*, so turn on for all versions after 3.2.*. -+ // can be turned off with macro definition. - #ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK --#if SWIG_OCTAVE_PREREQ(3,2,0) && !SWIG_OCTAVE_PREREQ(3,4,1) -+#if SWIG_OCTAVE_PREREQ(3,2,0) - octave_exit = ::_Exit; - #endif - #endif -Index: swig-3.0.11/Lib/octave/std_wstring.i -=================================================================== ---- /dev/null -+++ swig-3.0.11/Lib/octave/std_wstring.i -@@ -0,0 +1 @@ -+%include -Index: swig-3.0.11/Lib/typemaps/fragments.swg -=================================================================== ---- swig-3.0.11.orig/Lib/typemaps/fragments.swg -+++ swig-3.0.11/Lib/typemaps/fragments.swg -@@ -177,9 +177,11 @@ - * versions. - * - * Make sure namespace std exists to avoid compiler warnings. -+ * -+ * extern "C++" is required as this fragment can end up inside an extern "C" { } block - */ - namespace std { } --template -+extern "C++" template - inline int SWIG_isfinite_func(T x) { - using namespace std; - return isfinite(x); -Index: swig-3.0.11/configure.ac -=================================================================== ---- swig-3.0.11.orig/configure.ac -+++ swig-3.0.11/configure.ac -@@ -1015,35 +1015,90 @@ AC_SUBST(PERL5LDFLAGS) - OCTAVEBIN= - OCTAVE_SO=.oct - -+OCTAVE_CPPFLAGS= -+OCTAVE_CXXFLAGS= -+OCTAVE_LDFLAGS= -+ - AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave]) - AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN="$alllang_default"]) - --# First, check for "--without-octave" or "--with-octave=no". -+# Check for "--without-octave" or "--with-octave=no". - if test x"${OCTAVEBIN}" = xno; then - AC_MSG_NOTICE([Disabling Octave]) - OCTAVE= - --# First figure out what the name of Octave is -+# Check for Octave; prefer command-line program "octave-cli" to (in newer versions) GUI program "octave" - elif test "x$OCTAVEBIN" = xyes; then -- AC_PATH_PROG(OCTAVE, [octave]) -+ AC_PATH_PROG(OCTAVE, [octave-cli octave]) - - else - OCTAVE="$OCTAVEBIN" - fi - -+# Check Octave options and version, and whether a C++11 compiler is required - if test -n "$OCTAVE"; then -- AC_MSG_CHECKING([for mkoctfile]) -- mkoctfile="$(dirname $OCTAVE)/$(basename $OCTAVE | sed -e 's/octave/mkoctfile/')" -- AS_IF([test -x "${mkoctfile}"],[ -- AC_MSG_RESULT([${mkoctfile}]) -+ -+ for octave_opt in --no-window-system --silent --norc --no-history; do -+ AC_MSG_CHECKING([if Octave option '${octave_opt}' is supported]) -+ octave_out=`${OCTAVE} ${octave_opt} /dev/null 2>&1 | sed -n '1p' | sed -n '/unrecognized/p'` -+ AS_IF([test "x${octave_out}" = x],[ -+ AC_MSG_RESULT([yes]) -+ OCTAVE="${OCTAVE} ${octave_opt}" -+ ],[ -+ AC_MSG_RESULT([no]) -+ ]) -+ done -+ -+ AC_MSG_CHECKING([for Octave version]) -+ octave_version=`${OCTAVE} --version 2>/dev/null | sed -n '1p' | sed -n 's/^.*version //p'` -+ AC_MSG_RESULT([${octave_version}]) -+ AS_CASE([${octave_version}], -+ [*.*.*],[:], -+ [AC_MSG_ERROR([could not determine version of ${OCTAVE}])] -+ ) -+ -+ AC_MSG_CHECKING([if Octave requires a C++11 compiler]) -+ OCTAVE_CXX11FLAGS= -+ AX_COMPARE_VERSION([${octave_version}],[ge],[4.2.0],[ -+ AC_MSG_RESULT([yes]) -+ AC_LANG_PUSH([C++]) -+ # save variables modified by AX_CXX_COMPILE_STDCXX_11 -+ CXXFLAGS_SAVED=$CXXFLAGS -+ CXX11FLAGS_SAVED=$CXX11FLAGS -+ HAVE_CXX11_COMPILER_SAVED=$HAVE_CXX11_COMPILER -+ AX_CXX_COMPILE_STDCXX_11([noext], [nostop]) -+ AC_MSG_CHECKING([for C++11 enabled compiler]) -+ AS_IF([test "x${HAVE_CXX11_COMPILER}" = x],[ -+ AC_MSG_RESULT([no, disabling Octave]) -+ OCTAVE= -+ ],[ -+ AC_MSG_RESULT([$HAVE_CXX11_COMPILER]) -+ OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} ${CXX11FLAGS}" -+ ]) -+ # restore variables modified by AX_CXX_COMPILE_STDCXX_11 -+ CXXFLAGS=$CXXFLAGS_SAVED -+ CXX11FLAGS=$CXX11FLAGS_SAVED -+ HAVE_CXX11_COMPILER=$HAVE_CXX11_COMPILER_SAVED -+ AC_LANG_POP([C++]) - ],[ -- AC_MSG_RESULT([not found, disabling Octave]) -+ AC_MSG_RESULT([no]) -+ ]) -+ -+fi -+ -+# Check for required Octave helper program "mkoctfile" -+if test -n "$OCTAVE"; then -+ AC_PATH_PROG(mkoctfile, [mkoctfile], [], [$(dirname $OCTAVE)]) -+ AS_IF([test "x${mkoctfile}" = x],[ -+ AC_MSG_NOTICE([mkoctfile not found, disabling Octave]) - OCTAVE= - ]) - fi -+ -+# Check for Octave preprocessor/compiler/linker flags - if test -n "$OCTAVE"; then -+ - AC_MSG_CHECKING([for Octave preprocessor flags]) -- OCTAVE_CPPFLAGS= - for var in CPPFLAGS INCFLAGS ALL_CXXFLAGS; do - for flag in `env - ${mkoctfile} -p ${var}`; do - case ${flag} in -@@ -1053,8 +1108,8 @@ if test -n "$OCTAVE"; then - done - done - AC_MSG_RESULT([$OCTAVE_CPPFLAGS]) -+ - AC_MSG_CHECKING([for Octave compiler flags]) -- OCTAVE_CXXFLAGS= - for var in ALL_CXXFLAGS; do - for flag in `env - ${mkoctfile} -p ${var}`; do - case ${flag} in -@@ -1066,28 +1121,19 @@ if test -n "$OCTAVE"; then - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="-Werror -O0" - AC_COMPILE_IFELSE([ -- AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[]) -+ AC_LANG_PROGRAM([],[]) - ],[ - OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} -O0" - ]) - CXXFLAGS="${save_CXXFLAGS}" - AC_MSG_RESULT([$OCTAVE_CXXFLAGS]) -+ - AC_MSG_CHECKING([for Octave linker flags]) -- OCTAVE_LDFLAGS= - for var in RDYNAMIC_FLAG LFLAGS RLD_FLAG OCTAVE_LIBS LIBS; do - OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "`env - ${mkoctfile} -p ${var}` - done - AC_MSG_RESULT([$OCTAVE_LDFLAGS]) -- for octave_opt in --silent --norc --no-history --no-window-system; do -- AC_MSG_CHECKING([if Octave option '${octave_opt}' is supported]) -- octave_out=`${OCTAVE} ${octave_opt} /dev/null 2>&1 | sed -n '1p' | sed -n '/unrecognized/p'` -- AS_IF([test "x${octave_out}" = x],[ -- AC_MSG_RESULT([yes]) -- OCTAVE="${OCTAVE} ${octave_opt}" -- ],[ -- AC_MSG_RESULT([no]) -- ]) -- done -+ - fi - - AC_SUBST(OCTAVE) diff --git a/swig.spec b/swig.spec index 0bb77cc..cf693e7 100644 --- a/swig.spec +++ b/swig.spec @@ -30,8 +30,8 @@ Summary: Connects C/C++/Objective C to some high-level programming languages Name: swig -Version: 3.0.11 -Release: 2%{?dist} +Version: 3.0.12 +Release: 1%{?dist} License: GPLv3+ and BSD URL: http://swig.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz @@ -42,13 +42,6 @@ Source3: ccache-swig.sh Source4: ccache-swig.csh Patch0: swig308-Do-not-use-isystem.patch -Patch1: https://github.com/swig/swig/commit/9e66af3fefa07fad0103f97eef8e1dc86b3498ba.patch#/swig-3.0.11_octave-no-core-dump.patch - -# Support for Octave 4.2. Drop patch on v3.0.12 release. -# Backported from https://github.com/swig/swig/pull/875. -%if 0%{?fedora} >= 26 -Patch2: swig-3.0.11_octave42.patch -%endif # 0#{?fedora} >= 26 BuildRequires: perl, pcre-devel BuildRequires: python2-devel, python3-devel @@ -137,13 +130,9 @@ This package contains file with commands for easier debugging of SWIG in gdb. %prep -%setup -q -n swig-%{version} +%setup -q %patch0 -p1 -b .isystem -%patch1 -p1 -b .ioctave_core_dump -%if 0%{?fedora} >= 26 -%patch2 -p1 -b .ioctave42 -%endif # 0#{?fedora} >= 26 for all in CHANGES README; do iconv -f ISO88591 -t UTF8 < $all > $all.new @@ -290,6 +279,10 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb %{_datadir}/%{name}/gdb %changelog +* Thu Jan 26 2017 Björn Esser - 3.0.12-1 +- Update to 3.0.12 +- Drop Patch1 and Patch2, applied in upstream-tarball + * Sat Jan 14 2017 Björn Esser - 3.0.11-2 - Add Patch1 from upstream - Do not dump Octave core in examples/test suite scripts