Changeset 16 for trunk/lingosource

Timestamp:

09/03/07 20:08:22 (5 years ago)

Author:

alex

Message:

no message

Location:

trunk/lingosource

Files:

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

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -165 +165 @@
   
   
+  ---------------------------------------------------- scripttext export functions:
+  li.add("")
+  li.add("Scripttext export for SVN")
+  subli = []
+  li.add(subli)
+  subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix")
+  subli.add("mSVN_Update_And_Import_ScriptsFromFolder me, thePath, selectionOnly")
+  subli.add("")
+  subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
+  
   ---------------------------------------------------- svn functions:
   li.add("")
@@ -170 +180 @@
   subli = []
   li.add(subli)
-  subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix")
-  subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
-  subli.add("")
-  subli.add("mUpdateScriptsFromFolder me, thePath, selectionOnly")
-  subli.add("")
   subli.add("mSVN_Delete_Selected_Scripts me, chooseNewPath")
   subli.add("")
-  subli.add("mSVN_Update_Working_Copy me, chooseNewPath")
-  subli.add("mSVN_Commit_CurrentScripts me, selected_Members_Only")
-  subli.add("")
-  subli.add("mSVN_Update_CurrentMovie me")
-  subli.add("mSVN_Commit_CurrentMovie me")
+  subli.add("mSVN_Update_Working_Copy_ScriptText me, chooseNewPath")
+  subli.add("mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only")
+  subli.add("")
+  subli.add("mSVN_Update_CurrentMovie_Binaries me, chooseNewPath, onlyUpdate_SVN_WorkingFolder")
+  subli.add("mSVN_Commit_CurrentMovie_Binaries me, chooseNewPath, commitMsg")
+    subli.add("")
+  subli.add("mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext me, chooseNewPath, commitMsg")
   ----------------------------------------------------
   

trunk/lingosource/castlib1/alexUtilities.ls

@@ -3408 +3408 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mUpdateScriptsFromFolder me, thePath, selectionOnly
+on mSVN_Update_And_Import_ScriptsFromFolder me, thePath, selectionOnly
   
   if selectionOnly = 1 then
@@ -3818 +3818 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Update_Working_Copy me, chooseNewPath
+on mSVN_Update_Working_Copy_ScriptText me, chooseNewPath
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -4027 +4027 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentMovie me, chooseNewPath
+on mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext me, chooseNewPath, commitMsg
+  
+  commitMsg = string(commitMsg)
+  if length(commitMsg) < 1 then
+    commitMsg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+    
+    if length(commitMsg) < 1 then
+      alert "You must enter a message for the commit action."
+      exit
+    end if
+  end if
+  
+  
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, 0, chooseNewPath, commitMsg)
+  
+  theResult = mSVN_Commit_CurrentMovie_Binaries(me, chooseNewPath, commitMsg, 1)
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentMovie_Binaries me, chooseNewPath, commitMsg, dontSave
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -4033 +4054 @@
   
   svnBinary = mGetSVNBinaryPath(me, workingCopies)
-  if length(svnBinary) < 1 then exit
+  if length(svnBinary) < 1 then return 0
   
   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(workingFolder) < 1 then return 0
+  
+  
+  ---------------------------------------
+  msg = string(commitMsg)
   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()
-  
-  ------------
+    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."
+      return 0
+    end if
+  end if
+  ---------------------------------------
+  
+  
+  ---------------------------------------
+  if dontSave <> 1 then
+    -- this flag is only for the case, we come here from the combined commit call "mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext"
+    -- as the movie was already saved in "mSVN_Commit_CurrentScripts_ScriptText"
+    
+    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 return 0
+      if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
+    end if
+    
+    saveMovie()
+  end if
+  ----------------------------------------
+  
+  
+  
+  ---------------------------------------
   if workingFolder <> the moviepath then
     erg = baCopyFileProgress(the moviepath & the moviename, workingFolder & the moviename, "Always", "Copying movie to working folder", "", 33)
     if erg <> 0 then
       alert "An error occurred during copying the movie:" && erg
-      exit
+      return 0
     end if
     clnum = the number of castlibs
@@ -4073 +4109 @@
         if offs <> 1 then
           alert "Castlib" && castlib(n) && "is not within your current moviepath. This is not supported."
-          exit
+          return 0
         end if
         relpath = fname
@@ -4088 +4124 @@
     the itemdelimiter = olddelim
   end if
-  ------------
-  
+  ---------------------------------------
+  
+  ---------------------------------------
   if the platform contains "mac" then
     svnBinary = baUnixName(svnBinary)
@@ -4096 +4133 @@
     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)
   
@@ -4108 +4147 @@
     end if
     alert "Can't proceed svn error while trying to update:" && theError
-    exit  
-  end if
+    return 0  
+  end if
+  ---------------------------------------
   
   
@@ -4124 +4164 @@
   if cnt < 1 then
     alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
-    exit
+    return 0
   end if
   
@@ -4156 +4196 @@
   
   
+  ---------------------------------------
   if count(theresult) > 0 then
     theResult = theresult[1]
@@ -4165 +4206 @@
     alert "svn application did not respond, something seems to have failed. :-("
   end if
-  
+  ---------------------------------------
   
   setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
   
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mSVN_Update_CurrentMovie me, chooseNewPath
+  return 1
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Update_CurrentMovie_Binaries me, chooseNewPath, onlyUpdate_SVN_WorkingFolder
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -4191 +4233 @@
   end if
   
+  oldmoviepath = the moviepath
+  oldmovie = oldmoviepath & the moviename
+  
+  if (onlyUpdate_SVN_WorkingFolder <> 1) or (the moviepath contains workingFolder) then
+    
+    ------------------------------
+    -- close this movie by issuing a "new movie..." command
+    -- in order to replace the current movie, with the updated movie
+    dispatchcommand(4097)
+    ------------------------------
+    
+    onlyUpdate_SVN_WorkingFolder = 1
+  end if
+  
   theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
   
   if count(theresult) > 0 then
+    
+    -------- reload the refreshed movie:
+    if the moviepath contains workingFolder then
+      -- go to movie the moviepath & the moviename
+    else
+      
+      if onlyUpdate_SVN_WorkingFolder <> 1 then
+        -------------------------- now get the updated movies over here:
+        if the last char of workingFolder <> the last char of the applicationpath then put the last char of the applicationpath after workingFolder
+        
+        mCopyAllFiles(me, workingFolder, oldmoviepath)
+        
+        ----------------------------------
+      end if
+      
+    end if
+    
     put theresult[1]
+    
+    if onlyUpdate_SVN_WorkingFolder = 1 then go to movie oldmovie
+    
     alert "Done, see the results of the svn operation in the message window."
+    
   else
+    
+    if onlyUpdate_SVN_WorkingFolder = 1 then go to movie oldmovie
+    
     alert "svn application did not respond, something seems to have failed. :-("
   end if
   
+  
   setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
   
@@ -4206 +4287 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentScripts me, selected_Members_Only, chooseNewPath
+on mCopyAllFiles me, fromFolder, toFolder
+  
+  flist = baFolderList(fromFolder)
+  flistCnt = count(flist)
+  repeat with n = flistCnt down to 1
+    thisFolder = flist[n]
+    if thisFolder starts ".svn" then next repeat
+    if not(baFolderExists(toFolder & thisFolder)) then
+      erg = baCreateFolder(toFolder & thisFolder)
+    else
+      erg = 1
+    end if
+    
+    if erg = 1 then
+      mCopyAllFiles me, fromFolder & thisFolder & the last char of toFolder, toFolder & thisFolder & the last char of toFolder
+    else
+      alert "Unable to create folder (" & thisFolder & "). Error:" && erg
+    end if
+    
+  end repeat
+  
+  
+  
+  flist = baFileList(fromFolder, "")
+  flistCnt = count(flist)
+  repeat with n = 1 to flistCnt
+    thisFile = flist[n]
+    if thisFile starts ".svn" then next repeat
+    erg = baCopyFileProgress(fromFolder & thisFile, toFolder & thisFile, "Always", "Replacing movie with the version of the working folder", "", 33)
+    if erg <> 0 then
+      alert "An error occurred during copying the file (" & thisFile & "). Error:" && erg
+    else
+      put "Replaced file:" && thisFile
+    end if
+  end repeat
+  
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -4212 +4335 @@
   
   svnBinary = mGetSVNBinaryPath(me, workingCopies)
-  if length(svnBinary) < 1 then exit
+  if length(svnBinary) < 1 then return 0
   
   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(workingFolder) < 1 then return 0
+  
+  msg = string(commitMsg)
+  
   
   if length(msg) < 1 then
-    alert "You must enter a message for the commit action."
-    exit
-  end if
+    
+    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."
+      return 0
+    end if
+    
+  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 = "Cancel" then return 0
     if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
   end if
@@ -4255 +4386 @@
     end if
     alert "Can't proceed svn error while trying to update:" && theError
-    exit  
+    return 0  
   end if
   
@@ -4262 +4393 @@
   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"
-    exit
+    alert "Apparently there are no changes to the scripts of the most recent version in the svn repository: svn status is empty"
+    return 0
   end if
   
@@ -4308 +4439 @@
   setPref("svn_workingCopies_paths.txt", string(workingCopies))
   
-end
+  
+  return 1
+  
+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>
 </Untitled>