Changeset 983

Timestamp:

Apr 15, 2010 9:46:13 AM (14 years ago)

Author:

toby

Message:

Fix Resource fork on Mac 4 real

Location:

trunk

Files:

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

trunk/expgui

@@ -4185 +4185 @@
 #    $expgui(fm).file.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
+    # get info about the current 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 $expgui(gsasdir)]

trunk/gsascmds.tcl

@@ -2800 +2800 @@
 }
 
+proc MacMakeResource {file app} {
+    # make a resource file. Note that OS X has gotten picky about the length of this
+    set l [string length $app]
+    if $::expgui(debug) {puts "$l bytes"}
+    incr l
+    if $::expgui(debug) {puts "$l bytes after incr"}
+    set str "data 'usro' (0) {\n"
+    append str "  $\""
+    append str [format %.8X $l]
+    set bytes 4
+    foreach char [split $app {}] {
+        append str [format %.2X [scan $char %c]]    
+    }
+    incr bytes $l
+    set newline 1
+    for {set i 0} {$i < [expr 1028-$bytes]} {incr i} {
+        if $newline {
+            append str "\" \n"
+            append str "  $\""
+            set newline 0
+            set j 0
+        }
+        append str {0000 }
+        incr bytes
+        incr j 2
+        if {$j > 15} {set newline 1}
+    }
+    if {$l % 2} {
+        append str "\"\n "
+    } else {
+        # even lengths need one more byte
+        append str "00\"\n "
+    }
+    append str "/* $app */\n};\n"
+    set fp [open $file w]
+    puts $fp $str
+    close $fp
+}
+
 # modify resource fork info for a .EXP file on the Mac
 proc MacSetResourceFork {expfile} {
@@ -2810 +2849 @@
     set app [file nativename [file join $expgui(gsasdir) expgui.app]]
     set RezApp {}
-    foreach pth "/usr/bin  /Developer/Tools/Rez $expgui(gsasexe)" {
+    foreach pth "/usr/bin  /Developer/Tools $expgui(gsasexe)" {
         if [file exists [set tst [file join $pth Rez]]] {
             set RezApp $tst
@@ -2817 +2856 @@
     }
     set SetFileApp {}
-    foreach pth "/usr/bin  /Developer/Tools/Rez $expgui(gsasexe)" {
+    foreach pth "/usr/bin  /Developer/Tools $expgui(gsasexe)" {
         if [file exists [set tst [file join $pth SetFile]]] {
             set SetFileApp $tst
@@ -2825 +2864 @@
     if $::expgui(debug) {puts "found app=$app Rez=$RezApp and SetFile=$SetFileApp"}
     if {[file exists $app] && $RezApp != ""} {
-        # make a resource file. Note that OS X has gotten picky about the length of this
-        set l [string length $app]; incr l
-        set str "data 'usro' (0) {\n"
-        append str "  $\""
-        append str [format %.8X $l]
-        set bytes 4
-        foreach char [split $app {}] {
-           append str [format %.2X [scan $char %c]]    
-        }
-        incr bytes $l
-        set newline 1
-        for {set i 0} {$i < [expr 1028-$bytes]} {incr i} {
-            if $newline {
-                append str "\" \n"
-                append str "  $\""
-                set newline 0
-                set j 0
-            }
-            append str {0000 }
-            incr bytes
-            incr j 2
-            if {$j > 15} {set newline 1}
-        }
-        append str "00\"\n "
-        append str "/* $app */\n};\n"
-        set fp [open setapp.r w]
-        puts $fp $str
-        close $fp
+        # make resource file
+        MacMakeResource setapp.r $app
         if $::expgui(debug) {puts "$RezApp setapp.r -o $expnative -a"}
         exec $RezApp setapp.r -o $expnative -a