diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index b6a5c2a..4b9bea2 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -25,7 +25,8 @@ "defines": [], "cStandard": "c11", "cppStandard": "c++11", - "compilerPath": "/home/autobuild/tools/win32/bin/kos32-gcc" + "compilerPath": "/home/autobuild/tools/win32/bin/kos32-gcc", + "intelliSenseMode": "gcc-x86" } ], "version": 4 diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e1e4d5..774b630 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,6 +9,8 @@ "editor.insertSpaces": false, "cSpell.enabled": true, "cSpell.words": [ + "luasqlite3", + "lsqlite3", "kolibrios", "libini", "ksys_", diff --git a/Makefile b/Makefile index f5efb44..f2d334c 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ install: $(T) $(OBJS) $(SQLITE3_DIR)/libsqlite3.dll.a $(INSTALL) $< `$(INSTALLPATH) $(MYLIB)` clean: - rm -f $(OBJS) $T core core.* a.out test.db + rm -f $(OBJS) $T core html: $(POD2HTML) --title="LuaSQLite 3" --infile=doc/lsqlite3.pod --outfile=doc/lsqlite3.html diff --git a/README b/README index 8fc2344..96bf14c 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ +# LuaSQLite3 LuaSQLite3 provides a means to manipulate SQLite3 databases directly from lua using Lua 5. @@ -16,6 +17,13 @@ the LuaSQLite3 distribution. Lua 5 is available from http://www.lua.org/ +## Installation + +1. install lua +2. move `lsqlite3.dll` to `/kolibrios/lib/lua` +3. rename(or copy) `/kolibrios/lib/sqlite.dll` to `/kolibrios/lib/libsqlite.dll` + + ## Build ``` @@ -27,11 +35,8 @@ cd luasqlite3-kolibrios make all ``` +## Tests +move repo to kolibrios filesystem and run `test/test.sh`. -## Instalation - -1. install lua -2. move `lsqlite3.dll` to `/kolibrios/lib/lua` -3. rename(or copy) `/kolibrios/lib/sqlite.dll` to `/kolibrios/lib/libsqlite.dll` - +Some tests need lunit. move luinit.lua to `/kolibrios/shard/lua`. diff --git a/test/tests-sqlite3.lua b/test/tests-sqlite3.lua index 8702ac3..795bdc5 100644 --- a/test/tests-sqlite3.lua +++ b/test/tests-sqlite3.lua @@ -30,7 +30,7 @@ -- Copyright (c) 2005-18 Doug Currie -- Same license as above -local sqlite3 = require(arg[1]) -- "lsqlite3complete" or "lsqlite3" +local sqlite3 = require("lsqlite3") -- "lsqlite3complete" or "lsqlite3" local os = os