Changeset 161 for trunk/lingosource/castlib1/svn_Utilities.ls

Timestamp:

04/06/08 09:33:26 (4 years ago)

Author:

alex

Message:

implemented version control when commiting

File:

• trunk/lingosource/castlib1/svn_Utilities.ls (modified) (13 diffs)

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -1809 +1809 @@
   
   
-  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, 0, chooseNewPath, commitMsg, 1)
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, 0, chooseNewPath, commitMsg, 1, void, 2)
   
   theResult = mSVN_Commit_CurrentMovie_Binaries(me, chooseNewPath, commitMsg, 1)
   
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetCurrentRevision me, svnBinary, WorkingFolder
+  
+  versionNumber = mDoShellCmd(me, svnBinary && QUOTE & WorkingFolder & QUOTE, RETURN, 0, 1)
+  if count(versionNumber) < 1 then return void
+  versionNumber = versionNumber[1]
+  
+  offs = offset(":", versionNumber)
+  if offs > 0 then delete char 1 to offs of versionNumber
+  
+  if length(versionNumber) < 1 then return void
+  
+  versionNumberInt = integer(versionNumber)
+  repeat while not(integerP(versionNumberInt))
+    if length(versionNumber) < 1 then return void
+    delete the last char of versionNumber
+    versionNumberInt = integer(versionNumber)
+  end repeat
+  
+  return versionNumberInt
   
 end
@@ -1831 +1854 @@
   
   
-  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1, selectionList)
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1, selectionList, 2)
   
   theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1, 0, selectionList)
@@ -1931 +1954 @@
     --   end if
     
+    
+    -------------------- get version number:
+    if the platform contains "mac" then
+      svnBin = baUnixName(svnBinary)
+      workFolder = baUnixName(workingFolder)
+    else
+      workFolder = workingFolder
+      if the last char of workFolder = the last char of the applicationpath then delete the last char of workFolder
+    end if
+    versionNumber = mGetCurrentRevision(me, svnBin & "version", workFolder)
+    
+    if integerP(versionNumber) then
+      
+      versionNumber = versionNumber + 2 -- the version will raise
+      
+      VersionCheckUrl = string(mGetVersionCheckUrl(me, the moviepath & the moviename, workingCopies, "Select an URL to use for version checking."))
+      if length(VersionCheckUrl) > 0 then
+        mscript = member("aleXtrasMovieScript")
+        ident = ""
+        if mGetMemType(me, mscript) = #script then ident = string(xscr().mGetThisMovieName())
+        if length(ident) < 1 then ident = the moviename
+        
+        placeholder = "%%password:"
+        offs = offset(placeholder, VersionCheckUrl)
+        if offs > 0 then
+          thePassword = VersionCheckUrl.char[offs+length(placeholder) .. length(VersionCheckUrl)]
+          thePassword = word 1 to thePassword.word.count of thePassword
+          delete char offs to length(VersionCheckUrl) of VersionCheckUrl
+        end if
+        
+        VersionCheckUrl = word 1 to VersionCheckUrl.word.count of VersionCheckUrl & "?movieName=" & ident
+        
+        updateurl = 0
+        repeat with cl in castlibList
+          versmem = member("subversion_version_field", cl)
+          if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+            if updateurl = 0 then updateurl = 1
+            curr = versmem.text
+            if char 1 of curr = "r" then delete char 1 of curr
+            curr = integer(curr)
+            if not(integerP(curr)) then curr = 0
+            if curr < versionNumber then
+              versmem.text = "r" & versionNumber
+              versmem.comments = VersionCheckUrl
+            else
+              updateurl = 2
+            end if
+          end if
+        end repeat
+        
+        if updateurl = 1 then
+          if length(thePassword) then
+            id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+          end if
+        end if
+        
+      end if
+    end if
+    --------------------- // version number
+    
+    
     if isInternal = 1 then
       savemovie()
@@ -1941 +2025 @@
   end if
   ----------------------------------------
+  
+  exit
   
   
@@ -2146 +2232 @@
     mDisplayWaitStatusText me, "Saving movie..."
     
+    
+    -------------------- get version number:
+    if the platform contains "mac" then
+      svnBin = baUnixName(svnBinary)
+      workFolder = baUnixName(workingFolder)
+    else
+      workFolder = workingFolder
+      if the last char of workFolder = the last char of the applicationpath then delete the last char of workFolder
+    end if
+    versionNumber = mGetCurrentRevision(me, svnBin & "version", workFolder)
+    
+    if integerP(versionNumber) then
+      
+      versionNumber = versionNumber + 2 -- the version will raise
+      
+      VersionCheckUrl = string(mGetVersionCheckUrl(me, the moviepath & the moviename, workingCopies, "Select an URL to use for version checking."))
+      if length(VersionCheckUrl) > 0 then
+        mscript = member("aleXtrasMovieScript")
+        ident = ""
+        if mGetMemType(me, mscript) = #script then ident = string(xscr().mGetThisMovieName())
+        if length(ident) < 1 then ident = the moviename
+        
+        placeholder = "%%password:"
+        offs = offset(placeholder, VersionCheckUrl)
+        if offs > 0 then
+          thePassword = VersionCheckUrl.char[offs+length(placeholder) .. length(VersionCheckUrl)]
+          thePassword = word 1 to thePassword.word.count of thePassword
+          delete char offs to length(VersionCheckUrl) of VersionCheckUrl
+        end if
+        
+        VersionCheckUrl = word 1 to VersionCheckUrl.word.count of VersionCheckUrl & "?movieName=" & ident
+        
+        updateurl = 0
+        repeat with cl = the number of castlibs down to 1
+          versmem = member("subversion_version_field", cl)
+          if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+            if updateurl = 0 then updateurl = 1
+            curr = versmem.text
+            if char 1 of curr = "r" then delete char 1 of curr
+            curr = integer(curr)
+            if not(integerP(curr)) then curr = 0
+            if curr < versionNumber then
+              versmem.text = "r" & versionNumber
+              versmem.comments = VersionCheckUrl
+            else
+              updateurl = 2
+            end if
+          end if
+        end repeat
+        
+        if updateurl = 1 then
+          if length(thePassword) then
+            id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+          end if
+        end if
+        
+      end if
+    end if
+    --------------------- // version number
+    
+    
     saveMovie()
     
@@ -2589 +2736 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert, selectionList
+on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert, selectionList, versionIncrease
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -2631 +2778 @@
   
   
+  
+  -------------------- get version number:
+  VersionCheckUrl = ""
+  
+  if the platform contains "mac" then
+    svnBin = baUnixName(svnBinary)
+    workFolder = baUnixName(workingFolder)
+  else
+    workFolder = workingFolder
+    if the last char of workFolder = the last char of the applicationpath then delete the last char of workFolder
+  end if
+  versionNumber = mGetCurrentRevision(me, svnBin & "version", workFolder)
+  
+  if integerP(versionNumber) then
+    
+    if voidP(versionIncrease) then versionIncrease = 1
+    versionNumber = versionNumber + versionIncrease + 1 -- the version will raise
+    
+    VersionCheckUrl = string(mGetVersionCheckUrl(me, the moviepath & the moviename, workingCopies, "Select an URL to use for version checking."))
+    if length(VersionCheckUrl) > 0 then
+      mscript = member("aleXtrasMovieScript")
+      ident = ""
+      if mGetMemType(me, mscript) = #script then ident = string(xscr().mGetThisMovieName())
+      if length(ident) < 1 then ident = the moviename
+      
+      placeholder = "%%password:"
+      offs = offset(placeholder, VersionCheckUrl)
+      if offs > 0 then
+        thePassword = VersionCheckUrl.char[offs+length(placeholder) .. length(VersionCheckUrl)]
+        thePassword = word 1 to thePassword.word.count of thePassword
+        delete char offs to length(VersionCheckUrl) of VersionCheckUrl
+      end if
+      
+      VersionCheckUrl = word 1 to VersionCheckUrl.word.count of VersionCheckUrl & "?movieName=" & ident
+      
+    end if
+    
+  end if
+  --------------------- // version number
+  
+  
+  
+  
   -------- if we work on only one castlib:
   
   if ilk(selected_Members_Only) = #castLib then
-    
     
     -----------------------------------------------------
@@ -2694 +2883 @@
     the itemdelimiter = delim
     
+    updateurl = 0
+    
     repeat with n = count(castlibList) down to 1
       
@@ -2700 +2891 @@
       mDisplayWaitStatusText me, "Saving castlib:" && selected_Members_Only
       
+      
+      -------------------- get version number:
+      
+      if length(VersionCheckUrl) > 0 then
+        versmem = member("subversion_version_field", n)
+        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+          if updateurl = 0 then updateurl = 1
+          curr = versmem.text
+          if char 1 of curr = "r" then delete char 1 of curr
+          curr = integer(curr)
+          if not(integerP(curr)) then curr = 0
+          if curr < versionNumber then
+            versmem.text = "r" & versionNumber
+            versmem.comments = VersionCheckUrl
+          else
+            updateurl = 2
+          end if
+        end if
+      end if
+      --------------------- // version number
+      
+      
       selected_Members_Only.save()
-      
-      
       
       if the last item of workingFolder = "castlib" & selected_Members_Only.number then
@@ -2719 +2930 @@
     end repeat
     
+    -------------------- get version number:
+    if updateurl = 1 then
+      if length(thePassword) then
+        id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+      end if
+    end if
+    --------------------- // version number
+    
     the itemdelimiter = olddelim
     
@@ -2726 +2945 @@
     
     mDisplayWaitStatusText me, "Saving movie..."
+    
+    
+    -------------------- get version number:
+    updateurl = 0
+    if length(VersionCheckUrl) > 0 then
+      repeat with cl = the number of castlibs down to 1
+        versmem = member("subversion_version_field", cl)
+        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+          if updateurl = 0 then updateurl = 1
+          curr = versmem.text
+          if char 1 of curr = "r" then delete char 1 of curr
+          curr = integer(curr)
+          if not(integerP(curr)) then curr = 0
+          if curr < versionNumber then
+            versmem.text = "r" & versionNumber
+            versmem.comments = VersionCheckUrl
+          else
+            updateurl = 2
+          end if
+        end if
+      end repeat
+    end if
+    
+    if updateurl = 1 then
+      if length(thePassword) then
+        id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+      end if
+    end if
+    --------------------- // version number
+    
     
     saveMovie()
@@ -2943 +3192 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies, selectMsg
+on mGetVersionCheckUrl me, movieIdentifier, workingCopies, selectMsg
   
   movieIdentifier = string(movieIdentifier)
@@ -2957 +3206 @@
   end if
   
+  versionCheckUrlList = workingCopies.getaprop(#versionCheckUrls)
+  if not(objectP(versionCheckUrlList)) then
+    versionCheckUrlList = [:] 
+    workingCopies.setaprop(#versionCheckUrls, versionCheckUrlList)
+  end if
+  
+  versionCheckUrl = string(versionCheckUrlList.getaprop(movieIdentifier))
+  
+  if versionCheckUrl = "" then
+    selectMsg = string(selectMsg)
+    if length(selectMsg) < 1 then selectMsg = "No update check URL is specified for this movie. Please enter an URL."
+    
+    --    if mCheckForXtra(me, "BudApi") = 1 then
+    --      versionCheckUrl = baPrompt("Select URL", selectMsg, "http://www.farbflash.de/cgi-bin/versionCheck.pl %%password: secretpassword", 0, -2, -2)
+    --    else
+    muiobj = new(xtra "Mui")
+    versionCheckUrl = muiobj.GetUrl("http://www.farbflash.de/cgi-bin/versionChecker.pl %%password: secretpassword", 1)
+    muiobj = 0
+    --    end if
+    
+    if length(versionCheckUrl) < 1 then return ""
+    
+    versionCheckUrlList.setaprop(movieIdentifier, versionCheckUrl)
+    
+    if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
+    
+  end if
+  
+  return versionCheckUrl
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies, selectMsg
+  
+  movieIdentifier = string(movieIdentifier)
+  if length(movieIdentifier) < 1 then
+    movieIdentifier = the moviepath & the moviename
+  end if
+  
+  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))