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

[OCaml] Rename example_prog.ml to runme.ml in the OCaml examples

Browse source 
Name the output executable "runme" in the examples.
Replace use of "foolib" in the string_from_ptr example.
Fix a warning in the std_vector example.
Add strings_test to Examples/ocaml/check.list.
Disable two tests that were causing the OCaml test suite to fail.
This commit is contained in:
Zackery Spytz 2019-01-07 11:59:07 -07:00
commit 8f7bc4cc10
18 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -164,8 +164,8 @@ Examples/test-suite/ocaml/*.cm*
Examples/test-suite/ocaml/runme Examples/test-suite/ocaml/runme
!Examples/test-suite/ocaml/*runme.ml !Examples/test-suite/ocaml/*runme.ml
Examples/ocaml/**/example.ml* Examples/ocaml/**/example.ml*
Examples/ocaml/**/example Examples/ocaml/**/runme
Examples/ocaml/**/example_top Examples/ocaml/**/runme_top
Examples/ocaml/**/*.cm* Examples/ocaml/**/*.cm*
Examples/ocaml/**/swig.ml* Examples/ocaml/**/swig.ml*
Examples/ocaml/**/swigp4.ml Examples/ocaml/**/swigp4.ml

14
Examples/Makefile.in
View file

@ -919,7 +919,7 @@ ocaml_static: $(SRCDIR_SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(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)" $(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
ocaml_dynamic: $(SRCDIR_SRCS) ocaml_dynamic: $(SRCDIR_SRCS)
$(OCAMLCORE) $(OCAMLCORE)
@ -931,7 +931,7 @@ ocaml_dynamic: $(SRCDIR_SRCS)
rm $(INTERFACE:%.i=%.mli) rm $(INTERFACE:%.i=%.mli)
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml) $(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
$(NOLINK) || $(OCAMLFIND) $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) swig.cmo -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(NOLINK) || $(OCAMLFIND) $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
ocaml_static_toplevel: $(SRCDIR_SRCS) ocaml_static_toplevel: $(SRCDIR_SRCS)
$(OCAMLCORE) $(OCAMLCORE)
@ -940,7 +940,7 @@ ocaml_static_toplevel: $(SRCDIR_SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(TARGET)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" $(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
ocaml_static_cpp: $(SRCDIR_SRCS) ocaml_static_cpp: $(SRCDIR_SRCS)
$(OCAMLCORE) $(OCAMLCORE)
@ -950,7 +950,7 @@ ocaml_static_cpp: $(SRCDIR_SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(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)" -cc '$(CXX) -Wno-write-strings' $(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
ocaml_static_cpp_toplevel: $(SRCDIR_SRCS) ocaml_static_cpp_toplevel: $(SRCDIR_SRCS)
$(OCAMLCORE) $(OCAMLCORE)
@ -960,7 +960,7 @@ ocaml_static_cpp_toplevel: $(SRCDIR_SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(TARGET)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings' $(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
ocaml_dynamic_cpp: $(SRCDIR_SRCS) ocaml_dynamic_cpp: $(SRCDIR_SRCS)
$(OCAMLCORE) $(OCAMLCORE)
@ -973,14 +973,14 @@ ocaml_dynamic_cpp: $(SRCDIR_SRCS)
rm $(INTERFACE:%.i=%.mli) rm $(INTERFACE:%.i=%.mli)
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml) $(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
$(NOLINK) || $(OCAMLFIND) swig.cmo $(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom -o $(TARGET) -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings' $(NOLINK) || $(OCAMLFIND) swig.cmo $(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom -o $(RUNME) -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings'
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Run ocaml example # Run ocaml example
# ----------------------------------------------------------------- # -----------------------------------------------------------------
ocaml_run: ocaml_run:
$(RUNTOOL) ./$(TARGET) $(RUNPIPE) $(RUNTOOL) ./$(RUNME) $(RUNPIPE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display

2
Examples/ocaml/argout_ref/Makefile
View file

@ -5,7 +5,7 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
MLFILE = example.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = example.o OBJS = example.o
check: build check: build

2
Examples/ocaml/argout_ref/example_prog.ml → Examples/ocaml/argout_ref/runme.ml
View file

@ -1,4 +1,4 @@
(* example_prog.ml *) (* runme.ml *)
open Swig open Swig
open Example open Example

1
Examples/ocaml/check.list
View file

@ -8,3 +8,4 @@ shapes
contract contract
scoped_enum scoped_enum
string_from_ptr string_from_ptr
strings_test

2
Examples/ocaml/contract/Makefile
View file

@ -5,7 +5,7 @@ SRCS =
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
MLFILE = example.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = OBJS =
check: build check: build

0
Examples/ocaml/contract/example_prog.ml → Examples/ocaml/contract/runme.ml
View file

2
Examples/ocaml/scoped_enum/Makefile
View file

@ -5,7 +5,7 @@ SRCS =
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
MLFILE = example.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = OBJS =
check: build check: build

0
Examples/ocaml/scoped_enum/example_prog.ml → Examples/ocaml/scoped_enum/runme.ml
View file

2
Examples/ocaml/shapes/Makefile
View file

@ -6,7 +6,7 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
MLFILE = example.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = example.o OBJS = example.o
check: build check: build

2
Examples/ocaml/shapes/example_prog.ml → Examples/ocaml/shapes/runme.ml
View file

@ -1,4 +1,4 @@
(* example_prog.ml *) (* runme.ml *)
open Swig ;; open Swig ;;
open Example ;; open Example ;;

2
Examples/ocaml/simple/Makefile
View file

@ -5,7 +5,7 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
MLFILE = example.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = example.o OBJS = example.o
check: build check: build

2
Examples/ocaml/simple/example_prog.ml → Examples/ocaml/simple/runme.ml
View file

@ -1,4 +1,4 @@
(* example_prog.ml *) (* runme.ml *)
open Swig open Swig
open Example open Example

4
Examples/ocaml/std_vector/runme.ml
View file

@ -14,7 +14,7 @@ let print_DoubleVector v =
(fun v i -> (fun v i ->
print_float ((v '[i to int]) as float) ; print_float ((v '[i to int]) as float) ;
print_string " ") ; print_string " ") ;
print_endline print_endline ""
end end
(* Call average with a Ocaml array... *) (* Call average with a Ocaml array... *)
@ -27,7 +27,7 @@ let rec fill_dv v x =
fill_dv v (x *. x) fill_dv v (x *. x)
end end
let _ = fill_dv v 0.999 let _ = fill_dv v 0.999
let _ = print_DoubleVector v ; print_endline "" let _ = print_DoubleVector v
let u = new_IntVector '() let u = new_IntVector '()
let _ = for i = 1 to 4 do let _ = for i = 1 to 4 do
u -> push_back ((i to int)) u -> push_back ((i to int))

6
Examples/ocaml/string_from_ptr/Makefile
View file

@ -4,9 +4,9 @@ SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT = -c++ SWIGOPT = -c++
SRCS = SRCS =
TARGET = example TARGET = example
INTERFACE = foolib.i INTERFACE = example.i
MLFILE = foolib.ml MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = runme.ml
OBJS = OBJS =
check: build check: build

2
Examples/ocaml/string_from_ptr/foolib.i → Examples/ocaml/string_from_ptr/example.i
View file

@ -1,4 +1,4 @@
%module foolib %module example
%{ %{
static int foo( char **buf ) { static int foo( char **buf ) {
*buf = "string from c"; *buf = "string from c";

4
Examples/ocaml/string_from_ptr/example_prog.ml → Examples/ocaml/string_from_ptr/runme.ml
View file

@ -1,7 +1,5 @@
(* foo_program.ml -- the program using foolib *)
open Swig (* Give access to the swig library *) open Swig (* Give access to the swig library *)
open Foolib (* This is the name of your swig output *) open Example (* This is the name of your swig output *)
let results = _foo '() (* Function names are prefixed with _ in order to make let results = _foo '() (* Function names are prefixed with _ in order to make
them lex as identifiers in ocaml. Consider that them lex as identifiers in ocaml. Consider that

2
Examples/test-suite/ocaml/Makefile.in
View file

@ -21,6 +21,7 @@ default_constructor \
director_binary_string \ director_binary_string \
director_enum \ director_enum \
director_exception \ director_exception \
director_exception_nothrow \
director_ignore \ director_ignore \
director_nested \ director_nested \
director_pass_by_value \ director_pass_by_value \
@ -30,6 +31,7 @@ director_redefined \
director_string \ director_string \
director_using \ director_using \
enum_thorough \ enum_thorough \
li_windows \
member_pointer_const \ member_pointer_const \
minherit \ minherit \
nested_directors \ nested_directors \