From 14e4d9ad306dc6647b57fb503e8dc1f607280fb3 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 25 Oct 2024 04:48:40 +0000 Subject: [PATCH] Rename config-defines.json to config.defines.json for consistent with other generated config.* files. Rename --defs-json-include-lowercase to the even less wieldy --defines-json-include-lowercase. FossilOrigin-Name: 131a2a7ef87b65527d03b3c838de9d34eaca94992a973283ad6eeb296250db92 --- Makefile.in | 2 +- auto.def | 10 ++++++---- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8ea809e672..705489fcfe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,7 +311,7 @@ clean-autosetup: clean: clean-autosetup distclean-autosetup: clean - rm -f sqlite_cfg.h config.log config.status config-defs.json Makefile sqlite3.pc + rm -f sqlite_cfg.h config.log config.status config.defines.json Makefile sqlite3.pc rm -f $(TOP)/tool/emcc.sh rm -f libsqlite3*$(T.dll) -gmake -C ext/wasm distclean 2>/dev/null; true diff --git a/auto.def b/auto.def index 31cb336abb..66c9b978b7 100644 --- a/auto.def +++ b/auto.def @@ -144,7 +144,7 @@ options [subst { with-wasi-sdk:=/opt/wasi-sdk => {Top-most dir of the wasi-sdk for a WASI build.} with-emsdk:DIR => {Top-most dir of the Emscripten SDK installation} - defs-json-include-lowercase=0 => {Include lower-case defines in config-defs.json, which are primarily system paths.} + defines-json-include-lowercase=0 => {Include lower-case defines in config.defines.json, which are primarily system paths.} dump-defines=0 => {Dump autosetup defines to $DUMP_DEFINES_FILE (for build debugging)} }] @@ -957,7 +957,7 @@ hwaci-check-rpath # Generate the output files. # hwaci-make-from-dot-in -touch Makefile sqlite3.pc -# for sqlite_cfg.h and config-defs.json +# for sqlite_cfg.h and config.defines.json define PACKAGE_NAME "sqlite" define PACKAGE_URL {https://sqlite.org} define PACKAGE_VERSION [get-define VERSION_XYZ] @@ -991,6 +991,8 @@ if {"" ne $oFF} { } unset oFF +######################################################################## +# Dump config-defines.json... # Demonstrate (mis?)handling of spaces in JSON-export array values: # define-append OPT_FOO.list {"-DFOO=bar baz" -DBAR="baz barre"} define OPT_FEATURE_FLAGS.list [get-define OPT_FEATURE_FLAGS] @@ -1001,12 +1003,12 @@ set dumpDefsOpt { -array {*.list} -auto {OPT_* PACKAGE_* HAVE_*} } -if {[opt-bool defs-json-include-lowercase]} { +if {[opt-bool defines-json-include-lowercase]} { lappend dumpDefsOpt -none {lib_*} ; # remnants from hwaci-check-function-in-lib and friends lappend dumpDefsOpt -auto {[a-z]*} } lappend dumpDefsOpt -none * -hwaci-dump-defs-json config-defs.json {*}$dumpDefsOpt +hwaci-dump-defs-json config.defines.json {*}$dumpDefsOpt undefine OPT_FEATURE_FLAGS.list undefine OPT_SHELL.list diff --git a/manifest b/manifest index bffcdf0b88..2ea3d82ecf 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Add\s--defs-json-include-lowercase\sconfigure\sflag\sto\scause\sconfig-defs.json\sto\sinclude\slower-case\sdefines,\swhich\sare\sprimarily\sthe\svarious\sbuild-related\ssystem\spaths. -D 2024-10-25T04:39:14.952 +C Rename\sconfig-defines.json\sto\sconfig.defines.json\sfor\sconsistent\swith\sother\sgenerated\sconfig.*\sfiles.\sRename\s--defs-json-include-lowercase\sto\sthe\seven\sless\swieldy\s--defines-json-include-lowercase. +D 2024-10-25T04:48:40.197 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in f62cd6d36461d462cccc80ecd2b43a53e21467d67250555570644e616ca5b18d +F Makefile.in 594067da2bde9defc6ff79d15db35f6433ff972ad585461ba5f13d110a095af2 F Makefile.linux-generic 8df0e6ee5e4671f844caf27f88d2be7421e904639f7a0ffdce0e2cd4ea11e8c0 F Makefile.msc 28318970f86f601ac79b5e6a514a52fb33a1526d0e0e915b4edc2f41846c1d4a F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -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 dc9e9da56ef6b99f79fe51e9c6b7510f33fd4d4b44e00779642ea237a0768b76 +F auto.def 79da787fe2e011ca43a571147dd68f737a565a57c814b51c5b7b1f7a0f587b24 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -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 30699b57d21f70dd42ec61f5157859358c6be5e3e14bb2989f8874ceeda5dae6 -R 072d902d5f60f416f41fd709fc58d6b0 +P 0f2555ea3c7c1950566182c8f5a4d98049461e9db305e892c8434ba3fbf3497a +R 001a56dd108f5cc3c7d24adb5c49ea93 U stephan -Z b79df6907aab089767fcfcfc7c508bc3 +Z a5be42358d441efdb62f852f6106323d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 192bb16f99..1f320d0f69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0f2555ea3c7c1950566182c8f5a4d98049461e9db305e892c8434ba3fbf3497a +131a2a7ef87b65527d03b3c838de9d34eaca94992a973283ad6eeb296250db92 -- 2.47.2