Mercurial > hg > libxtract
changeset 144:7fbca00c2c05
removed floatArray and intArray from Java SWIG bindings
| author | Jamie Bullock <jamie@jamiebullock.com> |
|---|---|
| date | Tue, 08 Jan 2013 14:32:45 +0000 |
| parents | 09599ca5a02a |
| children | 2663eac093a5 |
| files | swig/java/Makefile.am swig/xtract.i |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/swig/java/Makefile.am Mon Jan 07 18:14:34 2013 +0000 +++ b/swig/java/Makefile.am Tue Jan 08 14:32:45 2013 +0000 @@ -1,4 +1,6 @@ MAINTAINERCLEANFILES = all-local $(javasources) Makefile.in +TESTNAME = test +JAVA = java javasources = \ SWIGTYPE_p_float.java \ @@ -85,12 +87,15 @@ cd xtract/core/src && mv $(javaclasses) ../ test: - $(JAVAC) test.java + $(JAVAC) $(TESTNAME).java -all-local: java-wrap test +run: + $(JAVA) -Djava.library.path=.libs $(TESTNAME) + +all-local: java-wrap $(TESTNAME) clean-local: -rm xtract_redeclare.i - -rm -f libjxtract.so xtract_wrap.c test.class xtract_subband_scales_.java #$(javasources) $(javaclasses) $(nonautojavaclasses) test.class xtract_subband_scales_.java + -rm -f libjxtract.so xtract_wrap.c $(TESTNAME).class xtract_subband_scales_.java #$(javasources) $(javaclasses) $(nonautojavaclasses) $(TESTNAME).class xtract_subband_scales_.java -rm -rf xtract
--- a/swig/xtract.i Mon Jan 07 18:14:34 2013 +0000 +++ b/swig/xtract.i Tue Jan 08 14:32:45 2013 +0000 @@ -1,6 +1,8 @@ %module xtract %include typemaps.i -%include carrays.i +#ifndef SWIGJAVA +%include carrays.i +#endif %{ #include "xtract/xtract_scalar.h" @@ -92,9 +94,10 @@ %} - +#ifndef SWIGJAVA %array_class(float, floatArray); %array_class(int, intArray); +#endif %apply float *OUTPUT { float *result }; /* %apply float[] {const float *data}; */