Changeset 1262 for trunk/lang/octave
- Timestamp:
- Dec 20, 2008 11:29:32 PM (15 years ago)
- Location:
- trunk/lang/octave
- Files:
-
- 37 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/lang/octave/Makefile.in
r1101 r1262 1 1 2 2 bindir = @bindir@ 3 datadir 4 datarootdir 3 datadir = @datadir@ 4 datarootdir = @datarootdir@ 5 5 exec_prefix = @exec_prefix@ 6 6 includedir = @includedir@ … … 8 8 mandir = @mandir@ 9 9 prefix = @prefix@ 10 srcdir 10 srcdir = @srcdir@ 11 11 12 destdir 12 destdir = $(libdir)/octave 13 13 14 INSTALL 15 MKDIR_P 16 VPATH 17 RM 14 INSTALL = @INSTALL@ 15 MKDIR_P = @MKDIR_P@ 16 VPATH = $(srcdir) 17 RM = rm -f 18 18 19 19 OCT = @MKOCTFILE@ 20 INCLUDES = \ 20 INCLUDES = \ 21 -I. \ 21 22 -I$(srcdir)/../../src/core \ 22 -I$(prefix)/include 23 DEFINES =24 LIBS 25 OCT_FLAGS 23 -I$(prefix)/include 24 DEFINES = 25 LIBS = -L../../src/core -lrappture 26 OCT_FLAGS = $(INCLUDES) $(DEFINES) 26 27 27 octavedir 28 octavedir = $$RAPPTURE_INSTALL_DIR/lib/octave 28 29 29 OBJS 30 OBJS = \ 30 31 rpAddPresets.oct \ 31 32 rpUtilsProgress.oct \ … … 62 63 rpUnitsGetUnitsName.oct 63 64 64 all: $(OBJS) 65 all: $(OBJS) 65 66 66 67 .SUFFIXES: .cc .o .oct … … 70 71 71 72 .cc.o: 72 $(OCT) $(OCT_FLAGS) -c $< -o $@ 73 $(OCT) $(OCT_FLAGS) -c $< -o $@ 73 74 74 install: $(OBJS) 75 install: $(OBJS) 75 76 $(MKDIR_P) $(destdir) 76 77 for i in $(OBJS) ; do \ … … 78 79 done 79 80 80 clean: 81 $(RM) $(OBJS) 81 clean: 82 $(RM) $(OBJS) 82 83 83 84 distclean: clean -
trunk/lang/octave/RpOctaveInterface.cc
r1085 r1262 44 44 } 45 45 else { 46 print_usage("fopen");46 _PRINT_USAGE ("fopen"); 47 47 } 48 48 -
trunk/lang/octave/RpOctaveInterface.h.in
r1260 r1262 27 27 #endif 28 28 29 // octave versions before 3.0 used a version of the 30 // print_usage function that accepted a parameter 31 // telling the name of the function to print the 32 // usage of. octave 3.0 introduced a print_usage() 33 // function that automatically finds the name of 34 // the function it is being called from. 35 #define OCTAVE_VERSION_MAJOR @OCTAVE_VERSION_MAJOR@ 36 #if (OCTAVE_VERSION_MAJOR >= 3) 37 #define _PRINT_USAGE(x) print_usage() 38 #else 39 #define _PRINT_USAGE(x) print_usage(x) 40 #endif // (OCTAVE_VERSION_MAJOR >= 3) 41 29 42 #endif // _Rp_OCTAVE_HELPER_H -
trunk/lang/octave/rpAddPresets.cc
r122 r1262 60 60 } 61 61 else { 62 print_usage("rpAddPresets");62 _PRINT_USAGE ("rpAddPresets"); 63 63 } 64 64 -
trunk/lang/octave/rpLib.cc
r1085 r1262 54 54 } 55 55 else { 56 print_usage("rpLib");56 _PRINT_USAGE ("rpLib"); 57 57 } 58 58 -
trunk/lang/octave/rpLibChildren.cc
r1085 r1262 81 81 } 82 82 else { 83 print_usage(who.c_str());83 _PRINT_USAGE (who.c_str()); 84 84 } 85 85 } 86 86 else { 87 print_usage(who.c_str());87 _PRINT_USAGE (who.c_str()); 88 88 } 89 89 -
trunk/lang/octave/rpLibChildrenByType.cc
r1085 r1262 86 86 } 87 87 else { 88 print_usage(who.c_str());88 _PRINT_USAGE (who.c_str()); 89 89 } 90 90 } 91 91 else { 92 print_usage(who.c_str());92 _PRINT_USAGE (who.c_str()); 93 93 } 94 94 -
trunk/lang/octave/rpLibElement.cc
r1085 r1262 72 72 } 73 73 else { 74 print_usage(who.c_str());74 _PRINT_USAGE (who.c_str()); 75 75 } 76 76 } 77 77 else { 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 print_usage(who.c_str());82 _PRINT_USAGE (who.c_str()); 83 83 } 84 84 -
trunk/lang/octave/rpLibElementAsComp.cc
r1085 r1262 77 77 } 78 78 else { 79 print_usage(who.c_str());79 _PRINT_USAGE (who.c_str()); 80 80 } 81 81 } 82 82 else { 83 print_usage(who.c_str());83 _PRINT_USAGE (who.c_str()); 84 84 } 85 85 } 86 86 else { 87 print_usage(who.c_str());87 _PRINT_USAGE (who.c_str()); 88 88 } 89 89 -
trunk/lang/octave/rpLibElementAsId.cc
r1085 r1262 76 76 } 77 77 else { 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 print_usage(who.c_str());82 _PRINT_USAGE (who.c_str()); 83 83 } 84 84 } 85 85 else { 86 print_usage(who.c_str());86 _PRINT_USAGE (who.c_str()); 87 87 } 88 88 -
trunk/lang/octave/rpLibElementAsObject.cc
r1085 r1262 72 72 } 73 73 else { 74 print_usage(who.c_str());74 _PRINT_USAGE (who.c_str()); 75 75 } 76 76 } 77 77 else { 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 print_usage(who.c_str());82 _PRINT_USAGE (who.c_str()); 83 83 } 84 84 -
trunk/lang/octave/rpLibElementAsType.cc
r1085 r1262 76 76 } 77 77 else { 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 print_usage(who.c_str());82 _PRINT_USAGE (who.c_str()); 83 83 } 84 84 } 85 85 else { 86 print_usage(who.c_str());86 _PRINT_USAGE (who.c_str()); 87 87 } 88 88 -
trunk/lang/octave/rpLibGet.cc
r1085 r1262 71 71 else { 72 72 // invalid libHandle 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 77 // wrong arg types 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 82 // wrong number of args. 83 print_usage(who.c_str());83 _PRINT_USAGE (who.c_str()); 84 84 } 85 85 -
trunk/lang/octave/rpLibGetDouble.cc
r1085 r1262 71 71 else { 72 72 // invalid libHandle 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 77 // wrong arg types 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 82 // wrong number of args. 83 print_usage(who.c_str());83 _PRINT_USAGE (who.c_str()); 84 84 } 85 85 -
trunk/lang/octave/rpLibGetString.cc
r1085 r1262 71 71 else { 72 72 // invalid libHandle 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 77 // wrong arg types 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 82 // wrong number of args. 83 print_usage(who.c_str());83 _PRINT_USAGE (who.c_str()); 84 84 } 85 85 -
trunk/lang/octave/rpLibNodeComp.cc
r1085 r1262 66 66 else { 67 67 // libHandle is negative 68 print_usage(who.c_str());68 _PRINT_USAGE (who.c_str()); 69 69 } 70 70 } 71 71 else { 72 72 // wrong argument types 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 77 // wrong number of arguments 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 -
trunk/lang/octave/rpLibNodeId.cc
r1085 r1262 61 61 else { 62 62 // libHandle is negative 63 print_usage(who.c_str());63 _PRINT_USAGE (who.c_str()); 64 64 } 65 65 } 66 66 else { 67 67 // wrong argument types 68 print_usage(who.c_str());68 _PRINT_USAGE (who.c_str()); 69 69 } 70 70 } 71 71 else { 72 72 // wrong number of arguments 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 -
trunk/lang/octave/rpLibNodeType.cc
r1085 r1262 61 61 else { 62 62 // libHandle is negative 63 print_usage(who.c_str());63 _PRINT_USAGE (who.c_str()); 64 64 } 65 65 } 66 66 else { 67 67 // wrong argument types 68 print_usage(who.c_str());68 _PRINT_USAGE (who.c_str()); 69 69 } 70 70 } 71 71 else { 72 72 // wrong number of arguments 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 -
trunk/lang/octave/rpLibPut.cc
r1085 r1262 87 87 else { 88 88 // libHandle is negative 89 print_usage(who.c_str());89 _PRINT_USAGE (who.c_str()); 90 90 } 91 91 } 92 92 else { 93 93 // wrong argument types 94 print_usage(who.c_str());94 _PRINT_USAGE (who.c_str()); 95 95 } 96 96 } 97 97 else { 98 98 // wrong number of arguments 99 print_usage(who.c_str());99 _PRINT_USAGE (who.c_str()); 100 100 } 101 101 -
trunk/lang/octave/rpLibPutData.cc
r1085 r1262 100 100 else { 101 101 // libHandle is negative 102 print_usage(who.c_str());102 _PRINT_USAGE (who.c_str()); 103 103 } 104 104 } 105 105 else { 106 106 // wrong argument types 107 print_usage(who.c_str());107 _PRINT_USAGE (who.c_str()); 108 108 } 109 109 } 110 110 else { 111 111 // wrong number of arguments 112 print_usage(who.c_str());112 _PRINT_USAGE (who.c_str()); 113 113 } 114 114 -
trunk/lang/octave/rpLibPutDouble.cc
r1085 r1262 85 85 else { 86 86 // libHandle is negative 87 print_usage(who.c_str());87 _PRINT_USAGE (who.c_str()); 88 88 } 89 89 } 90 90 else { 91 91 // wrong argument types 92 print_usage(who.c_str());92 _PRINT_USAGE (who.c_str()); 93 93 } 94 94 } 95 95 else { 96 96 // wrong number of arguments 97 print_usage(who.c_str());97 _PRINT_USAGE (who.c_str()); 98 98 } 99 99 -
trunk/lang/octave/rpLibPutFile.cc
r1085 r1262 93 93 else { 94 94 // libHandle is negative 95 print_usage(who.c_str());95 _PRINT_USAGE (who.c_str()); 96 96 } 97 97 } 98 98 else { 99 99 // wrong argument types 100 print_usage(who.c_str());100 _PRINT_USAGE (who.c_str()); 101 101 } 102 102 } 103 103 else { 104 104 // wrong number of arguments 105 print_usage(who.c_str());105 _PRINT_USAGE (who.c_str()); 106 106 } 107 107 -
trunk/lang/octave/rpLibPutString.cc
r1085 r1262 86 86 else { 87 87 // libHandle is negative 88 print_usage(who.c_str());88 _PRINT_USAGE (who.c_str()); 89 89 } 90 90 } 91 91 else { 92 92 // wrong argument types 93 print_usage(who.c_str());93 _PRINT_USAGE (who.c_str()); 94 94 } 95 95 } 96 96 else { 97 97 // wrong number of arguments 98 print_usage(who.c_str());98 _PRINT_USAGE (who.c_str()); 99 99 } 100 100 -
trunk/lang/octave/rpLibResult.cc
r1085 r1262 45 45 if ((nargin < 1) || (nargin > 2)) { 46 46 // wrong number of arguments 47 print_usage("rpLibResult");47 _PRINT_USAGE ("rpLibResult"); 48 48 goto done; 49 49 } … … 51 51 if (! args(0).is_real_scalar()) { 52 52 // wrong argument type 53 print_usage("rpLibResult");53 _PRINT_USAGE ("rpLibResult"); 54 54 goto done; 55 55 } … … 60 60 if (! args(1).is_real_scalar()) { 61 61 // wrong argument type 62 print_usage("rpLibResult");62 _PRINT_USAGE ("rpLibResult"); 63 63 goto done; 64 64 } -
trunk/lang/octave/rpLibXml.cc
r1085 r1262 60 60 } 61 61 else { 62 print_usage(who.c_str());62 _PRINT_USAGE (who.c_str()); 63 63 } 64 64 -
trunk/lang/octave/rpUnitsConvert.cc
r135 r1262 67 67 } 68 68 else { 69 print_usage(who.c_str());69 _PRINT_USAGE (who.c_str()); 70 70 } 71 71 } 72 72 else { 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 print_usage(who.c_str());77 _PRINT_USAGE (who.c_str()); 78 78 } 79 79 -
trunk/lang/octave/rpUnitsConvertDbl.cc
r135 r1262 67 67 } 68 68 else { 69 print_usage(who.c_str());69 _PRINT_USAGE (who.c_str()); 70 70 } 71 71 } 72 72 else { 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 print_usage(who.c_str());77 _PRINT_USAGE (who.c_str()); 78 78 } 79 79 -
trunk/lang/octave/rpUnitsConvertObjDbl.cc
r135 r1262 74 74 } 75 75 else { 76 print_usage(who.c_str());76 _PRINT_USAGE (who.c_str()); 77 77 } 78 78 } 79 79 else { 80 print_usage(who.c_str());80 _PRINT_USAGE (who.c_str()); 81 81 } 82 82 } 83 83 else { 84 print_usage(who.c_str());84 _PRINT_USAGE (who.c_str()); 85 85 } 86 86 -
trunk/lang/octave/rpUnitsConvertObjStr.cc
r1103 r1262 71 71 } 72 72 } else { 73 print_usage(who.c_str());73 _PRINT_USAGE(who.c_str()); 74 74 } 75 75 } else { 76 print_usage(who.c_str());76 _PRINT_USAGE(who.c_str()); 77 77 } 78 78 } else { 79 print_usage(who.c_str());79 _PRINT_USAGE(who.c_str()); 80 80 } 81 81 retval(0) = outVal; -
trunk/lang/octave/rpUnitsConvertStr.cc
r135 r1262 67 67 } 68 68 else { 69 print_usage(who.c_str());69 _PRINT_USAGE (who.c_str()); 70 70 } 71 71 } 72 72 else { 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 print_usage(who.c_str());77 _PRINT_USAGE (who.c_str()); 78 78 } 79 79 -
trunk/lang/octave/rpUnitsDefineUnit.cc
r135 r1262 84 84 } 85 85 else { 86 print_usage(who.c_str());86 _PRINT_USAGE (who.c_str()); 87 87 } 88 88 } 89 89 else { 90 print_usage(who.c_str());90 _PRINT_USAGE (who.c_str()); 91 91 } 92 92 } 93 93 else { 94 print_usage(who.c_str());94 _PRINT_USAGE (who.c_str()); 95 95 } 96 96 -
trunk/lang/octave/rpUnitsFind.cc
r135 r1262 72 72 } 73 73 else { 74 print_usage(who.c_str());74 _PRINT_USAGE (who.c_str()); 75 75 } 76 76 } 77 77 else { 78 print_usage(who.c_str());78 _PRINT_USAGE (who.c_str()); 79 79 } 80 80 } 81 81 else { 82 print_usage(who.c_str());82 _PRINT_USAGE (who.c_str()); 83 83 } 84 84 -
trunk/lang/octave/rpUnitsGetBasis.cc
r165 r1262 86 86 else { 87 87 // invalid unitHandle 88 print_usage(who.c_str());88 _PRINT_USAGE (who.c_str()); 89 89 } 90 90 } 91 91 else { 92 print_usage(who.c_str());92 _PRINT_USAGE (who.c_str()); 93 93 } 94 94 } 95 95 else { 96 print_usage(who.c_str());96 _PRINT_USAGE (who.c_str()); 97 97 } 98 98 -
trunk/lang/octave/rpUnitsGetExponent.cc
r135 r1262 62 62 else { 63 63 // invalid unitHandle 64 print_usage(who.c_str());64 _PRINT_USAGE (who.c_str()); 65 65 } 66 66 } 67 67 else { 68 print_usage(who.c_str());68 _PRINT_USAGE (who.c_str()); 69 69 } 70 70 } 71 71 else { 72 print_usage(who.c_str());72 _PRINT_USAGE (who.c_str()); 73 73 } 74 74 -
trunk/lang/octave/rpUnitsGetUnits.cc
r135 r1262 66 66 else { 67 67 // invalid unitHandle 68 print_usage(who.c_str());68 _PRINT_USAGE (who.c_str()); 69 69 } 70 70 } 71 71 else { 72 print_usage(who.c_str());72 _PRINT_USAGE (who.c_str()); 73 73 } 74 74 } 75 75 else { 76 print_usage(who.c_str());76 _PRINT_USAGE (who.c_str()); 77 77 } 78 78 -
trunk/lang/octave/rpUnitsGetUnitsName.cc
r135 r1262 64 64 else { 65 65 // invalid unitHandle 66 print_usage(who.c_str());66 _PRINT_USAGE (who.c_str()); 67 67 } 68 68 } 69 69 else { 70 print_usage(who.c_str());70 _PRINT_USAGE (who.c_str()); 71 71 } 72 72 } 73 73 else { 74 print_usage(who.c_str());74 _PRINT_USAGE (who.c_str()); 75 75 } 76 76 -
trunk/lang/octave/rpUnitsMakeMetric.cc
r135 r1262 67 67 else { 68 68 // invalid unitHandle 69 print_usage(who.c_str());69 _PRINT_USAGE (who.c_str()); 70 70 } 71 71 } 72 72 else { 73 print_usage(who.c_str());73 _PRINT_USAGE (who.c_str()); 74 74 } 75 75 } 76 76 else { 77 print_usage(who.c_str());77 _PRINT_USAGE (who.c_str()); 78 78 } 79 79 -
trunk/lang/octave/rpUtilsProgress.cc
r665 r1262 52 52 else { 53 53 // wrong argument types 54 print_usage(who.c_str());54 _PRINT_USAGE (who.c_str()); 55 55 } 56 56 } 57 57 else { 58 58 // wrong number of arguments 59 print_usage(who.c_str());59 _PRINT_USAGE (who.c_str()); 60 60 } 61 61
Note: See TracChangeset
for help on using the changeset viewer.