Changeset 949

Timestamp:

Mar 10, 2010 3:02:01 PM (11 years ago)

Author:

toby

Message:

add update menu entry

Location:

trunk

Files:

• expgui (modified) (1 diff)
• gsascmds.tcl (modified) (1 diff)

trunk/expgui

@@ -4168 +4168 @@
         -command {console show}
 }
+# add update commands to buffer
+if [CheckUpdateImplemented $scriptdir] {
+    $expgui(fm).help.menu add command -command CheckAndDoUpdate -label "Update GSAS/CMPR"
+#    $expgui(fm).help.menu add cascade -menu $expgui(fm).help.menu.track \
+#       -label "Select EXPGUI version"
+#    menu $expgui(fm).help.menu.track 
+#    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch trunk} -label Development -value trunk \
+#       -variable expgui(SVNversion)
+#    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch stable} -label Standard -value stable \
+#       -variable expgui(SVNversion)
+    # get info about the current CMPR version on the server. Someday we might want to compare this
+    # say every month and notify when there is a new version to update
+    set repos [GetSVNrepository $scriptdir]
+    # send a "p" to accept the server fingerprint in case needed on 1st access
+    catch {set out [exec echo "p" | svn info $repos]} err
+    set expgui(SVNversion) [lindex [split $repos '/'] end]
+    # cleanup batch file from a previous update
+    if {$::tcl_platform(platform) == "windows" && $::tcl_platform(os) != "Windows 95"} {
+        catch {
+            file delete [file normalize ~/cmpr_update.bat]
+        }
+    }
+} else {
+    $expgui(fm).help.menu add command -label "Show update problem" -command {
+        if {! [file exists [file join $scriptdir .svn]]} {
+            MyMessageBox -parent . -title "No .svn" \
+                -message "Unable to update because the gsas/.svn directory is not present." \
+                -icon warning
+        } else {
+            MyMessageBox -parent . -title "No .svn" \
+                -message "Unable to update because the subversion (svn) program is not in the path." \
+                -icon warning
+        }
+    }
+}
 foreach c {h H} {bind . <Alt-$c> [list showhelp]}
 # define help actions

trunk/gsascmds.tcl

@@ -3148 +3148 @@
     RecordMacroEntry "# [getstring "comment for macro file"]" 0
 }
+
+#------------------------------------------------------------------------------
+# Subversion support routines
+#------------------------------------------------------------------------------
+# is there a subversion stub and can we find the svn program
+proc CheckUpdateImplemented {scriptdir} {
+    #is there a svn directory in the source?
+    if {! [file exists [file join $scriptdir .svn]]} {return 0}
+    # can we find svn in the path?
+    if {[auto_execok svn] != ""} {return 1}
+    # add a locally supplied svn version, if not in the path already
+    set localsvn [file join $scriptdir svn bin]
+    if {[file exists $localsvn]} {
+        if {$::tcl_platform(platform) == "windows"} {
+            set localsvn [file nativename $localsvn]
+            set sep {;}
+        } else {
+            set sep {:}
+        }
+        if {[lsearch [split $::env(PATH) $sep] $localsvn] == -1} {
+            append ::env(PATH) $sep $localsvn
+            auto_reset
+            if {[auto_execok svn] != ""} {return 1}
+        }
+    }
+    return 0
+}
+
+proc GetSVNVersion {scriptdir} {
+    set SVN [auto_execok svn]
+    if {$SVN != ""} {
+        if {! [catch {set res [exec $SVN info $scriptdir]} err]} {
+            set infolist [split $res]
+            set pos [lsearch $infolist "Revision:"]
+            return "EXPGUI SVN version [lindex $infolist [incr pos]]"
+        }
+    }
+    return "EXPGUI version: $::expgui(Revision)"
+}
+
+proc GetSVNrepository {scriptdir} {
+    set SVN [auto_execok svn]
+    if {$SVN != ""} {
+        if {! [catch {set res [exec $SVN info $scriptdir]} err]} {
+            set infolist [split $res]
+            set pos [lsearch $infolist "URL:"]
+            return [lindex $infolist [incr pos]]
+        }
+    }
+    return {}
+}
+
+proc SetSVNbranch {branch} {
+    # reset the track label
+    set ::command(SVNversion) [lindex [split [GetSVNrepository $::expgui(scriptdir)] '/'] end]
+    set SVN [auto_execok svn]
+    if {$SVN == ""} {
+        return 0
+    }
+    set curURL [GetSVNrepository $expgui(scriptdir)]
+    set curbranch [lindex [split $curURL '/'] end]
+    if {$curbranch == $branch} {return 0}
+    if {$branch == "trunk"} {
+        set newURL "https://subversion.xor.aps.anl.gov/EXPGUI/trunk"
+        set lbl development
+    } elseif {$branch == "stable"} {
+        set newURL "https://subversion.xor.aps.anl.gov/EXPGUI/tags/stable"
+        set lbl standard
+    } else {
+        MyMessageBox -parent . -title "Internal error" \
+        -message "No $branch track." -icon error
+        return 0
+    }
+    set msg {Press the "Update & Restart" button to begin the update process. After the update completes, EXPGUI will be restarted.}
+    if {[MyMessageBox -parent . -title "Ready to switch" \
+        -message "Ready to update to the $lbl track.\n\n$msg" \
+                 -type {Cancel "Update & Restart"} -default cancel -icon warning
+        ] == "cancel"} {return}
+    if {[confirmBeforeSave] == "Cancel"} return
+
+    # do a quiet cleanup. Sometimes needed after install, and never hurts
+    if [catch {set res [exec $SVN cleanup $::expgui(scriptdir)]} err] {
+        MyMessageBox -parent . -title "Error in cleanup" \
+            -message "Error performing cleanup. Will try to continue anyway. Error:\n$err" \
+            -icon error
+    }
+
+    # switch the source 
+    set cmd1 "$SVN switch $newURL $scriptdir"
+    if [catch {set res1 [exec $SVN switch $newURL $::expgui(scriptdir)]} err] {
+        MyMessageBox -parent . -title "Error updating" \
+            -message "Error performing update:\n$err" \
+            -icon error
+        return 0
+    }
+    set msg "Results from update:\n$cmd1\n$res1"
+    # update done, now need to "reboot"
+    MyMessageBox -parent . -title "Updating done" -icon info \
+        -message "Update Complete\nPress OK to restart EXPGUI\n\n$msg"
+    exec [info nameofexecutable] [file normalize $::expgui(script)] [file normalize $::expgui(expfile)] &
+    exit
+}
+
+proc CheckAndDoUpdate { } {
+    set SVN [auto_execok svn]
+    if {$SVN == ""} {
+        tk_dialog .msg "Error: no svn" \
+            "Error: SVN not found. Should not happen." \
+            error 0 OK    
+        return
+    }
+    #set wish "[info nameofexecutable]"
+    # check for updates
+    if [catch {set res [exec $SVN status $::expgui(scriptdir) -u]} err] {
+        MyMessageBox -parent . -title "Error checking status" \
+            -message "Error checking for updates: $err" \
+            -icon error
+        return
+    } else {
+        if {[string first "*" $res] == -1} {
+            MyMessageBox -parent . -title "No updates" \
+                -message "GSAS/EXPGUI appears up-to-date" \
+                -icon info
+            return
+        }
+    }
+    if {[MyMessageBox -parent . -title "Ready to Update" \
+             -message {
+Updates to GSAS/EXPGUI found.
+                 
+Press the "Update & Restart" button to begin the update process. After the update completes, EXPGUI will be restarted.} \
+             -type {Cancel "Update & Restart"} -default cancel -icon warning
+        ] == "cancel"} {return}
+
+    if {[confirmBeforeSave] == "Cancel"} return
+
+     # special upgrade for windows, where the wish exec blocks upgrade of the exe directory
+    if {$::tcl_platform(platform) == "windows" && $::tcl_platform(os) != "Windows 95"} {
+        # create a batch file
+        set out [file normalize ~/expgui_update.bat]
+        set fp [open [file normalize ~/expgui_update.bat] w]
+        puts $fp "@echo *"
+        puts $fp "@echo ******************************************************************"
+        puts $fp "@echo Preparing to start upgrade of CMPR."
+        puts $fp "@pause"
+        puts $fp "$SVN cleanup $::expgui(scriptdir)"
+        puts $fp "$SVN up $::expgui(scriptdir)"
+        puts $fp "@echo *"
+        puts $fp "@echo ******************************************************************"
+        puts $fp "@echo Upgrade is complete. This window will close and EXPGUI will restart."
+        puts $fp "@pause"
+        puts $fp "$::env(COMSPEC) /c \"start [info nameofexecutable] [file normalize $::expgui(script)] [file normalize $::expgui(expfile)]\""
+        puts $fp "exit"
+        close $fp
+        #run the batch file
+        exec $::env(COMSPEC) /c "start [file nativename [file attributes $out -shortname]]" &
+        exit
+    }
+
+    # do a quiet cleanup. Sometimes needed after install, and never hurts
+    if [catch {set res [exec $SVN cleanup $::expgui(scriptdir)]} err] {
+        MyMessageBox -parent . -title "Error in cleanup" \
+            -message "Error performing cleanup. Will try to continue anyway. Error:\n$err" \
+            -icon error
+    }
+    if [catch {set res [exec $SVN up $::expgui(scriptdir)]} err] {
+        MyMessageBox -parent . -title "Error updating" \
+            -message "Error performing update:\n$err" \
+            -icon error
+        return
+    } else {
+        MyMessageBox -parent . -title "Updating done" \
+            -message "Results from update:\n$res\n\nPress OK to restart EXPGUI" \
+            -icon info 
+    }
+    exec [info nameofexecutable] [file normalize $::expgui(script)] [file normalize $::expgui(expfile)] &
+    exit
+}