Overview
Comment: | Updated to set sane defaults if we are unable to load the requested encoding |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | e598e7780534fe2235814c65b4d09a91d348f2a1 |
User & Date: | rkeene on 2010-09-26 04:45:32 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:45 | Updated to hide errors emitted from `find' check-in: cee8b007e2 user: rkeene tags: trunk | |
04:45 | Updated to set sane defaults if we are unable to load the requested encoding check-in: e598e77805 user: rkeene tags: trunk | |
04:45 | Updated to check to see if required before building check-in: 0ed07039ad user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/boot.tcl from [877050aa4b] to [5e7b5c786a].
86 86 } else { 87 87 encoding dirs [list [file join [info library] encoding]] ;# TIP 258 88 88 } 89 89 90 90 # fix system encoding, if it wasn't properly set up (200207.004 bug) 91 91 if {[encoding system] eq "identity"} { 92 92 if {[info exists ::tclkit_system_encoding] && $::tclkit_system_encoding != ""} { 93 - encoding system $::tclkit_system_encoding 94 - } else { 95 - switch $::tcl_platform(platform) { 96 - windows { encoding system cp1252 } 97 - macintosh { encoding system macRoman } 98 - default { encoding system iso8859-1 } 93 + catch { 94 + encoding system $::tclkit_system_encoding 99 95 } 100 96 } 101 - 102 97 unset -nocomplain ::tclkit_system_encoding 103 98 } 99 + 100 + # If we've still not been able to set the encoding, revert to Tclkit defaults 101 + if {[encoding system] eq "identity"} { 102 + switch $::tcl_platform(platform) { 103 + windows { encoding system cp1252 } 104 + macintosh { encoding system macRoman } 105 + default { encoding system iso8859-1 } 106 + } 107 + } 104 108 105 109 # now remount the executable with the correct encoding 106 110 vfs::filesystem unmount [lindex [::vfs::filesystem info] 0] 107 111 108 112 set noe [info nameofexecutable] 109 113 110 114 # Resolve symlinks