From e6b41c4641781d14e80e1910440fcb34707f6050 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 25 Sep 2024 02:00:09 +0000 Subject: [PATCH] Testing libfossil checkin fix for inheritance of privateness. FossilOrigin-Name: 4b104926bf0862a5088e51549c2d688c2af649d45bf0e396cc48e171bed06b0a --- auto.def | 27 ++++++++++++++------------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/auto.def b/auto.def index 32cb94185b..c4cc217416 100644 --- a/auto.def +++ b/auto.def @@ -6,21 +6,21 @@ set DUMP_DEFINES_FILE defines.list options { with-tclsh:PATHNAME => {Full pathname of tclsh to use} with-tcl:DIR => {Directory containing tclConfig.sh} - tcl=1 => {building accessory programs that require TCL-dev} - test-status=0 => {status of tests} + disable-tcl=0 => {building accessory programs that require TCL-dev} + enable-test-status=0 => {status of tests} with-wasi-sdk:=/opt/wasi-sdk => {Path to the wasi-dsk} - threadsafe=1 => mutexing - releasemode=0 => {libtool link to release mode} - tempstore=0 => {an in-ram database for temporary tables never,no,yes,always} - editline=0 => {BSD editline support} - readline=1 => {readline support} + disable-threadsafe=0 => mutexing + enable-releasemode=0 => {libtool link to release mode} + enable-tempstore=0 => {an in-ram database for temporary tables never,no,yes,always} + enable-editline=0 => {BSD editline support} + disable-readline=0 => {readline support} with-readline-lib => {readline library} with-readline-inc => {readline include paths} with-linenoise:DIR => {} - amalgamation=1 => {Disable the amalgamation and instead build all files separately} - load-extension=1 => {Disable loading of external extensions} - math=1 => {math functions} - json=1 => {JSON functions} + disable-amalgamation=0 => {Disable the amalgamation and instead build all files separately} + disable-load-extension=0 => {Disable loading of external extensions} + disable-math=0 => {math functions} + disable-json=0 => {JSON functions} enable-all=0 => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} enable-memsys5=0 => MEMSYS5 enable-memsys3=0 => MEMSYS3 @@ -404,9 +404,10 @@ if {0} { ########## # Do we want to support release # -if {[opt-bool releasemode]} { +if {[opt-bool enable-releasemode]} { + set enable_releasemode 1 } else { - set enable_releasemode no + set enable_releasemode 0 } if {0} { diff --git a/manifest b/manifest index 5323103370..71e4216f4a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Get\sskeleton\sauto.def\srunning,\sbut\sit\sdoesn't\sreally\sdo\smuch\sexcept\ssome\sstandard\sboilerplate\sstuff. -D 2024-09-25T01:39:39.297 +C Testing\slibfossil\scheckin\sfix\sfor\sinheritance\sof\sprivateness. +D 2024-09-25T02:00:09.512 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -14,7 +14,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 eb8f5b72c433ef0d37b1d78b3a06ceb22165aa161a88cfd39d0cbef171dd1bc2 +F auto.def 3b6d2ee3ddb3fe0c79292f0a84e4fbe9302c23b06388fa2c06ae17ee25283707 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2232,8 +2232,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 dfb1e7f0cce9bc79c43eee7208cad0e2df562b2bc9705d3a36fd78f86c75495b -R dd0ebdea6824f43df28d73bb1d5be9bb +P e707634cf755346752bb83b7be5d0c683e39d6e0a497846019323fed31c08b9d +R 55f0e3bb43a27631a03061e331dafb41 U stephan -Z 061986ba8b4c5587dccbe2f0a25494b3 +Z 800ded8d31a18a53ba5fd1647482872b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c9a78ea48e..69cfa1b926 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e707634cf755346752bb83b7be5d0c683e39d6e0a497846019323fed31c08b9d +4b104926bf0862a5088e51549c2d688c2af649d45bf0e396cc48e171bed06b0a