jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Director related changes, other edits.

Browse source 
director_wombat testcase, as well as all others except director_abstract
compile.
Four test cases fail.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5196 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Art Yerkes 2003-10-22 04:01:27 +00:00
commit dff2895809
15 changed files with 224 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Examples/Makefile.in
View file

@ -537,10 +537,11 @@ mzscheme_clean:
##### Ocaml #####
##################################################################
OCC=@OCAMLC@
SWIGWHERE=-I `$(SWIG) -ocaml -where`
OCC=@OCAMLC@ $(SWIGWHERE)
OCAMLDLGEN=@OCAMLDLGEN@
OCAMLFIND=@OCAMLFIND@
OCAMLMKTOP=@OCAMLMKTOP@
OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE)
NOLINK ?= false
ocaml_static: $(SRCS)
@ -551,6 +552,7 @@ ocaml_static: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
swig.cmo \
$(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
@ -569,6 +571,7 @@ ocaml_dynamic: $(SRCS)
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCAMLFIND) \
$(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
swig.cmo \
-package dl -linkpkg \
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
@ -580,6 +583,7 @@ ocaml_static_toplevel: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCAMLMKTOP) \
swig.cmo \
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
$(INTERFACE:%.i=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
@ -594,6 +598,7 @@ ocaml_static_cpp: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
swig.cmo \
$(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
@ -609,6 +614,7 @@ ocaml_static_cpp_toplevel: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCAMLMKTOP) \
swig.cmo \
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
$(INTERFACE:%.i=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
@ -630,6 +636,7 @@ ocaml_dynamic_cpp: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCAMLFIND) \
swig.cmo \
$(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom \
-o $(TARGET) \
-package dl -linkpkg \
@ -646,6 +653,7 @@ ocaml_static_multi_cpp: $(SRCS)
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
$(OCC) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
swig.cmo \
$(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)'

2
Examples/ocaml/shapes/example.i
View file

@ -1,8 +1,10 @@
/* File : example.i */
%module(directors="1") example
#ifndef SWIGSEXP
%{
#include "example.h"
%}
#endif
%feature("director");
%include "example.h"

1
Examples/ocaml/shapes/example_prog.ml
View file

@ -1,5 +1,6 @@
(* example_prog.ml *)
open Swig ;;
open Example ;;
let side_length (ax,ay) (bx,by) =

12
Examples/test-suite/ocaml/results
View file

@ -1,4 +1,6 @@
Failed:
director_abstract.cpptest
template_array_numeric.cpptest
typedef_inherit.cpptest
template_typedef_import.multicpptest
Success:
@ -49,6 +51,7 @@ director_basic.cpptest
director_exception.cpptest
director_finalizer.cpptest
director_unroll.cpptest
director_wombat.cpptest
dynamic_cast.cpptest
enum_plus.cpptest
enum_scope.cpptest
@ -57,10 +60,10 @@ enum_var.cpptest
evil_diamond.cpptest
evil_diamond_ns.cpptest
evil_diamond_prop.cpptest
explicit.cpptest
extend_placement.cpptest
extend_template.cpptest
extend_template_ns.cpptest
extern_throws.cpptest
global_ns_arg.cpptest
grouping.cpptest
ignore_parameter.cpptest
@ -72,6 +75,7 @@ lib_carrays.cpptest
lib_cdata.cpptest
lib_cpointer.cpptest
lib_std_deque.cpptest
lib_std_pair.cpptest
lib_std_string.cpptest
lib_std_vector.cpptest
lib_typemaps.cpptest
@ -83,6 +87,7 @@ name_inherit.cpptest
namespace_enum.cpptest
namespace_extend.cpptest
namespace_nested.cpptest
namespace_spaces.cpptest
namespace_template.cpptest
namespace_typemap.cpptest
namespace_virtual_method.cpptest
@ -106,11 +111,13 @@ smart_pointer_const.cpptest
smart_pointer_const2.cpptest
smart_pointer_multi.cpptest
smart_pointer_multi_typedef.cpptest
smart_pointer_namespace.cpptest
smart_pointer_not.cpptest
smart_pointer_overload.cpptest
smart_pointer_protected.cpptest
smart_pointer_rename.cpptest
smart_pointer_simple.cpptest
smart_pointer_static.cpptest
smart_pointer_typedef.cpptest
static_array_member.cpptest
static_const_member.cpptest
@ -148,6 +155,7 @@ template_ns_enum.cpptest
template_ns_enum2.cpptest
template_ns_inherit.cpptest
template_ns_scope.cpptest
template_partial_arg.cpptest
template_qualifier.cpptest
template_ref_type.cpptest
template_rename.cpptest
@ -184,6 +192,7 @@ using_protected.cpptest
valuewrapper.cpptest
valuewrapper_base.cpptest
valuewrapper_const.cpptest
valuewrapper_default.cpptest
varargs.cpptest
virtual_destructor.cpptest
voidtest.cpptest
@ -217,6 +226,7 @@ preproc_6.ctest
ret_by_value.ctest
sizeof_pointer.ctest
sneaky1.ctest
struct_rename.ctest
typemap_subst.ctest
unions.ctest
imports.multicpptest