From: stephan Date: Thu, 24 Oct 2024 05:03:20 +0000 (+0000) Subject: Bump version number to 3.48.0 (in this branch only - in trunk, doing so requires... X-Git-Tag: major-relase~351^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3cff449f96e0e9b543e80bc33c5fb499e2add8f;p=thirdparty%2Fsqlite.git Bump version number to 3.48.0 (in this branch only - in trunk, doing so requires a specific autoconf version) and rename the RELEASE and VERSION makefile symbols for clarity's sake. FossilOrigin-Name: 4193d90f2158e25fe25f9bcf579ae38a6e0ab6c26f52cd07a777d67b87107632 --- diff --git a/Makefile.in b/Makefile.in index 5c0d9b667c..436ab3941d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,8 +164,8 @@ TCC += $(OPTS) # Release (X.Y.Z) and version (X.Y) numbers for the SQLite being # compiled. # -VERSION.XYZ = @RELEASE@ -# VERSION.XY = @VERSION@ # we don't currently use this anywhere +VERSION.XYZ = @VERSION_XYZ@ +# VERSION.XY = @VERSION_XY@ # we don't currently use this anywhere # # Filename extensions for binaries and libraries diff --git a/VERSION b/VERSION index 5e895b2435..7dd5eda815 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.47.0 +3.48.0 diff --git a/auto.def b/auto.def index 5cd51f8994..9c6eccbf0c 100644 --- a/auto.def +++ b/auto.def @@ -163,12 +163,12 @@ set srcdir $::autosetup(srcdir) set top_srcdir [get-define abs_top_srcdir] msg-result "srcdir = $srcdir" msg-result "top_srcdir = $top_srcdir" -set RELEASE [readfile $::autosetup(srcdir)/VERSION] -regsub {([0-9]*\.*[0-9]*).*} $RELEASE {\1} VERSION -define VERSION $VERSION -define RELEASE $RELEASE -msg-result "RELEASE = $RELEASE" -msg-result "VERSION = $VERSION" +set VERSION_XYZ [readfile $::autosetup(srcdir)/VERSION] +regsub {([0-9]*\.*[0-9]*).*} $VERSION_XYZ {\1} VERSION_XY +define VERSION_XY $VERSION_XY +define VERSION_XYZ $VERSION_XYZ +msg-result "RELEASE = $VERSION_XYZ" +msg-result "VERSION = $VERSION_XY" define-append SQLITE_AUTOREMAKE cd $::autosetup(srcdir) && $top_srcdir/configure {*}$::autosetup(argv) @@ -959,7 +959,7 @@ hwaci-check-rpath hwaci-make-from-dot-in -touch Makefile sqlite3.pc # for sqlite_cfg.h define PACKAGE_URL {https://sqlite.org} -define PACKAGE_VERSION [get-define VERSION] +define PACKAGE_VERSION [get-define VERSION_XYZ] if {0} { # Requires a hand-written sqlite_cfg.h.in... hwaci-make-from-dot-in sqlite_cfg.h diff --git a/manifest b/manifest index 92a574f02e..3523ba29b6 100644 --- a/manifest +++ b/manifest @@ -1,19 +1,19 @@ -C Potentially\scontroversial/unconventional\smakefile\ssymbol\srenamings\sand\sdocs\sexplaining\sthem. -D 2024-10-24T04:56:44.349 +C Bump\sversion\snumber\sto\s3.48.0\s(in\sthis\sbranch\sonly\s-\sin\strunk,\sdoing\sso\srequires\sa\sspecific\sautoconf\sversion)\sand\srename\sthe\sRELEASE\sand\sVERSION\smakefile\ssymbols\sfor\sclarity's\ssake. +D 2024-10-24T05:03:20.051 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 46856434b39ebe5b4cbdaef96710895e37c78e171ea8855467b87ed12fd16d2c +F Makefile.in bd9798f56bbdc342f8d563ef7f5da7a87eb3cd95e52bfe3f834c1c86e9862538 F Makefile.linux-generic eb13e3e981a1950c99ce26c177fe2c2d2a268da4c0b1fcba85bfdf56142be298 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 -F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6 +F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 -F auto.def 4979dcf77888bf31ff52a22cbbd197d0ca708c3f7f4d8cc32ebc32948673d440 +F auto.def 610865aa878f3367977b5c4d74ffa9b74d097d1f0e76ffa4a8c286322e0d4e63 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2236,8 +2236,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 be7b32a77f58ae3eb15cb828385035e63236b7e6c0669f90f2321f0509f0de1b -R 557f37869a74501ca173c9da84c9952b +P 7eceb7539dcce16104a93ad0ca1f755f23621751878cc4b01465e61333795b72 +R 706f84b6afa1da7be99c001c09d178a8 U stephan -Z 0b592963de7475918e5543e03cef7bf3 +Z 9e7d56afc7541bc2579fecb7499ab27a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b969078803..737f06142b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7eceb7539dcce16104a93ad0ca1f755f23621751878cc4b01465e61333795b72 +4193d90f2158e25fe25f9bcf579ae38a6e0ab6c26f52cd07a777d67b87107632