From: mistachkin Date: Tue, 17 Oct 2017 18:33:22 +0000 (+0000) Subject: The source code files generated for the 'sqlite3-all.c' target should not have Window... X-Git-Tag: version-3.21.0~9^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7fc4c22f45adcf20fa88febad0a0e046a04f9ae;p=thirdparty%2Fsqlite.git The source code files generated for the 'sqlite3-all.c' target should not have Windows line-endings. FossilOrigin-Name: 6a08c43431be18a08bdcbf33d327513f72fff72dac5d02103dab8399d8c3d668 --- diff --git a/manifest b/manifest index de1b01a07e..d6e49a102d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\s".check"\scommand\sof\sthe\scommand-line\sshell\sto\sreturn\s1\s(error)\nrather\sthan\s2\s(exit)\son\sa\stest\sfailure. -D 2017-10-17T13:44:46.075 +C The\ssource\scode\sfiles\sgenerated\sfor\sthe\s'sqlite3-all.c'\starget\sshould\snot\shave\sWindows\sline-endings. +D 2017-10-17T18:33:22.646 F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1 @@ -1630,7 +1630,7 @@ F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd -F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c +F tool/split-sqlite3c.tcl 3efcd4240b738f6bb2b5af0aea7e1e0ef9bc1c61654f645076cec883030b710c F tool/sqldiff.c 30879bbc8de686df4624e86adce2d8981f500904c1cfb55b5d1eea2ffd9341eb F tool/sqlite3_analyzer.c.in 771d15fb9c67645fd8ef932a438f98959da4b7c7da3cb87ae1850b27c969edf3 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f @@ -1664,7 +1664,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 700a3c694438ca6cca185d0097f24799e82717ef38cb47bd83666c80f0e3cb2f -R 7b11fa4b75f3d72b968740b4ad577de5 -U drh -Z eb279a84da6335af377cd536eb14b148 +P e2af0cc6ef5fafc785b8b73f51995901f50822972dcfb632494e22402596186d +R d1f05de03c82774074759a8848af421f +U mistachkin +Z cf3e5ebd3225c433ae20a29b56e94ef7 diff --git a/manifest.uuid b/manifest.uuid index cd80d78996..4c5b7a09c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e2af0cc6ef5fafc785b8b73f51995901f50822972dcfb632494e22402596186d \ No newline at end of file +6a08c43431be18a08bdcbf33d327513f72fff72dac5d02103dab8399d8c3d668 \ No newline at end of file diff --git a/tool/split-sqlite3c.tcl b/tool/split-sqlite3c.tcl index 287b752828..230e3f2549 100644 --- a/tool/split-sqlite3c.tcl +++ b/tool/split-sqlite3c.tcl @@ -15,6 +15,7 @@ set END {^/\*+ End of %s \*+/} set in [open sqlite3.c] set out1 [open sqlite3-all.c w] +fconfigure $out1 -translation lf # Copy the header from sqlite3.c into sqlite3-all.c # @@ -48,6 +49,7 @@ proc write_one_file {content} { global filecnt incr filecnt set out [open sqlite3-$filecnt.c w] + fconfigure $out -translation lf puts -nonewline $out $content close $out puts $::out1 "#include \"sqlite3-$filecnt.c\""