Remove 'relic' special handling for file_system.cpp

scripts/amalgamation.py

@@ -87,12 +87,10 @@ def add_include_dir(dirpath):
 # files always excluded
 always_excluded = ['src/amalgamation/duckdb.cpp', 'src/amalgamation/duckdb.hpp', 'src/amalgamation/parquet-amalgamation.cpp', 'src/amalgamation/parquet-amalgamation.hpp']
 # files excluded from the amalgamation
-excluded_files = ['grammar.cpp', 'grammar.hpp', 'symbols.cpp', 'file_system.cpp']
+excluded_files = ['grammar.cpp', 'grammar.hpp', 'symbols.cpp']
 # files excluded from individual file compilation during test_compile
 excluded_compilation_files = excluded_files + ['gram.hpp', 'kwlist.hpp', "duckdb-c.cpp"]
 
-file_system_cpp = os.path.join('src', 'common', 'file_system.cpp')
-
 linenumbers = False
 
 def get_includes(fpath, text):
@@ -277,9 +275,6 @@ def generate_amalgamation(source_file, header_file):
         sfile.write("#if (!defined(DEBUG) && !defined NDEBUG)\n#define NDEBUG\n#endif\n\n")
         for compile_dir in compile_directories:
             sfile.write(write_dir(compile_dir))
-        # for windows we write file_system.cpp last
-        # this is because it includes windows.h which contains a lot of #define statements that mess up the other code
-        sfile.write(write_file(file_system_cpp, True))
 
         sfile.write('\n\n/*\n')
         license_idx = 0
@@ -315,7 +310,7 @@ def list_sources():
     file_list = []
     for compile_dir in compile_directories:
         list_files(compile_dir, file_list)
-    return file_list + [file_system_cpp]
+    return file_list
 
 def list_include_files_recursive(dname, file_list):
     files = os.listdir(dname)
@@ -399,10 +394,6 @@ def generate_amalgamation_splits(source_file, header_file, nsplits):
             continue
         gather_files(compile_dir, source_files, header_files)
 
-    # for windows we write file_system.cpp last
-    # this is because it includes windows.h which contains a lot of #define statements that mess up the other code
-    source_files.append(write_file(os.path.join('src', 'common', 'file_system.cpp'), True))
-
     # write duckdb-internal.hpp
     if '.hpp' in header_file:
         internal_header_file = header_file.replace('.hpp', '-internal.hpp')