Adjust the build process to avoid extra CR characters inserted by jimsh

on Windows.

FossilOrigin-Name: 1f54853932cec9ba20e9be48a59f1817b8b45e4c4d6ef8a06d34f86dd688e28e

diff --git a/Makefile.msc b/Makefile.msc
index f5a1a9164d14333397ca55fb279d29df50cd5bb4..c1a8f88b6ea125b512cf0809a418df0693ff6f83 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2334,7 +2334,7 @@ parse.c:  $(TOP)\src\parse.y lemon.exe
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y
 
 $(SQLITE3H):   $(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION $(JIM_TCLSH)
-       $(JIM_TCLSH) $(TOP)\tool\mksqlite3h.tcl "$(TOP:\=/)" > $(SQLITE3H) $(MKSQLITE3H_ARGS)
+       $(JIM_TCLSH) $(TOP)\tool\mksqlite3h.tcl "$(TOP:\=/)" -o $(SQLITE3H) $(MKSQLITE3H_ARGS)
 
 sqlite3ext.h:  .target_source
 !IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
@@ -2398,7 +2398,7 @@ SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
 !ENDIF
 
 shell.c:       $(SHELL_DEP) $(TOP)\tool\mkshellc.tcl $(JIM_TCLSH)
-       $(JIM_TCLSH) $(TOP)\tool\mkshellc.tcl > shell.c
+       $(JIM_TCLSH) $(TOP)\tool\mkshellc.tcl shell.c
 
 zlib:
        pushd $(ZLIBDIR) && $(MAKE) /f win32\Makefile.msc clean $(ZLIBLIB) && popd

diff --git a/main.mk b/main.mk
index f2212c4f111fef8970c719b80e726fc0f0922874..00632a5d5cdaf2fdc91b3c77a0a7366a51edd9d9 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1066,7 +1066,7 @@ mksourceid$(B.exe): $(MAKE_SANITY_CHECK) $(TOP)/tool/mksourceid.c
 sqlite3.h: $(MAKE_SANITY_CHECK) $(TOP)/src/sqlite.h.in \
     $(TOP)/manifest mksourceid$(B.exe) \
                $(TOP)/VERSION $(B.tclsh)
-       $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
+       $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) -o sqlite3.h
 
 sqlite3.c:     .target_source sqlite3.h $(TOP)/tool/mksqlite3c.tcl src-verify$(B.exe) \
                $(B.tclsh)
@@ -1075,7 +1075,7 @@ sqlite3.c:        .target_source sqlite3.h $(TOP)/tool/mksqlite3c.tcl src-verify$(B.exe
        cp $(TOP)/ext/session/sqlite3session.h .
 
 sqlite3r.h: sqlite3.h $(B.tclsh)
-       $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h
+       $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover -o sqlite3r.h
 
 sqlite3r.c: sqlite3.c sqlite3r.h $(B.tclsh)
        cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
@@ -2210,7 +2210,7 @@ SHELL_DEP = \
     $(TOP)/src/test_windirent.h
 
 shell.c:       $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(B.tclsh)
-       $(B.tclsh) $(TOP)/tool/mkshellc.tcl >shell.c
+       $(B.tclsh) $(TOP)/tool/mkshellc.tcl shell.c
 
 #
 # Rules to build the extension objects.

diff --git a/manifest b/manifest
index 604113d5d4140cbb168157cd5bb781715801d40a..ae3fd789be26298a1a5189ebcd95493fe9cb245a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C The\s"clean"\starget\son\sMakefile.msc\sshould\snot\sdelete\sthe\sauto.def\sfile.
-D 2025-02-03T12:42:03.773
+C Adjust\sthe\sbuild\sprocess\sto\savoid\sextra\sCR\scharacters\sinserted\sby\sjimsh\non\sWindows.
+D 2025-02-03T13:20:11.678
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
 F Makefile.in 38485d15d9190cdad0d7bee25af7b442028865964025dcc61f40fd8d6e369cfc
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
-F Makefile.msc b335ae09e0396f6fb1ff3cc477b5d42f7b19f5b657b9deb8761c02fb9ec93df9
+F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
 F VERSION 01f7606130e48fd58a74d1e45e565f2674819d6eadbc219d328d94bb3362b818
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 043987843e8365dbaf74dce60c11683b62e2bcfcb3122574c14a0324d37a72f3
+F main.mk 8cfe182232ac7bbc87530792db6f31c09f2a2f35e9887d0412978746efe42ea9
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2153,12 +2153,12 @@ F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61
 F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 F tool/mkpragmatab.tcl 32e359ccb21011958a821955254bd7a5fa7915d01a8c16fed91ffc8b40cb4adf
-F tool/mkshellc.tcl 2bc29c201933ae72a16a79070fe80aded80c24ea487ecd2f8df20c2973c87bfc
+F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl 9e88a30981280e33489fe4782f4ab1e5349ba1866603fba7f1a948d5599b9124
-F tool/mksqlite3h.tcl 5a8d23f35462bfcf74324a19465abd0ad6717b92a404d177160963c292df5d04
+F tool/mksqlite3c.tcl 1b24a4388f544a7f42fc2d03f34422182d3b2263453f65f642890259566369c1
+F tool/mksqlite3h.tcl 3cc8f3fbb3eca38c899549385622637667254067d865a70ad16e0996c2fd3214
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52
 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c
@@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 602d4dd69ec9a724c69cb41ab15376ec731bfd4894fac0a2b25076b857786c6d
-R 24aae7cdfe868af0a232714dd29906e1
+P 72fbcedfb09febb72fa325cb21d160cd33dca7fe5579817143f47d90a20ec2ef
+R 4d732beb3e0a16061f12827a776553c4
 U drh
-Z 6573e99f3b8fb91d202a158e322a8831
+Z 6e6db52bccac51a05d3eab6549c06d4c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e76b7795a96bccccc8b30e90ae42823c5645bec7..5ca1ca5a2b421d5366eb55d6836d093b19d07fb1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72fbcedfb09febb72fa325cb21d160cd33dca7fe5579817143f47d90a20ec2ef
+1f54853932cec9ba20e9be48a59f1817b8b45e4c4d6ef8a06d34f86dd688e28e

diff --git a/tool/mkshellc.tcl b/tool/mkshellc.tcl
index af9804e4faac594def10e2a9816f5886e154fc1f..85e14f84983d4f0458e6518e0a3765823b93587c 100644 (file)
--- a/tool/mkshellc.tcl
+++ b/tool/mkshellc.tcl
@@ -12,6 +12,9 @@
 set topdir [file dir [file dir [file normal $argv0]]]
 set out stdout
 fconfigure stdout -translation binary
+if {[lindex $argv 0]!=""} {
+  set out [open [lindex $argv 0] wb]
+}
 puts $out {/* DO NOT EDIT!
 ** This file is automatically generated by the script in the canonical
 ** SQLite source tree at tool/mkshellc.tcl.  That script combines source

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 1b3958f4608abafb921fcfc90d4aab684ace7268..ddc1e58776f32de280bb865f2b87a1ab23b29afd 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -130,7 +130,7 @@ if {[file executable $vsrcprog] && [file readable $srcroot/manifest]} {
   } else {
     puts $out " with changes in files:\n**"
     foreach f [lrange $res 1 end] {
-       puts $out "**    $f"
+       puts $out "**    [string trim $f]"
     }
   }
 } else {

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index b409d306b24071af2ba46ec5a509775a8a97f4be..8ef123bc72ae9eca9d9285074fe0a0e2561ab6f7 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -24,18 +24,36 @@
 #   6) Adds the SQLITE_CALLBACK calling convention macro in front of all
 #      callback declarations.
 #
-# This script outputs to stdout.
+# This script outputs to stdout unless the -o FILENAME option is used.
 #
 # Example usage:
 #
-#   tclsh mksqlite3h.tcl ../sqlite >sqlite3.h
+#   tclsh mksqlite3h.tcl ../sqlite [OPTIONS]
+#                        ^^^^^^^^^
+#                        Root of source tree
+#
+# Where options are:
+#
+#   --enable-recover          Include the sqlite3recover extension
+#   -o FILENAME               Write results to FILENAME instead of stdout
+#   --useapicall              SQLITE_APICALL instead of SQLITE_CDECL
 #
 
+# Default output stream
+set out stdout
 
 # Get the source tree root directory from the command-line
 #
 set TOP [lindex $argv 0]
 
+# If the -o FILENAME option is present, use FILENAME for output.
+#
+set x [lsearch $argv -o]
+if {$x>0} {
+  incr x
+  set out [open [lindex $argv $x] wb]
+}
+
 # Enable use of SQLITE_APICALL macros at the right points?
 #
 set useapicall 0
@@ -44,6 +62,7 @@ set useapicall 0
 #
 set enable_recover 0
 
+# Process command-line arguments
 if {[lsearch -regexp [lrange $argv 1 end] {^-+useapicall}] != -1} {
   set useapicall 1
 }
@@ -118,7 +137,7 @@ set cdecllist {
 foreach file $filelist {
   set in [open $file rb]
   if {![regexp {sqlite\.h\.in} $file]} {
-    puts "/******** Begin file [file tail $file] *********/"
+    puts $out "/******** Begin file [file tail $file] *********/"
   }
   while {![eof $in]} {
 
@@ -161,11 +180,11 @@ foreach file $filelist {
           "(SQLITE_SYSAPI *sqlite3_syscall_ptr)"] $line]
       regsub {\(\*} $line {(SQLITE_CALLBACK *} line
     }
-    puts $line
+    puts $out $line
   }
   close $in
   if {![regexp {sqlite\.h\.in} $file]} {
-    puts "/******** End of [file tail $file] *********/"
+    puts $out "/******** End of [file tail $file] *********/"
   }
 }
-puts "#endif /* SQLITE3_H */"
+puts $out "#endif /* SQLITE3_H */"