Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Pick up recent autosetup changes from upstream. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b2e6a234c4d96e81d572a7597c7d0d8c |
User & Date: | mistachkin 2016-01-14 20:38:05 |
Context
2016-01-14
| ||
20:40 | Fix typo that prevented the --no-repository option from working. Correction: It actually worked before and the issue was due to an incorrect assumption by the 'merge5' test, namely that the Fossil executable was present in the PATH. ... (check-in: 0a2eaa5a user: mistachkin tags: trunk) | |
20:38 | Pick up recent autosetup changes from upstream. ... (check-in: b2e6a234 user: mistachkin tags: trunk) | |
15:35 | Use the editor setting in amend test for interactive edits because it has precedence over both VISUAL and EDITOR. ... (check-in: cc265cab user: andybradford tags: trunk) | |
Changes
Changes to autosetup/autosetup.
︙ | ︙ | |||
814 815 816 817 818 819 820 | return $pwd } # Follow symlinks until we get to something which is not a symlink proc realpath {path} { while {1} { if {[catch { | | | 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 | return $pwd } # Follow symlinks until we get to something which is not a symlink proc realpath {path} { while {1} { if {[catch { set path [file readlink $path] }]} { # Not a link break } } return $path } |
︙ | ︙ | |||
1186 1187 1188 1189 1190 1191 1192 | exit 0 } # If not already paged and stdout is a tty, pipe the output through the pager # This is done by reinvoking autosetup with --nopager added proc use_pager {} { if {![opt-bool nopager] && [getenv PAGER ""] ne "" && [isatty? stdin] && [isatty? stdout]} { | | | > > > > > > | 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | exit 0 } # If not already paged and stdout is a tty, pipe the output through the pager # This is done by reinvoking autosetup with --nopager added proc use_pager {} { if {![opt-bool nopager] && [getenv PAGER ""] ne "" && [isatty? stdin] && [isatty? stdout]} { if {[catch { exec [info nameofexecutable] $::argv0 --nopager {*}$::argv |& {*}[getenv PAGER] >@stdout <@stdin 2>@stderr } msg opts] == 1} { if {[dict get $opts -errorcode] eq "NONE"} { # an internal/exec error puts stderr $msg exit 1 } } exit 0 } } # Outputs the autosetup references in one of several formats proc autosetup_reference {{type text}} { |
︙ | ︙ |
Changes to autosetup/system.tcl.
︙ | ︙ | |||
105 106 107 108 109 110 111 | # Reads the input file <srcdir>/$template and writes the output file $outfile. # If $outfile is blank/omitted, $template should end with ".in" which # is removed to create the output file name. # # Each pattern of the form @define@ is replaced the the corresponding # define, if it exists, or left unchanged if not. # | | | > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | # Reads the input file <srcdir>/$template and writes the output file $outfile. # If $outfile is blank/omitted, $template should end with ".in" which # is removed to create the output file name. # # Each pattern of the form @define@ is replaced the the corresponding # define, if it exists, or left unchanged if not. # # The special value @srcdir@ is substituted with the relative # path to the source directory from the directory where the output # file is created, while the special value @top_srcdir@ is substituted # with the relative path to the top level source directory. # # Conditional sections may be specified as follows: ## @if name == value ## lines ## @else ## lines ## @endif |
︙ | ︙ | |||
149 150 151 152 153 154 155 | } set outdir [file dirname $out] # Make sure the directory exists file mkdir $outdir | | > | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | } set outdir [file dirname $out] # Make sure the directory exists file mkdir $outdir # Set up srcdir and top_srcdir to be relative to the target dir define srcdir [relative-path [file join $::autosetup(srcdir) $outdir] $outdir] define top_srcdir [relative-path $::autosetup(srcdir) $outdir] set mapping {} foreach {n v} [array get ::define] { lappend mapping @$n@ $v } set result {} foreach line [split [readfile $infile] \n] { |
︙ | ︙ |