Merge 'Cosmetics for libSQL version 0.1.0' from Piotr Sarna (#73)

This pull request adds a LIBSQL_VERSION file where libSQL release number
is stored (and currently set to 0.1.0), and also hooked to be available
programmatically, just like its cousin, VERSION file, which still stores
the SQLite release number we're based on.

It also rebrands the shell to libsql, to be clear that we forked, and
potenially leave us a gateway to break backward compatibility if
necessary.

Author: penberg

.gitignore

@@ -54,3 +54,4 @@ srcck1
 test-out.txt
 test/rust_suite/target
 testfixture
+libsql

LIBSQL_VERSION

@@ -0,0 +1 @@
+0.1.0

Makefile.in

@@ -651,7 +651,7 @@ ST_OPT = -DSQLITE_OS_KV_OPTIONAL
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
-all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
+all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) libsql$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
 
 Makefile: $(TOP)/Makefile.in
 	./config.status
@@ -675,6 +675,9 @@ sqlite3$(TEXE):	shell.c sqlite3.c
 		shell.c sqlite3.c \
 		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
+libsql$(TEXE):	sqlite3$(TEXE)
+		cp sqlite3$(TEXE) libsql$(TEXE)
+
 sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
 	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
 
@@ -1494,7 +1497,7 @@ tcl_install:	lib_install libtclsqlite3.la pkgIndex.tcl
 	$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
 
 clean:
-	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
+	rm -f *.lo *.la *.o sqlite3$(TEXE) libsql$(TEXE) libsqlite3.la
 	rm -f sqlite3.h opcodes.*
 	rm -rf .libs .deps
 	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz

src/main.c

@@ -100,13 +100,16 @@ static int (*const sqlite3BuiltinExtensions[])(sqlite3*) = {
 ** contains the text of SQLITE_VERSION macro.
 */
 const char sqlite3_version[] = SQLITE_VERSION;
+const char libsql_version[] = LIBSQL_VERSION;
 #endif
 
 /* IMPLEMENTATION-OF: R-53536-42575 The sqlite3_libversion() function returns
 ** a pointer to the to the sqlite3_version[] string constant. 
 */
 const char *sqlite3_libversion(void){ return sqlite3_version; }
 
+const char *libsql_libversion(void){ return LIBSQL_VERSION; }
+
 /* IMPLEMENTATION-OF: R-25063-23286 The sqlite3_sourceid() function returns a
 ** pointer to a string constant whose value is the same as the
 ** SQLITE_SOURCE_ID C preprocessor macro. Except if SQLite is built using

src/shell.c.in

@@ -10758,8 +10758,8 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* SQLITE_USER_AUTHENTICATION */
 
   if( c=='v' && cli_strncmp(azArg[0], "version", n)==0 ){
-    utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
-        sqlite3_libversion(), sqlite3_sourceid());
+    utf8_printf(p->out, "libSQL %s (based on SQLite %s) %s\n" /*extra-version-info*/,
+        libsql_libversion(), sqlite3_libversion(), sqlite3_sourceid());
 #if SQLITE_HAVE_ZLIB
     utf8_printf(p->out, "zlib version %s\n", zlibVersion());
 #endif
@@ -11860,7 +11860,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     }else if( cli_strcmp(z,"-bail")==0 ){
       /* No-op.  The bail_on_error flag should already be set. */
     }else if( cli_strcmp(z,"-version")==0 ){
-      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
+      printf("%s %s (libSQL %s)\n", sqlite3_libversion(), sqlite3_sourceid(), libsql_libversion());
       return 0;
     }else if( cli_strcmp(z,"-interactive")==0 ){
       stdin_is_interactive = 1;
@@ -11979,9 +11979,9 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       char *zHistory;
       int nHistory;
       printf(
-        "SQLite version %s %.19s\n" /*extra-version-info*/
+        "libSQL version %s (based on SQLite version %s) %.19s\n" /*extra-version-info*/
         "Enter \".help\" for usage hints.\n",
-        sqlite3_libversion(), sqlite3_sourceid()
+        libsql_libversion(), sqlite3_libversion(), sqlite3_sourceid()
       );
       if( warnInmemoryDb ){
         printf("Connected to a ");

src/sqlite.h.in

@@ -150,6 +150,8 @@ extern "C" {
 #define SQLITE_VERSION_NUMBER --VERSION-NUMBER--
 #define SQLITE_SOURCE_ID      "--SOURCE-ID--"
 
+#define LIBSQL_VERSION        "--LIBSQL-VERS--"
+
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
@@ -187,6 +189,8 @@ const char *sqlite3_libversion(void);
 const char *sqlite3_sourceid(void);
 int sqlite3_libversion_number(void);
 
+const char *libsql_libversion(void);
+
 /*
 ** CAPI3REF: Run-Time Library Compilation Options Diagnostics
 **

tool/mksqlite3h.tcl

@@ -51,6 +51,11 @@ set zVersion [string trim [read $in]]
 close $in
 set nVersion [eval format "%d%03d%03d" [split $zVersion .]]
 
+# Get libSQL version number accordingly
+set in [open $TOP/LIBSQL_VERSION]
+set zLibSQLVersion [string trim [read $in]]
+close $in
+
 # Get the source-id
 #
 set PWD [pwd]
@@ -118,6 +123,8 @@ foreach file $filelist {
     regsub -- --VERSION-NUMBER-- $line $nVersion line
     regsub -- --SOURCE-ID--      $line "$zSourceId" line
 
+    regsub -- --LIBSQL-VERS--    $line $zLibSQLVersion line
+
     if {[regexp $varpattern $line] && ![regexp {^ *typedef} $line]} {
       set line "SQLITE_API $line"
     } else {