Experimentally add the -array formatting option to hwaci-dump-defs-json and emit...

FossilOrigin-Name: ce6bc4603c27952ca44ff55c81dd50a04b0f6ef8f198720ee0da3aff4c291449

diff --git a/auto.def b/auto.def
index 7f290905b471e1fc93ace82b7b4658f52e0c5e51..84859575fef9d1209f18019d100ca2ea5bd5e2d7 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -989,9 +989,13 @@ if {"" ne $oFF} {
 }
 unset oFF
 
+define OPT_FEATURE_FLAGS.list [get-define OPT_FEATURE_FLAGS]
+define OPT_SHELL.list [get-define OPT_SHELL]
+
 hwaci-dump-defs-json config-defs.json \
   -bare {SIZEOF_* HAVE_DECL_*} \
   -none {HAVE_CFLAG_* LDFLAGS_* SH_* SQLITE_AUTOREMAKE TARGET_* USE_GCOV TCL_*} \
+  -array {*.list} \
   -auto {OPT_* PACKAGE_* HAVE_*} \
   -none *
 

diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl
index 6f4faa36413be68f3d986c4dea5edd1fd956c422..deb94ed9868adfa2f370a02b77a1089ecde13c4a 100644 (file)
--- a/autosetup/hwaci-common.tcl
+++ b/autosetup/hwaci-common.tcl
@@ -807,6 +807,16 @@ proc hwaci-defs-format- {type value} {
         set value \"[string map [list \\ \\\\ \" \\\"] $value]\"
       }
     }
+    -array {
+      set ar {}
+      foreach v $value {
+        set v [hwaci-defs-format- -auto $v]
+        if {$::hwaci(defs-skip) ne $v} {
+          lappend ar $v
+        }
+      }
+      set value "\[ [join $ar {, }] \]"
+    }
     "" {
       set value $::hwaci(defs-skip)
     }
@@ -822,6 +832,18 @@ proc hwaci-defs-format- {type value} {
 # but emits its output in JSON form. It is not a fully-functional JSON
 # emitter, and emit broken JSON for complicated outputs, but should be
 # sufficient for purposes of emitting most configure vars.
+#
+# In addition to the formatting flags supported by make-config-header,
+# it also supports:
+#
+#  -array {patterns...}
+#
+# Any defines matching the given patterns will be treated as a list of
+# values, each of which will be formatted as if it were in an -auto {...}
+# set, and the define will be emitted to JSON in the form:
+#
+#  "ITS_NAME": [ "value1", ...valueN ]
+#
 proc hwaci-dump-defs-json {file args} {
   file mkdir [file dirname $file]
   set lines {}

diff --git a/manifest b/manifest
index 26017bed128dda13cff8fdb168db3e5cd08ec6a2..585a47ebe5d163bc3438846a51e46c9d514fd55a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C ./configure\snow\semits\sconfig-defs.json,\sa\sJSON-formatted\scounterpart\sof\sthe\sDEFS=...\sinfo\swhich\sthe\spre-built\sautotools\sbundles\semit.
-D 2024-10-25T03:18:11.374
+C Experimentally\sadd\sthe\s-array\sformatting\soption\sto\shwaci-dump-defs-json\sand\semit\sOPT_FEATURE_FLAGS/OPT_SHELL\sin\sboth\sflat\sstring\sand\sarray\sforms.
+D 2024-10-25T03:35:01.759
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def f62fd9af4b7dbf53a51134edfef614bc16ec37b68787eb5e0c043efcbdb5a400
+F auto.def d84cacf36daca7f56099b5ea525cf0ce20ab2e635d73517fec87cd46340d7a5e
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -47,7 +47,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/hwaci-common.tcl e68707f732d05df600a2b621c3c4c337edda0b00ee4216984b3db468da37b05c
+F autosetup/hwaci-common.tcl 8575c29133e3bec015915965940812fe07196b67a88a47f3f5473dace4dab43f
 F autosetup/jimsh0.c eb49d62a5b28b4d3b2af10cdfa5dc972ed76e8474fd773cdc7266e768c746f6d
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9f861f66e238b62e04d640ee98bac86b9b532a55d62c92ae0154bd67ee01ec75
-R bda6d69b215aa13feea0d2ce2c155327
+P 800b083c3a55a990bd5b7fd587e24144b0084a394f9cf8160c3aa0a6880f8053
+R f436110a36bf2e585da07552c226e8eb
 U stephan
-Z 553db8e44b1988785785d92552d56c86
+Z 22976a2d67fb47f3aec5f8d0ffbf3d71
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index dead31f245dc5ecf15f26d9073d8b759a9751e83..73963d7ab3f873200016da1b321d7929aa3da8f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-800b083c3a55a990bd5b7fd587e24144b0084a394f9cf8160c3aa0a6880f8053
+ce6bc4603c27952ca44ff55c81dd50a04b0f6ef8f198720ee0da3aff4c291449