Changeset 2

Timestamp:

08/29/07 17:16:14 (4 years ago)

Author:

alex

Message:

finished first set of svn handlers -- added handler to search all put statements, ugly and slow, but authoring only and so I dont care

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (2 diffs)
• castlib1/alexUtilities.ls (modified) (15 diffs)
• castlib2/memberInfo.xml (modified) (2 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -133 +133 @@
   
   subli.add("GetScriptlines me")
+  subli.add("mListallPuts me")
   
   ---------------------------------------------------
@@ -169 +170 @@
   subli = []
   li.add(subli)
-  subli.add("mExportAllScriptsToDisk me, skipIcons, selectionOnly, convertLineBreaksToUnix")
+  subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix")
   subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
-  subli.add("mUpdateScriptsFromRepository me, thePath, selectionOnly")
+  subli.add("mUpdateScriptsFromFolder me, thePath, selectionOnly")
+  subli.add("")
   subli.add("mSVN_Update_Working_Copy me, chooseNewPath")
   subli.add("mSVN_Commit_CurrentScripts me, selected_Members_Only")

trunk/lingosource/castlib1/alexUtilities.ls

@@ -975 +975 @@
 end
 
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mListallPuts me
+  cnum = the number of castlibs
+  repeat with l = 1 to cnum
+    mnum = the number of members of castlib l
+    repeat with n = 1 to mnum
+      memref = member(n, l)
+      if memref.type = #script then
+        st = memref.scripttext
+        nl = the number of lines of st
+        numlines = the number of lines of st
+        repeat with r = 1 to numlines
+          
+          lin = line r of st
+          
+          offs = offset("put ", lin)
+          
+          if offs > 0 then
+            
+            theLine = lin
+            
+            
+            
+            if ((offs = 1) or (char offs-1 of lin = " ")) then
+              
+              linWOQuote = ""
+              offs = offset(QUOTE, lin)
+              repeat while offs > 0
+                put char 1 to offs-1 of lin & " " after linWOQuote
+                delete char 1 to offs of lin
+                offs = offset(QUOTE, lin)
+                if offs > 0 then
+                  delete char 1 to offs of lin
+                end if
+                offs = offset(QUOTE, lin)
+              end repeat
+              put lin after linWOQuote
+              
+              offs = offset("--", linWOQuote)
+              if offs > 0 then
+                delete char offs to length(linWOQuote) of linWOQuote
+              end if
+              
+              offs = offset("put ", linWOQuote)
+              
+              if offs > 0 then
+                
+                
+                if not(linWOQuote contains " into ") then
+                  if not(linWOQuote contains " after ") then
+                    if not(linWOQuote contains " before ") then
+                      put "-----------"
+                      le = length(st.line[1 .. r-1])
+                      put memref & ": line" && r & ":" && theLine & RETURN & "activateScriptEditor" && n & "," && l & "," && le & "," && le+1 & RETURN & "-----------"
+                    end if
+                  end if
+                end if
+              end if
+            end if
+          end if
+          
+        end repeat
+      end if
+    end repeat
+  end repeat
+end
 
 
@@ -3022 +3090 @@
 -- export all scripts into a folder (I use this to compare to versions of a movie, open movie 1, export all scripts, open movie 2 and export all scripts and then compare with bbdiff both folders)
 
-on mExportAllScriptsToDisk me, skipIcons, selectionOnly, convertLineBreaksToUnix
-  
-  theFolder = mGetFolderPathFromUser(me)
+on mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, theFolder
+  mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, theFolder
+  
+  theFolder = string(theFolder)
+  if length(theFolder) < 1 then
+    theFolder = mGetFolderPathFromUser(me)
+  end if
   
   if length(theFolder) < 1 then exit
@@ -3256 +3333 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mUpdateScriptsFromRepository me, thePath, selectionOnly
+on mUpdateScriptsFromFolder me, thePath, selectionOnly
   
   if selectionOnly = 1 then
-    mUpdateSelectedScriptsFromRepository me, thePath
+    mUpdateSelectedScriptsFromFolder me, thePath
     exit
   end if
@@ -3272 +3349 @@
     
     if baFileExists(thePath & "memberInfo.xml") then
-      mUpdateScriptCastlibFromRepository me, thePath
+      mUpdateScriptCastlibFromFolder me, thePath
     else
       folderlist = bafolderlist(thePath)
@@ -3279 +3356 @@
       repeat with n = 1 to cnt
         if folderlist[n] starts "castlib" then
-          mUpdateScriptCastlibFromRepository me, thePath & folderlist[n] & delim
+          mUpdateScriptCastlibFromFolder me, thePath & folderlist[n] & delim
         end if
       end repeat
@@ -3295 +3372 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mUpdateScriptCastlibFromRepository me, thePath
+on mUpdateScriptCastlibFromFolder me, thePath
   
   infoList = mReadXML_2_List(me, thePath & "memberInfo.xml")
@@ -3345 +3422 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mUpdateSelectedScriptsFromRepository me, thePath
+on mUpdateSelectedScriptsFromFolder me, thePath
   
   thePath = string(thePath)
@@ -3672 +3749 @@
 on mSVN_Update_Working_Copy me, chooseNewPath
   
-  svnBinary = mGetSVNBinaryPath(me)
+  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
   if length(svnBinary) < 1 then exit
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
   if length(workingFolder) < 1 then exit
   
@@ -3690 +3770 @@
   end if
   
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mGetSVNBinaryPath me
+  setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  
+end
+
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentScripts me, selected_Members_Only, chooseNewPath
+  
+  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then exit
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  if length(workingFolder) < 1 then exit
+  
+  msg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+  
+  if length(msg) < 1 then
+    alert "You must enter a message for the commit action."
+    exit
+  end if
+  
+  if workingCopies.getaprop(#dontWarnWhenSaving) <> 1 then
+    answer = baMsgBoxEx("The movie will be saved before committing.", "Save movie?", "Save", "Cancel", "Always save", "Question", 1, "left", "Arial", 14, 4, -2, -2)
+    if answer = "Cancel" then exit
+    if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
+  end if
+  saveMovie()
+  
+  mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
+  
+  
+  
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolder = baUnixName(workingFolder)
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "status" && QUOTE & workingFolder & QUOTE)
+  
+  cnt = count(theresult)
+  if cnt < 1 then
+    alert "Apparently there are no changes to the most recent version in the svn repository"
+    exit
+  end if
+  
+  repeat with n = 1 to cnt
+    answ = theresult[n]
+    meth = word 1 of answ
+    delete word 1 of answ
+    
+    case meth of
+      "!": -- deleted file (missing here, but in the repository present)
+        -- I don't think, it is a good idea to delete the file in the repository in this case
+        -- as it may also be the case, that we only have a subset of the castlibs/scripts
+        -- therefore I just skip these files and leave it to the user what to do with them in his svn client application
+        -- we only put a message, so the user is made aware of this fact
+        put "Missing file!" && answ && "is missing here, but present in the repository"
+        
+      "?": -- newly added file
+        shell_cmd_list(svnBinary && "add" && QUOTE & answ & QUOTE)
+        
+        put "Added file" && answ && "to the repository"
+        
+      "m":
+        -- just log the changes:
+        put "Update file:" && answ
+        
+    end case
+    
+  end repeat
+  
+  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE)
+  
+  
+  if count(theresult) > 0 then
+    alert "svn response:" && theresult[1]
+  else
+    alert "svn application did not respond, something seems to have failed. :-("
+  end if
+  
+  
+  setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+---------- svn helper handlers
+
+on mGetSVNBinaryPath me, workingCopies
   
   if (mCheckForXtra(me, "budapi") + mCheckForXtra(me, "shell")) < 2 then
@@ -3701 +3872 @@
   end if
   
-  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
-  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  savePrefs = 0
+  if ilk(workingCopies) <> #proplist then
+    workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+    if ilk(workingCopies) <> #proplist then workingCopies = [:]
+    savePrefs = 1
+  end if
+  
   
   if the platform contains "mac" then
@@ -3710 +3886 @@
   end if
   
-  if baFileExists(svnBinary) <> 1 then svnBinary = ""
-  
-  
-  if length(svnBinary) < 1 then
-    
-    svnBinary = []
-    if the platform contains "mac" then
+  if the platform contains "mac" then -- dunno how to check on windows, if svn is installed, anyone ?
+    
+    if baFileExists(svnBinary) <> 1 then svnBinary = ""
+    
+    
+    if length(svnBinary) < 1 then
+      
+      svnBinary = []
+      
       svnBinary = shell_cmd_list("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")
-    end if
-    
-    if count(svnBinary) < 1 then
-      alert "svn binary not found in your binaries folder. Where is the svn binary?"
-      svnBinary = mGetFilePathFromUser(me)
-      if length(svnBinary) < 1 then return ""
-      
-    else
-      svnBinary = baHFSName(svnBinary[1])
-      
-    end if
-    
-  end if
-  
-  if baFileExists(svnBinary) <> 1 then
-    alert "The path to the svn binary seems to have changed. Please try again in order to search the path."
-    svnBinary = ""
-  end if
+      -- end if
+      
+      if count(svnBinary) < 1 then
+        alert "svn binary not found in your binaries folder. Where is the svn binary?"
+        svnBinary = mGetFilePathFromUser(me)
+        if length(svnBinary) < 1 then return ""
+        
+      else
+        svnBinary = baHFSName(svnBinary[1])
+        
+      end if
+      
+      
+    end if
+    
+    if baFileExists(svnBinary) <> 1 then
+      alert "The path to the svn binary seems to have changed. Please try again in order to search the path."
+      svnBinary = ""
+    end if
+    
+    
+  else
+    -- dunno how to check on windows, if svn is installed, anyone ?
+    svnBinary = "svn"
+  end if
+  
   
   workingCopies.setaprop(#svnBinary, svnBinary)
-  setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  
+  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
   
   return svnBinary
@@ -3746 +3933 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath
+on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies
   
   movieIdentifier = string(movieIdentifier)
@@ -3753 +3940 @@
   end if
   
-  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
-  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  savePrefs = 0
+  if ilk(workingCopies) <> #proplist then
+    workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+    if ilk(workingCopies) <> #proplist then workingCopies = [:]
+    savePrefs = 1
+  end if
   
   workingFolder = string(workingCopies.getaprop(movieIdentifier))
@@ -3789 +3980 @@
   workingCopies.setaprop(movieIdentifier, workingFolder)
   
-  setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
   
   return workingFolder
@@ -3795 +3986 @@
 end
 
-
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mSVN_Commit_CurrentScripts me, selected_Members_Only, chooseNewPath
-  
-  svnBinary = mGetSVNBinaryPath(me)
-  if length(svnBinary) < 1 then exit
-  
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath)
-  if length(workingFolder) < 1 then exit
-  
-  msg = baPrompt("string Caption", "string Instruction", "string DefaultText", 0, -2, -2)
-  
-  saveMovie()
-  
-  if the platform contains "mac" then
-    theresult = shell_cmd_list(baUnixName(svnBinary) && "ci" && QUOTE & msg & QUOTE && QUOTE & baUnixName(workingFolder) & QUOTE)
-  else
-    theresult = shell_cmd_list(svnBinary && "ci" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE)
-  end if
-  
-  if count(theresult) > 0 then
-    alert "svn response:" && theresult[1]
-  else
-    alert "svn application did not respond, something seems to have failed. :-("
-  end if
-  
-end
 
 

trunk/lingosource/castlib2/memberInfo.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <Untitled>
-        <commonMovieScript>
+        <commonmoviescript>
                 <scriptType>#parent</scriptType>
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>commonMovieScript</memberName>
-        </commonMovieScript>
+        </commonmoviescript>
         <FileIOFunktionen>
                 <scriptType>#parent</scriptType>
@@ -36 +36 @@
                 <memberName>SpriteNameBeaver</memberName>
         </SpriteNameBeaver>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonmoviescript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonmoviescript>
+        <commonMovieScript>
+                <scriptType>#parent</scriptType>
+                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
+                <memberName>commonMovieScript</memberName>
+        </commonMovieScript>
 </Untitled>