Changeset 5918

Timestamp:

Oct 22, 2015, 9:48:01 AM (9 years ago)

Author:

dkearney

Message:

merging r5799 and r5800 (rpExec functions for matlab and octave) from trunk to 1.4 branch

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• lang/matlab/Makefile.in (modified) (2 diffs)
• lang/matlab/rpExec.c (copied) (copied from trunk/lang/matlab/rpExec.c) (1 diff)
• lang/octave/octave3/Makefile.in (modified) (1 diff)
• lang/octave/src/rpExec.cc (copied) (copied from trunk/lang/octave/src/rpExec.cc) (2 diffs)

branches/1.4/lang/matlab/Makefile.in

@@ -66 +66 @@
                 rpUnitsGetUnits$(EXT) \
                 rpUnitsGetUnitsName$(EXT) \
-                rpUtilsProgress$(EXT) 
+                rpUtilsProgress$(EXT) \
+                rpExec$(EXT)
 
 # MEX can't be run in parallel since it generates temporary files
@@ -75 +76 @@
 
 .SUFFIXES: .cc $(EXT)
+
+.c$(EXT):
+        $(MEX) $(MEX_FLAGS) $<
 
 .cc$(EXT):

branches/1.4/lang/matlab/rpExec.c

@@ -76 +76 @@
    char           *stdoutBuffer;
    char           *stderrBuffer;
-
-   pipe(stdoutPipe);
-   pipe(stderrPipe);
+   int             error;
+
+   error = pipe(stdoutPipe);
+   error = pipe(stderrPipe);
 
    if((pid = fork()) < 0) {

branches/1.4/lang/octave/octave3/Makefile.in

@@ -60 +60 @@
                 rpUnitsGetExponent.oct \
                 rpUnitsGetUnits.oct \
-                rpUnitsGetUnitsName.oct
+                rpUnitsGetUnitsName.oct \
+                rpExec.oct
 
 .PHONY: all install clean distclean

branches/1.4/lang/octave/src/rpExec.cc

@@ -76 +76 @@
    char           *stdoutBuffer;
    char           *stderrBuffer;
-
-   pipe(stdoutPipe);
-   pipe(stderrPipe);
+   int             error;
+
+   error = pipe(stdoutPipe);
+   error = pipe(stderrPipe);
 
    if((pid = fork()) < 0) {
@@ -250 +251 @@
          commandArgs = (char **)calloc(commandCell.numel()+1,sizeof(char *));
          for(i1=0; i1<commandCell.numel(); i1++) {
-            commandArg = c(i1).string_value().c_str();
+            commandArg = commandCell(i1).string_value().c_str();
             commandArgs[i1] = (char *)calloc(strlen(commandArg)+1,sizeof(char));
             strcpy(commandArgs[i1],commandArg);