From: drh Date: Tue, 22 Aug 2017 19:43:41 +0000 (+0000) Subject: Attempting to fix the source-id generator so that it works for out-of-tree X-Git-Tag: version-3.21.0~136^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1722547420bad6b4733ea1d82f7bc5f788129db;p=thirdparty%2Fsqlite.git Attempting to fix the source-id generator so that it works for out-of-tree builds. FossilOrigin-Name: 5a037ac2da7449be3e26c36910ac5d865d7e74d3c25af0a10578c1f92fe2afea --- diff --git a/manifest b/manifest index 6f9319811f..75edf80b05 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s"mksourceid"\sprogram\sto\sthe\sbuild\sprocess.\s\sThat\sprogram\schanges\nthe\sSQLITE_SOURCE_ID\sif\sthe\ssource\stree\shas\sbeen\smodified\sin\sany\sway. -D 2017-08-22T19:19:00.280 +C Attempting\sto\sfix\sthe\ssource-id\sgenerator\sso\sthat\sit\sworks\sfor\sout-of-tree\nbuilds. +D 2017-08-22T19:43:41.092 F Makefile.in c644bbe8ebe4aae82ad6783eae6b6beea4c727b99ff97568b847ced5e2ac7afb F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 25b154da7f0b3d4924f27378c1f8d006285b80811f1ccf3ed953dbebf6282136 @@ -1592,7 +1592,7 @@ F tool/mksourceid.c 1db4636bf4249ac5d2d56fb06b0b30929bf7446a88c7048bb731a72a1c47 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb F tool/mksqlite3c.tcl a4b36eaa002ed00a0ab2c93d999a14f1acae98ff09a85382e5abc05a91edb82b -F tool/mksqlite3h.tcl e10b7878ca20161594fbc28913027956d7ee35713400534a115d8f139b496478 +F tool/mksqlite3h.tcl 5dbb75b1125000907f5b334b7b7a16960c5805a26c7a7475f6dd9bd415709a71 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@ -1650,7 +1650,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 885c2b44a44f8d054014e4079b2cac8279c11d13206d5b5215189ef75b9c5254 -R 48a68cf4cf699ac46128e2797c5425f9 +P d4c05e04f7e1325a3260808ee17252876f678e78bf0cf6569a18a52ff674bd7a +R cac9e20accccd833acf3f1836f6cc4f1 U drh -Z 40e98cab2922888e2c30394283edf487 +Z 8bf43d2286864b6e544f292f098efb98 diff --git a/manifest.uuid b/manifest.uuid index 616786c10c..aa5c13477d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d4c05e04f7e1325a3260808ee17252876f678e78bf0cf6569a18a52ff674bd7a \ No newline at end of file +5a037ac2da7449be3e26c36910ac5d865d7e74d3c25af0a10578c1f92fe2afea \ No newline at end of file diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl index ca40df8185..174a3333bf 100644 --- a/tool/mksqlite3h.tcl +++ b/tool/mksqlite3h.tcl @@ -53,7 +53,10 @@ set nVersion [eval format "%d%03d%03d" [split $zVersion .]] # Get the source-id # -set zSourceId [exec ./mksourceid $TOP/manifest] +set PWD [pwd] +cd $TOP +set zSourceId [exec ./mksourceid manifest] +cd $PWD # Set up patterns for recognizing API declarations. #