Minor cleanups to the linenoise flavor detection test.

FossilOrigin-Name: 3be32de1626f940e256076df76388e7633de57f340aac937f6a48d3585b96ca4

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index b691162aa675ee155b49a9c659a31ae58e2104ad..a5be20929df8435d657b20707a265a4880041654 100644 (file)
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -12,6 +12,9 @@
 # Routines for Steve Bennett's autosetup which are common to trees
 # managed in and around the umbrella of the SQLite project.
 #
+# The intent is that these routines be relatively generic, independent
+# of a given project.
+#
 # This file was initially derived from one used in the libfossil
 # project, authored by the same person who ported it here, and this is
 # noted here only as an indication that there are no licensing issues
@@ -995,28 +998,24 @@ proc proj-redefine-cc-for-build {} {
 # the "antirez" or "msteveb" flavor. It returns 1 for antirez, 2 for
 # msteveb, and 0 if it's neither.
 proc proj-which-linenoise {dotH} {
-  set sourceOrig {
-    #include <stdio.h>
-    #include <stdlib.h>
-    #include <stddef.h>
-    /* size_t has to be be in there _somewhere_ */
-  }
-  append sourceOrig [proj-file-content $dotH]
-  set sourceTail {
+  set srcHeader [proj-file-content $dotH]
+  set srcMain {
     int main(void) {
-      linenoiseSetCompletionCallback(0 $arg);
+      linenoiseSetCompletionCallback(0$arg)
+      /* antirez has only 1 arg, msteveb has 2 */;
       return 0;
     }
   }
   set arg ""
-  set source $sourceOrig
-  append source [subst $sourceTail]
+  append source $srcHeader [subst $srcMain]
   if {[cctest -nooutput 1 -source $source]} {
     return 1
   }
+  set source {
+    #include <stddef.h> /* size_t */
+  }
   set arg ", 0"
-  set source $sourceOrig
-  append source [subst $sourceTail]
+  append source $srcHeader [subst $srcMain]
   if {[cctest -nooutput 1 -source $source]} {
     return 2
   }

diff --git a/manifest b/manifest
index eecf278ccd4b7ecf6d90fda5ebe42edef2cda08f..795ff46c21c309ab75a54c83be083b48878efa91 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\slinenoise\sflavor\scheck\sfrom\sauto.def\sto\sproj.tcl\sfor\sre-use\sin\sdownstream\sprojects.
-D 2024-10-30T22:49:40.804
+C Minor\scleanups\sto\sthe\slinenoise\sflavor\sdetection\stest.
+D 2024-10-30T23:10:38.423
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -49,7 +49,7 @@ F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bd
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 035cc7ab786b11eb771f19bca7d908cd64f783af85a21e6594a3634acd67b726
+F autosetup/proj.tcl 1e9262757c39afe996a4866fb81c4619d4822b2de09952132d362271f4e069c5
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
 F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@ -2198,8 +2198,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 dbf0079190d98ec1760cc3b55aa0116c9f85f215586bd864c5d6cede5a034fa5
-R c2cdfa3dffe3b9b6690b173654ff9db0
+P 84e503dc1e3672fe7787fb747ed70ca14ad181a743925bd1658c40baaa8a27cd
+R 235f5f08d1190fddb79e56ae3a84f4e6
 U stephan
-Z 0dcc5db1b022ddc0e6c0ca033d369137
+Z e505c01bc9a5f78170d2f000898996a1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 704e8f252f699d1b968ad083ec08b6b4ad728b97..81a5e858c5adae8d3a00fe864732e29355079119 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-84e503dc1e3672fe7787fb747ed70ca14ad181a743925bd1658c40baaa8a27cd
+3be32de1626f940e256076df76388e7633de57f340aac937f6a48d3585b96ca4