Changeset 1245

Timestamp:

Dec 17, 2013 10:03:01 AM (9 years ago)

Author:

toby

Message:

dup updates in trunk

Location:

branches/sandbox

Files:

• expgui.icns (added)
• gsascmds.tcl (modified) (2 diffs)
• makeMacApp.py (added)

branches/sandbox/gsascmds.tcl

@@ -3788 +3788 @@
     return 0
 }
+proc ChangeSVNserver {} {
+    if [file exists [file join $::expgui(gsasdir) proxyinfo.txt]] {
+        set fp [open [file join $::expgui(gsasdir) proxyinfo.txt]]
+        gets $fp proxaddr
+        gets $fp proxport
+        set proxy "--config-option servers:global:http-proxy-host=$proxaddr"
+        set proxp "--config-option servers:global:http-proxy-port=$proxport"
+        close $fp
+    } else {
+        set proxy {}
+        set proxp {}
+    }
+    set SVN [auto_execok svn]
+    set res {}
+    catch {set res \
+               [eval exec $SVN info $::expgui(gsasdir)] \
+           } err
+    if {[string first .xor.aps $res] != -1} {
+        puts "Switching to .xray.aps"
+        eval exec $SVN switch \
+            [list "--relocate" \
+                 "https://subversion.xor.aps.anl.gov/EXPGUI" \
+                 "https://subversion.xray.aps.anl.gov/EXPGUI" \
+                 $::expgui(gsasdir) ] $proxy $proxp
+    }
+}
+
 
 proc CheckAndDoUpdate { } {
@@ -3817 +3844 @@
         return
     }
+    # migrate to new server, if needed
+    ChangeSVNserver
     # check for updates
     set SVN [auto_execok svn]