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

Fixes to Octave examples

Browse source 
- rename example modules from "example" to "swigexample", to avoid a
  warning from shadowing the Octave built-in function "example"
- remove deprecated "static" Makefile targets: there is no longer
  an option to build static Octave modules in the Examples Makefile
- emacs whitespace cleanup run on all files
This commit is contained in:
Karl Wette 2013-05-08 22:43:49 +02:00 • committed by william
commit c28d0c6c80
63 changed files with 211 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/octave/module_load/Makefile
View file

@ -1,7 +1,7 @@
TOP = ../..
SWIG = $(TOP)/../preinst-swig
SRCS = example.c
TARGET = example
TARGET = swigexample
INTERFACE = example.i
check: build
@ -13,10 +13,6 @@ build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)2' SWIGOPT='-module $$(TARGET) -globals .' INTERFACE='$(INTERFACE)' octave
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).m

52
Examples/octave/module_load/runme.m
View file

@ -2,60 +2,60 @@
# load module
clear all;
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
clear all
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
clear all
# load module in a function globally before base context
clear all;
function testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
endfunction
testme
testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
clear all
function testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
endfunction
testme
testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
clear all
# load module in a function globally after base context
clear all;
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
function testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
endfunction
testme
testme
clear all
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
function testme
example;
swigexample;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
assert(exist("swigexample","var"));
endfunction
testme
testme
@ -69,13 +69,13 @@ endif
# load module with no cvar
clear all;
example2;
assert(example2.ivar == ifunc);
assert(exist("example2","var"));
swigexample2;
assert(swigexample2.ivar == ifunc);
assert(exist("swigexample2","var"));
assert(!isglobal("cvar"))
clear all
example2;
assert(example2.ivar == ifunc);
assert(exist("example2","var"));
swigexample2;
assert(swigexample2.ivar == ifunc);
assert(exist("swigexample2","var"));
assert(!isglobal("cvar"))
clear all