From: <xav...@us...> - 2011-08-08 21:41:41
|
Revision: 12774 http://swig.svn.sourceforge.net/swig/?rev=12774&view=rev Author: xavier98 Date: 2011-08-08 21:41:34 +0000 (Mon, 08 Aug 2011) Log Message: ----------- Octave patches for 3.4.0 compatibility, etc. (sf 3387394, thanks for Karl Wette) Modified Paths: -------------- trunk/Examples/Makefile.in trunk/Examples/octave/callback/Makefile trunk/Examples/octave/class/Makefile trunk/Examples/octave/constants/Makefile trunk/Examples/octave/contract/Makefile trunk/Examples/octave/enum/Makefile trunk/Examples/octave/extend/Makefile trunk/Examples/octave/funcptr/Makefile trunk/Examples/octave/funcptr2/Makefile trunk/Examples/octave/functor/Makefile trunk/Examples/octave/operator/Makefile trunk/Examples/octave/operator/example.i trunk/Examples/octave/operator/runme.m trunk/Examples/octave/pointer/Makefile trunk/Examples/octave/reference/Makefile trunk/Examples/octave/simple/Makefile trunk/Examples/octave/template/Makefile trunk/Examples/octave/variables/Makefile trunk/Lib/octave/octrun.swg trunk/configure.in Modified: trunk/Examples/Makefile.in =================================================================== --- trunk/Examples/Makefile.in 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/Makefile.in 2011-08-08 21:41:34 UTC (rev 12774) @@ -333,6 +333,7 @@ # Make sure these locate your Octave installation OCTAVE_INCLUDE= $(DEFS) @OCTAVEEXT@ OCTAVE_LIB = +OCTAVE = @OCTAVE@ # Extra Octave specific dynamic linking options OCTAVE_DLNK = @OCTAVEDYNAMICLINKING@ @@ -359,6 +360,15 @@ $(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) # ----------------------------------------------------------------- +# Running an Octave example +# ----------------------------------------------------------------- + +OCTSCRIPT = runme.m + +octave_run: $(OCTSCRIPT) + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVEPATH=$(srcdir):$$OCTAVEPATH $(OCTAVE) $(OCTSCRIPT) >/dev/null + +# ----------------------------------------------------------------- # Cleaning the octave examples # ----------------------------------------------------------------- Modified: trunk/Examples/octave/callback/Makefile =================================================================== --- trunk/Examples/octave/callback/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/callback/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/class/Makefile =================================================================== --- trunk/Examples/octave/class/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/class/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/constants/Makefile =================================================================== --- trunk/Examples/octave/constants/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/constants/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/contract/Makefile =================================================================== --- trunk/Examples/octave/contract/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/contract/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/enum/Makefile =================================================================== --- trunk/Examples/octave/enum/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/enum/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/extend/Makefile =================================================================== --- trunk/Examples/octave/extend/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/extend/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/funcptr/Makefile =================================================================== --- trunk/Examples/octave/funcptr/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/funcptr/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/funcptr2/Makefile =================================================================== --- trunk/Examples/octave/funcptr2/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/funcptr2/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/functor/Makefile =================================================================== --- trunk/Examples/octave/functor/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/functor/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/operator/Makefile =================================================================== --- trunk/Examples/octave/operator/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/operator/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).m check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/operator/example.i =================================================================== --- trunk/Examples/octave/operator/example.i 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/operator/example.i 2011-08-08 21:41:34 UTC (rev 12774) @@ -10,13 +10,13 @@ /* An output method that turns a complex into a short string */ %extend ComplexVal { - char *__str() { + char *__str__() { static char temp[512]; sprintf(temp,"(%g,%g)", $self->re(), $self->im()); return temp; } - ComplexVal __paren(int j) { + ComplexVal __paren__(int j) { return ComplexVal($self->re()*j,$self->im()*j); } }; Modified: trunk/Examples/octave/operator/runme.m =================================================================== --- trunk/Examples/octave/operator/runme.m 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/operator/runme.m 2011-08-08 21:41:34 UTC (rev 12774) @@ -4,21 +4,21 @@ a = example.ComplexVal(2,3); b = example.ComplexVal(-5,10); -printf("a = %s\n",a); -printf("b = %s\n",b); +printf("a = %s\n",disp(a)); +printf("b = %s\n",disp(b)); c = a + b; -printf("c = %s\n",c); -printf("a*b = %s\n",a*b); -printf("a-c = %s\n",a-c); +printf("c = %s\n",disp(c)); +printf("a*b = %s\n",disp(a*b)); +printf("a-c = %s\n",disp(a-c)); e = example.ComplexVal(a-c); -printf("e = %s\n",e); +printf("e = %s\n",disp(e)); # Big expression f = ((a+b)*(c+b*e)) + (-a); -printf("f = %s\n",f); +printf("f = %s\n",disp(f)); # paren overloading -printf("a(3)= %s\n",a(3)); +printf("a(3)= %s\n",disp(a(3))); Modified: trunk/Examples/octave/pointer/Makefile =================================================================== --- trunk/Examples/octave/pointer/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/pointer/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/reference/Makefile =================================================================== --- trunk/Examples/octave/reference/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/reference/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/simple/Makefile =================================================================== --- trunk/Examples/octave/simple/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/simple/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/template/Makefile =================================================================== --- trunk/Examples/octave/template/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/template/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -19,3 +19,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Examples/octave/variables/Makefile =================================================================== --- trunk/Examples/octave/variables/Makefile 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Examples/octave/variables/Makefile 2011-08-08 21:41:34 UTC (rev 12774) @@ -17,3 +17,4 @@ rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile octave_run Modified: trunk/Lib/octave/octrun.swg =================================================================== --- trunk/Lib/octave/octrun.swg 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/Lib/octave/octrun.swg 2011-08-08 21:41:34 UTC (rev 12774) @@ -399,6 +399,10 @@ Swig::erase_rtdir(types[j].second.ptr); } + dim_vector dims(void) const { + return dim_vector(1,1); + } + octave_value as_value() { ++count; return Swig::swig_value_ref(this); @@ -928,6 +932,9 @@ octave_base_value *empty_clone() const { return new octave_swig_ref(0); } + dim_vector dims(void) const + { return ptr->dims(); } + bool is_defined() const { return ptr->is_defined(); } Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2011-08-05 06:43:35 UTC (rev 12773) +++ trunk/configure.in 2011-08-08 21:41:34 UTC (rev 12774) @@ -923,19 +923,20 @@ AC_MSG_CHECKING(for Octave header files) if test -n "$OCTAVE"; then - OCTAVEDIR="/usr/include" + OCTAVECONFIG=[`echo $OCTAVEBIN | sed 's|octave\([^/]*\)$|octave-config\1|'`] + if test -r "$OCTAVECONFIG"; then + OCTAVEDIR=`$OCTAVECONFIG -p OCTINCLUDEDIR | sed 's|/octave$||'` + else + OCTAVEDIR="/usr/include" + fi if test "$OCTAVEDIR" != ""; then - dirs="$OCTAVEDIR" + dirs="$OCTAVEDIR/octave $OCTAVEDIR" OCTAVEEXT="" for i in $dirs; do if test -r $i/octave/oct.h; then OCTAVEEXT="$i" break; fi - if test -r $i/octave/octave/oct.h; then - OCTAVEEXT="$i/octave" - break; - fi done if test "$OCTAVEEXT" = "" ; then AC_MSG_RESULT(not found) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |