Changeset 20 for trunk/lingosource

Timestamp:

09/12/07 18:27:50 (5 years ago)

Author:

alex

Message:

a text member can be used to specify the castlibs to process when commiting to subversion

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (1 diff)
• castlib1/alexUtilities.ls (modified) (13 diffs)
• castlib2/memberInfo.xml (modified) (1 diff)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -198 +198 @@
   li.add(subli)
   
-  subli.add("mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg")
+  subli.add("mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionListMember")
   subli.add("mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext me, chooseNewPath, commitMsg")
   ----------------------------------------------------

trunk/lingosource/castlib1/alexUtilities.ls

@@ -4069 +4069 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg 
+on mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionListMember
   
   commitMsg = string(commitMsg)
@@ -4081 +4081 @@
   end if
   
-  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1)
-  
-  theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1)
-  
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg, dontSave, dontShowAlert
-  
-  actCL = the activecastlib
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1, selectionListMember)
+  
+  theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1, 0, selectionListMember)
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg, dontSave, dontShowAlert, selectionListMember
+  
+  
+  castlibList = 0
+  selectionListMember = member(selectionListMember)
+  if length(selectionListMember) > 0 then
+    mem = member(selectionListMember)
+    if not(voidP(mem)) then
+      dertext = mem.text
+      dertext = value(dertext.line[1])
+      if listP(dertext) then
+        castlibList = []
+        dertextCnt = count(dertext)
+        repeat with n = 1 to dertextCnt
+          if listP(dertext[n]) then
+            castlibList.add(n)
+          end if
+        end repeat
+      end if
+    end if
+  end if
+  
+  if castlibList = 0 then
+    castlibList = []
+    actCL = the activecastlib
+    castlibList.add(actCL)
+  end if
+  
+  
+  mpname = the moviepath & the moviename
+  isInternal = 0
+  repeat with cl in castlibList
+    if castlib(cl).filename = mpname then
+      isInternal = 1
+      exit repeat
+    end if
+  end repeat
+  
+  if count(castlibList) < 1 then return 0
+  
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -4127 +4164 @@
     end if
     
-    if the moviepath & the moviename = castlib(actCL).filename then
+    --    if the moviepath & the moviename = castlib(actCL).filename then
+    --      savemovie()
+    --    else
+    --      castlib(actCL).save()
+    --   end if
+    
+    if isInternal = 1 then
       savemovie()
     else
-      castlib(actCL).save()
+      repeat with cl in castlibList
+        castlib(cl).save()
+      end repeat
     end if
     
@@ -4136 +4181 @@
   ----------------------------------------
   
-  fname = castlib(actCL).filename
+  
+  
+  
+  --  fname = castlib(actCL).filename
   
   
@@ -4147 +4195 @@
     the itemdelimiter = mp
     
-    fname = castlib(actCL).filename
-    if length(fname) > 0 then
-      
-      offs = offset(mp, fname)
-      if offs <> 1 then
-        alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+    
+    repeat with cl in castlibList
+      
+      fname = castlib(cl).filename
+      
+      if length(fname) > 0 then
+        
+        offs = offset(mp, fname)
+        if offs <> 1 then
+          alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+          return 0
+        end if
+        
+        relpath = fname
+        delete char 1 to mplen of relpath
+        
+        newpath = workingFolder & relpath
+        newpathDir = newpath
+        delete the last item of newpathDir
+        if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
+        baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
+        
+        castlibList[cl] = [cl, fname, newpath, newpathDir]
+        
+      else
+        
+        -- must be something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
         return 0
-      end if
-      
-      relpath = fname
-      delete char 1 to mplen of relpath
-      
-      newpath = workingFolder & relpath
-      newpathDir = newpath
-      delete the last item of newpathDir
-      if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
-      baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
-      
-    else
-      
-      -- musty something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
-      return 0
-      
-    end if
+        
+      end if
+      
+    end repeat
+    
     
     the itemdelimiter = olddelim
@@ -4176 +4233 @@
   else
     
-    newpath = fname
+    repeat with cl in castlibList
+      newpath = fname
+      castlibList[cl] = [cl, fname, fname]
+    end repeat
+    
   end if
   ---------------------------------------
@@ -4185 +4246 @@
     svnBinary = baUnixName(svnBinary)
     workingFolder = baUnixName(workingFolder)
-    newpath = baUnixName(newpath)
+    
+    repeat with cl in castlibList
+      castlibList[cl][3] = baUnixName(castlibList[cl][3])
+    end repeat
+    
   else
     if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
@@ -4192 +4257 @@
   
   
-  ---------------------------------------
-  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & newpath & QUOTE)
-  
-  if count(theresult) < 1 then
-    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & newpath & QUOTE && "2>&1")
+  
+  repeat with cl in castlibList
+    ---------------------------------------
+    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[cl][3] & QUOTE)
+    
     if count(theresult) < 1 then
-      theError = theresult[1]
-    else
-      theError = "svn did not respond at all."
-    end if
-    alert "Can't proceed svn error while trying to update:" && theError
-    return 0  
-  end if
-  ---------------------------------------
-  
-  
-  theresult = shell_cmd_list(svnBinary && "status" && QUOTE & newpath & QUOTE)
-  
-  cnt = count(theresult)
-  if cnt < 1 then
-    alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
-    return 0
-  end if
-  
-  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & newpath & QUOTE)
+      theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[cl][3] & QUOTE && "2>&1")
+      if count(theresult) < 1 then
+        theError = theresult[1]
+      else
+        theError = "svn did not respond at all."
+      end if
+      alert "Can't proceed svn error while trying to update:" && theError
+      return 0  
+    end if
+    ---------------------------------------
+    
+    
+    
+    theresult = shell_cmd_list(svnBinary && "status" && QUOTE & castlibList[cl][3] & QUOTE)
+    
+    cnt = count(theresult)
+    if cnt < 1 then
+      alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
+      return 0
+    end if
+    
+  end repeat
+  
+  pathStr = ""
+  repeat with cl in castlibList
+    put " " & QUOTE & castlibList[cl][3] & QUOTE after pathStr
+  end repeat
+  
+  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE & pathStr)
   
   
@@ -4682 +4757 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert
+on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert, selectionListMember
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -4715 +4790 @@
   
   
+  
+  
   clibfolder = ""
   
+  castlibList = 0
+  
+  
   
   -------- if we work on only one castlib:
   
   if ilk(selected_Members_Only) = #castLib then
-    selected_Members_Only.save()
+    
+    
+    -----------------------------------------------------
+    
+    selectionListMember = member(selectionListMember)
+    if length(selectionListMember) > 0 then
+      mem = member(selectionListMember)
+      if not(voidP(mem)) then
+        dertext = mem.text
+        dertext = value(dertext.line[1])
+        if listP(dertext) then
+          castlibList = []
+          dertextCnt = count(dertext)
+          repeat with n = 1 to dertextCnt
+            if listP(dertext[n]) then
+              castlibList.add(n)
+            end if
+          end repeat
+        end if
+      end if
+    end if
+    
+    if castlibList = 0 then
+      castlibList = []
+      castlibList.add(selected_Members_Only.number)
+    end if
+    
+    
+    mpname = the moviepath & the moviename
+    isInternal = 0
+    repeat with cl in castlibList
+      if castlib(cl).filename = mpname then
+        isInternal = 1
+        exit repeat
+      end if
+    end repeat
+    
+    if count(castlibList) < 1 then return 0
+    -----------------------------------------------------
     
     delim = the last char of the applicationpath
@@ -4728 +4846 @@
     the itemdelimiter = delim
     
-    if the last item of workingFolder = "castlib" & selected_Members_Only.number then
-      clibfolder = workingFolder
+    repeat with n = count(castlibList) down to 1
+      
+      selected_Members_Only = castlib(castlibList[n])
+      
+      selected_Members_Only.save()
+      
+      
+      
+      if the last item of workingFolder = "castlib" & selected_Members_Only.number then
+        clibfolder = workingFolder
+      else
+        if the last char of workingFolder <> delim then put delim after workingFolder
+        clibfolder = workingFolder & "castlib" & selected_Members_Only.number
+      end if
+      
+      castlibList[n] = [castlibList[n], clibfolder, workingFolder]
+      --------
+      
+      
+      mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
+      
+    end repeat
+    
+    the itemdelimiter = olddelim
+    
+    
+    
+  else -- treat all:
+    
+    saveMovie()
+    
+    mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
+    
+    castlibList = []
+    
+  end if
+  
+  
+  
+  if castlibList = 0 then
+    
+    -------- if we work on only one castlib:
+    if length(clibfolder) then workingFolder = clibfolder
+    --------
+    
+    
+    if the platform contains "mac" then
+      svnBinary = baUnixName(svnBinary)
+      workingFolder = baUnixName(workingFolder)
     else
-      if the last char of workingFolder <> delim then put delim after workingFolder
-      clibfolder = workingFolder & "castlib" & selected_Members_Only.number
-    end if
-    
-    the itemdelimiter = olddelim
-    --------
-    
+      if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+    end if
+    
+    workingFolder = " " & QUOTE & workingFolder & QUOTE
     
   else
-    saveMovie()
-    
-  end if
-  
-  
-  mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
-  
-  
-  -------- if we work on only one castlib:
-  if length(clibfolder) then workingFolder = clibfolder
-  --------
-  
-  
-  if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolder = baUnixName(workingFolder)
-  else
-    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
-  end if
-  
-  
-  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
+    
+    if the platform contains "mac" then svnBinary = baUnixName(svnBinary)
+    cnt = count(castlibList)
+    
+    workingFolder = ""
+    
+    repeat with n = 1 to cnt
+      
+      if the platform contains "mac" then
+        castlibList[n][3] = baUnixName(castlibList[n][3])
+      else
+        str = castlibList[n][3]
+        if the last char of str = the last char of the applicationpath then
+          delete the last char of str
+          castlibList[n][3] = str
+        end if
+      end if
+      
+      put " " & QUOTE & castlibList[n][3] & QUOTE after workingFolder
+    end repeat
+    
+  end if
+  
+  
+  theresult = shell_cmd_list(svnBinary && "update" & workingFolder)
+  
   
   if count(theresult) < 1 then
-    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE && "2>&1")
+    theresult = shell_cmd_list(svnBinary && "update" & workingFolder && "2>&1")
     if count(theresult) < 1 then
       theError = theresult[1]
@@ -4774 +4940 @@
   end if
   
-  theresult = shell_cmd_list(svnBinary && "status" && QUOTE & workingFolder & QUOTE)
+  theresult = shell_cmd_list(svnBinary && "status" & workingFolder)
   
   cnt = count(theresult)
@@ -4808 +4974 @@
   end repeat
   
-  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE)
+  
+  
+  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE & workingFolder)
   
   

trunk/lingosource/castlib2/memberInfo.xml

@@ -46 +46 @@
                 <memberName>commonMovieScript</memberName>
         </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
         <commonMovieScript>
                 <scriptType>#parent</scriptType>