Farbflash projects: Imaging lingo table | 3-D scene list | Find all | Handler menu | Lingo message window

Changeset 131 for trunk/lingosource


Ignore:
Timestamp:
02/05/08 15:57:24 (4 years ago)
Author:
alex
Message:

fixed support for tortoiseMerge

Location:
trunk/lingosource/castlib1
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/lingosource/castlib1/alexUtilities.ls

    r123 r131  
    23152315 
    23162316 
    2317 on mDoShellCmd me, cmd, returnList 
     2317on mDoShellCmd me, cmd, ReturnChar, maxTime, returnList, useOpen, stdout_callback, stderr_callback 
     2318   
     2319  if voidP(maxTime) then maxTime = 0 
    23182320   
    23192321  if  mCheckForXtra(me, "ff_shell") = 0 then 
    … …  
    23272329          return shell_cmd_list(cmd) 
    23282330        else 
    2329           return shell_cmd(cmd, void, 0, 1, void, void, void) 
     2331          return shell_cmd(cmd, ReturnChar, maxTime, 1, useOpen, stdout_callback, stderr_callback) 
    23302332        end if 
    23312333         
    … …  
    23352337          return shell_cmd(cmd) 
    23362338        else 
    2337           return shell_cmd(cmd, void, 0, 0, void, void, void) 
     2339          return shell_cmd(cmd, ReturnChar, maxTime, 0, useOpen, stdout_callback, stderr_callback) 
    23382340        end if 
    23392341         

  • trunk/lingosource/castlib1/bbedit_Utilities.ls

    r93 r131  
    234234  end if 
    235235   
    236   bbdiffpath = mDoShellCmd(me, "which bbdiff", 1) 
     236  bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1) 
    237237  if count(bbdiffpath) > 0 then 
    238238    bbdiffpath = bbdiffpath[1] 
    … …  
    439439   
    440440   
    441   bbdiffpath = mDoShellCmd(me, "which bbdiff", 1) 
     441  bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1) 
    442442   
    443443  if count(bbdiffpath) > 0 then 
    … …  
    906906     
    907907    if mCheckForXtra(me, "Shell") = 1 or mCheckForXtra(me, "ff_shell") = 1 then 
    908       bbdiffpath = mDoShellCmd(me, "which bbdiff", 1) 
     908      bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1) 
    909909      if count(bbdiffpath) > 0 then 
    910910        bbdiffpath = bbdiffpath[1] 

  • trunk/lingosource/castlib1/svn_Utilities.ls

    r129 r131  
    152152             
    153153             
    154             theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE && "2>&1", 1) 
     154            theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE && "2>&1", RETURN, 0, 1) 
    155155             
    156156            -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished 
    … …  
    304304  binaryPath = [] 
    305305   
    306   binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done", 1) 
     306  binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done", RETURN, 0, 1) 
    307307   
    308308  if count(binaryPath) > 0 then return binaryPath[1] 
    … …  
    15901590  mDisplayWaitStatusText me, "Updating folder:" && workingFolder 
    15911591   
    1592   theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, 1) 
     1592  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1) 
    15931593   
    15941594  if statusSwitched = 1 then statusSwitched = mSwitchToStatusMode(me, 0) 
    … …  
    17541754              end if 
    17551755               
    1756               theresult = mDoShellCmd(me, svnBinary && "delete" && QUOTE & ufpath & QUOTE, 1) 
     1756              theresult = mDoShellCmd(me, svnBinary && "delete" && QUOTE & ufpath & QUOTE, RETURN, 0, 1) 
    17571757              if count(theresult) < 1 then 
    17581758                put "failed to svn delete member " & memref & " no result from svn?!" 
    … …  
    18141814    end if 
    18151815     
    1816     theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, 1) 
     1816    theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1) 
    18171817     
    18181818    if count(theresult) > 0 then 
    … …  
    20772077    mDisplayWaitStatusText me, "SVN update of:" && castlibList[r][3] 
    20782078     
    2079     theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE, 1) 
     2079    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1) 
    20802080     
    20812081    if count(theresult) < 1 then 
    2082       theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE && "2>&1", 1) 
     2082      theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE && "2>&1", RETURN, 0, 1) 
    20832083      if count(theresult) < 1 then 
    20842084        theError = theresult[1] 
    … …  
    20942094     
    20952095     
    2096     theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & castlibList[r][3] & QUOTE, 1) 
     2096    theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1) 
    20972097     
    20982098    cnt = count(theresult) 
    … …  
    21212121  mDisplayWaitStatusText me, "SVN commit for:" && pathStr 
    21222122   
    2123   theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & pathStr, 1) 
     2123  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & pathStr, RETURN, 0, 1) 
    21242124   
    21252125   
    … …  
    22512251  mDisplayWaitStatusText me, "SVN update for:" && workingFolder 
    22522252   
    2253   theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, 1) 
     2253  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1) 
    22542254   
    22552255  if count(theresult) < 1 then 
    2256     theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE && "2>&1", 1) 
     2256    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE && "2>&1", RETURN, 0, 1) 
    22572257    if count(theresult) < 1 then 
    22582258      theError = theresult[1] 
    … …  
    22742274  ------- in order to implement #1 you can use a repeat loop just like the above repeat, which goes thorugh each castlib 
    22752275   
    2276   theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & workingFolder & QUOTE, 1) 
     2276  theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1) 
    22772277   
    22782278  cnt = count(theresult) 
    … …  
    22982298         
    22992299      "?": -- newly added file 
    2300         mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, 1) 
     2300        mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1) 
    23012301         
    23022302        put "Added file" && answ && "to the repository" 
    … …  
    23142314  mDisplayWaitStatusText me, "SVN commit of:" && workingFolder 
    23152315   
    2316   theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, 1) 
     2316  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1) 
    23172317   
    23182318   
    … …  
    24342434  mDisplayWaitStatusText me, "SVN update:" && newpathUnix 
    24352435   
    2436   theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & newpathUnix & QUOTE, 1) 
     2436  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & newpathUnix & QUOTE, RETURN, 0, 1) 
    24372437   
    24382438   
    … …  
    25362536  mDisplayWaitStatusText me, "SVN update:" && workingFolderUnix 
    25372537   
    2538   theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolderUnix & QUOTE, 1) 
     2538  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolderUnix & QUOTE, RETURN, 0, 1) 
    25392539   
    25402540  if count(theresult) > 0 then 
    … …  
    28232823   
    28242824   
    2825   theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder, 1) 
     2825  theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder, RETURN, 0, 1) 
    28262826   
    28272827   
    28282828  if count(theresult) < 1 then 
    2829     theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder && "2>&1", 1) 
     2829    theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder && "2>&1", RETURN, 0, 1) 
    28302830    if count(theresult) < 1 then 
    28312831      theError = theresult[1] 
    … …  
    28382838  end if 
    28392839   
    2840   theresult = mDoShellCmd(me, svnBinary && "status" & workingFolder, 1) 
     2840  theresult = mDoShellCmd(me, svnBinary && "status" & workingFolder, RETURN, 0, 1) 
    28412841   
    28422842  cnt = count(theresult) 
    … …  
    28642864         
    28652865      "?": -- newly added file 
    2866         mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, 1) 
     2866        mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1) 
    28672867         
    28682868        put "Added file" && answ && "to the repository" 
    … …  
    28822882  mDisplayWaitStatusText me, "SVN commit:" && workingFolder 
    28832883   
    2884   theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & workingFolder, 1) 
     2884  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & workingFolder, RETURN, 0, 1) 
    28852885   
    28862886   
    … …  
    29442944      svnBinary = [] 
    29452945       
    2946       svnBinary = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name svn ; done", 1) 
     2946      svnBinary = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name svn ; done", RETURN, 0, 1) 
    29472947      -- end if 
    29482948       
Note: See TracChangeset for help on using the changeset viewer.