Fix minor issues for SQLite shell application

- fix function prototypes for sqlite3mc_version in shell source
- adjust patch script for shell source
- adjust amalgamation script to support shell source amalgamation

Author: utelle

scripts/amalgamate.py

@@ -64,6 +64,14 @@ def find_included_file(self, file_path, source_dir):
 
         return None
 
+    def add_excluded_files(self):
+        search_files = self.exclude_files[:]
+        for search_file in search_files:
+            found_excluded_path = self.find_included_file(search_file, None)
+            if found_excluded_path:
+                norm_excluded_path = os.path.normpath(found_excluded_path)
+                self.excluded_files.append(os.path.normpath(norm_excluded_path))
+
     def __init__(self, args):
         with open(args.config, 'r') as f:
             config = json.loads(f.read())
@@ -74,6 +82,8 @@ def __init__(self, args):
             self.prologue = args.prologue
             self.source_path = args.source_path
             self.included_files = []
+            self.excluded_files = []
+            self.add_excluded_files()
 
     # Generate the amalgamation and write it to the target file.
     def generate(self):
@@ -89,6 +99,7 @@ def generate(self):
             print(" working_dir   = {0}".format(os.getcwd()))
             print(" include_paths = {0}".format(self.include_paths))
             print(" force_include = {0}".format(self.force_include))
+            print(" exclude_files = {0}".format(self.exclude_files))
         print("Creating amalgamation:")
         for file_path in self.sources:
             # Do not check the include paths while processing the source
@@ -239,9 +250,10 @@ def _process_includes(self):
                 found_included_path = self.amalgamation.find_included_file(
                     include_path, self.file_dir if search_same_dir else None)
                 if found_included_path:
-                    includes.append((include_match, found_included_path))
-                    #if self.amalgamation.verbose:
-                    #    print(" #include = {0}".format(include_path))
+                    if not os.path.normpath(found_included_path) in self.amalgamation.excluded_files:
+                        includes.append((include_match, found_included_path))
+                        #if self.amalgamation.verbose:
+                        #    print(" #include = {0}".format(include_path))
             include_match = self.include_pattern.search(self.content,
                 include_match.end())
 

scripts/patchshell.sh

@@ -17,7 +17,7 @@ die() {
 sed -e '/^      sputf(stdout, "SQLite version/{n;N;d}' "$INPUT" \
   | sed '/#ifdef SQLITE_CUSTOM_INCLUDE/!{p;d;};n;n;n;a #if SQLITE3MC_USE_MINIZ != 0 && !defined(SQLITE_ENABLE_COMPRESS)\n#include "miniz.c"\n#ifdef SQLITE_HAVE_ZLIB\n#undef SQLITE_HAVE_ZLIB\n#endif\n#define SQLITE_HAVE_ZLIB 1\n#endif\n' \
   | sed '/#include <zlib.h>/c #include "zlibwrap.h"' \
-  | sed '/^      sqlite3_fprintf(stdout,$/c \      extern char* sqlite3mc_version();\n      sqlite3_fprintf(stdout,' \
+  | sed '/^      sqlite3_fprintf(stdout,$/c \      extern const char* sqlite3mc_version();\n      sqlite3_fprintf(stdout,' \
   | sed '/^            "SQLite version/c \            "SQLite version \%s \%.19s" \/\*extra-version-info\*\/\n            " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/' \
   | sed '/^            sqlite3_libversion(), sqlite3_sourceid());/c \            sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version());' \
-  | sed '/^          sqlite3_libversion(), sqlite3_sourceid());/a \    extern char* sqlite3mc_version();\n    sqlite3_fprintf(p->out, "\%s\\n", sqlite3mc_version());'
+  | sed '/^          sqlite3_libversion(), sqlite3_sourceid());/a \    extern const char* sqlite3mc_version();\n    sqlite3_fprintf(p->out, "\%s\\n", sqlite3mc_version());'

scripts/shell3mc.c.json

@@ -0,0 +1,18 @@
+{
+	"project": "shell3mc.c",
+	"target": "shell3mc_amalgamation.c",
+	"sources": [
+		"shell.c"
+	],
+	"include_paths": [
+		"src", "."
+	],
+	"force_include": [
+	],
+	"exclude_files": [
+		"test_windirent.c",
+		"test_windirent.h",
+		"sqlite3.h"
+	]
+}
+

scripts/sqlite3mc.c.json

@@ -18,6 +18,8 @@
 		"aegis/aegis256/aegis256_common.h",
 		"aegis/aegis256x2/aegis256x2_common.h",
 		"aegis/aegis256x4/aegis256x4_common.h"
+	],
+	"exclude_files": [
 	]
 }
 

scripts/sqlite3mc.h.json

@@ -8,6 +8,8 @@
 		"src", "."
 	],
 	"force_include": [
+	],
+	"exclude_files": [
 	]
 }
 

src/shell.c

@@ -32358,7 +32358,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     char *zPtrSz = sizeof(void*)==8 ? "64-bit" : "32-bit";
     sqlite3_fprintf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
           sqlite3_libversion(), sqlite3_sourceid());
-    extern char* sqlite3mc_version();
+    extern const char* sqlite3mc_version();
     sqlite3_fprintf(p->out, "%s\n", sqlite3mc_version());
 #if SQLITE_HAVE_ZLIB
     sqlite3_fprintf(p->out, "zlib version %s\n", zlibVersion());
@@ -33803,7 +33803,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       char *zHome;
       char *zHistory;
       int nHistory;
-      extern char* sqlite3mc_version();
+      extern const char* sqlite3mc_version();
       sqlite3_fprintf(stdout,
             "SQLite version %s %.19s" /*extra-version-info*/
             " (%s)\n" /*SQLite3-Multiple-Ciphers-version-info*/