From 3384ccb8bb7055d58f875ad92ffd6ad0dfe75519 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Wed, 13 Dec 2017 22:42:55 +0000 Subject: [PATCH] Add support for the 'lsm1.c' target in the MSVC makefile. FossilOrigin-Name: 6de21deac469ab25378656f6f58115a92f5892428c6f2f3545c9bafac37e4a41 --- Makefile.msc | 23 +++++++++++++++++++++++ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index b16f08adee..9eb443faf3 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2075,6 +2075,24 @@ FTS5_SRC = \ $(TOP)\ext\fts5\fts5_varint.c \ $(TOP)\ext\fts5\fts5_vocab.c +LSM1_SRC = \ + $(TOP)\ext\lsm1\lsm.h \ + $(TOP)\ext\lsm1\lsmInt.h \ + $(TOP)\ext\lsm1\lsm_ckpt.c \ + $(TOP)\ext\lsm1\lsm_file.c \ + $(TOP)\ext\lsm1\lsm_log.c \ + $(TOP)\ext\lsm1\lsm_main.c \ + $(TOP)\ext\lsm1\lsm_mem.c \ + $(TOP)\ext\lsm1\lsm_mutex.c \ + $(TOP)\ext\lsm1\lsm_shared.c \ + $(TOP)\ext\lsm1\lsm_sorted.c \ + $(TOP)\ext\lsm1\lsm_str.c \ + $(TOP)\ext\lsm1\lsm_tree.c \ + $(TOP)\ext\lsm1\lsm_unix.c \ + $(TOP)\ext\lsm1\lsm_varint.c \ + $(TOP)\ext\lsm1\lsm_vtab.c \ + $(TOP)\ext\lsm1\lsm_win32.c + fts5parse.c: $(TOP)\ext\fts5\fts5parse.y lemon.exe copy $(TOP)\ext\fts5\fts5parse.y . del /Q fts5parse.h 2>NUL @@ -2086,6 +2104,10 @@ fts5.c: $(FTS5_SRC) $(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl copy $(TOP)\ext\fts5\fts5.h . +lsm1.c: $(LSM1_SRC) + $(TCLSH_CMD) $(TOP)\ext\lsm1\tool\mklsm1c.tcl + copy $(TOP)\ext\lsm1\lsm.h . + fts5.lo: fts5.c $(HDR) $(EXTHDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c @@ -2315,4 +2337,5 @@ clean: del /Q sqlite-*-output.vsix 2>NUL del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL del /Q fts5.* fts5parse.* 2>NUL + del /Q lsm.h lsm1.c 2>NUL # <> diff --git a/manifest b/manifest index 4f30ae5e01..4b4c5e5dc3 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -C An\simproved\sway\sof\sgenerating\sthe\sSQLITE_READONLY_DIRECTORY\serror.\nThe\serror\smessage\ssubmitted\sto\ssqlite3_log()\sis\sstill\scorrect\sthis\sway. -D 2017-12-13T20:35:34.439 +C Add\ssupport\sfor\sthe\s'lsm1.c'\starget\sin\sthe\sMSVC\smakefile. +D 2017-12-13T22:42:55.057 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44 +F Makefile.msc a2492b29176edc3c754aa7a2f7daa20cd3fa20a56e3ee64e376092836177c42a F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -1680,7 +1680,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 3ec73c38f878d73d278fce99ba10c708dcc475835774f1e17769ff7315be6d7c -R 22c3a7dd6bc608a3f08477eed3bb5065 -U drh -Z 687b40dd4870cf20b77c228c17085d90 +P 1c0aa919ee429cd194820ec9c54084563f39e63fd399b23f859fc6703b429b15 +R c15fac6ddfa8bdc9c58742ac799b0523 +U mistachkin +Z f5d555af74f00cd8b8d0269819b3c3ed diff --git a/manifest.uuid b/manifest.uuid index 1669756c04..01b0fc2c62 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1c0aa919ee429cd194820ec9c54084563f39e63fd399b23f859fc6703b429b15 \ No newline at end of file +6de21deac469ab25378656f6f58115a92f5892428c6f2f3545c9bafac37e4a41 \ No newline at end of file