Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the shell.c.in amalgamator script so that it avoids generating redundant typedef statements. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
6c53c740cb4f62305689ea0a73beca83 |
| User & Date: | drh 2018-01-05 20:30:54 |
Context
|
2018-01-05
| ||
| 21:01 | Make sure i64 and u64 typedefs are available throughout shell.c. check-in: 656fb5aa user: drh tags: trunk | |
| 20:30 | Fix the shell.c.in amalgamator script so that it avoids generating redundant typedef statements. check-in: 6c53c740 user: drh tags: trunk | |
| 20:26 | MinGW does not define the S_ISLNK macro; therefore, define it in the shell when needed. check-in: 73023feb user: mistachkin tags: trunk | |
Changes
Changes to tool/mkshellc.tcl.
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 |
** source file to help make the command-line program easier to compile.
**
** To modify this program, get a copy of the canonical SQLite source tree,
** edit the src/shell.c.in" and/or some of the other files that are included
** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
*/}
set in [open $topdir/src/shell.c.in rb]
while {1} {
set lx [gets $in]
if {[eof $in]} break;
if {[regexp {^INCLUDE } $lx]} {
set cfile [lindex $lx 1]
puts $out "/************************* Begin $cfile ******************/"
set in2 [open $topdir/src/$cfile rb]
while {![eof $in2]} {
set lx [gets $in2]
if {[regexp {^#include "sqlite} $lx]} continue
set lx [string map [list __declspec(dllexport) {}] $lx]
puts $out $lx
}
close $in2
puts $out "/************************* End $cfile ********************/"
continue
}
puts $out $lx
}
close $in
close $out
|
> > > > > > > > > > < > | |
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
** source file to help make the command-line program easier to compile. ** ** To modify this program, get a copy of the canonical SQLite source tree, ** edit the src/shell.c.in" and/or some of the other files that are included ** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script. */} set in [open $topdir/src/shell.c.in rb] proc omit_redundant_typedefs {line} { global typedef_seen if {[regexp {^typedef .*;} $line]} { if {[info exists typedef_seen($line)]} { return "/* $line */" } set typedef_seen($line) 1 } return $line } while {1} { set lx [omit_redundant_typedefs [gets $in]] if {[eof $in]} break; if {[regexp {^INCLUDE } $lx]} { set cfile [lindex $lx 1] puts $out "/************************* Begin $cfile ******************/" set in2 [open $topdir/src/$cfile rb] while {![eof $in2]} { set lx [omit_redundant_typedefs [gets $in2]] if {[regexp {^#include "sqlite} $lx]} continue set lx [string map [list __declspec(dllexport) {}] $lx] puts $out $lx } close $in2 puts $out "/************************* End $cfile ********************/" continue } puts $out $lx } close $in close $out |