Move the logger into core.

build.py

@@ -82,7 +82,6 @@ cxxlibrary(
         "./lib/imagewriter/rawimagewriter.cc",
         "./lib/layout.cc",
         "./lib/ldbs.cc",
-        "./lib/logger.cc",
         "./lib/logrenderer.cc",
         "./lib/proto.cc",
         "./lib/readerwriter.cc",
@@ -180,7 +179,6 @@ cxxlibrary(
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/layout.h": "./lib/layout.h",
         "lib/ldbs.h": "./lib/ldbs.h",
-        "lib/logger.h": "./lib/logger.h",
         "lib/proto.h": "./lib/proto.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
         "lib/sector.h": "./lib/sector.h",

lib/config.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/core/utils.h"
 #include <fstream>
 #include <google/protobuf/text_format.h>

lib/core/build.py

@@ -9,6 +9,7 @@ cxxlibrary(
         "./csvreader.cc",
         "./hexdump.cc",
         "./utils.cc",
+        "./logger.cc",
     ],
     hdrs={
         "lib/core/bitmap.h": "./bitmap.h",
@@ -17,6 +18,7 @@ cxxlibrary(
         "lib/core/csvreader.h": "./csvreader.h",
         "lib/core/globals.h": "./globals.h",
         "lib/core/utils.h": "./utils.h",
+        "lib/core/logger.h": "./logger.h",
     },
     deps=[
         "dep/agg",

lib/core/logger.cc

@@ -1,9 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/core/bytes.h"
-#include "lib/fluxmap.h"
+#include "lib/core/logger.h"
-#include "lib/sector.h"
-#include "lib/flux.h"
-#include "lib/logger.h"
 
 static bool indented = false;
 

lib/flags.cc

@@ -3,7 +3,7 @@
 #include "lib/flags.h"
 #include "lib/proto.h"
 #include "lib/core/utils.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/imagereader/imagereader.h"
 #include <google/protobuf/text_format.h>

lib/fluxsink/a2rfluxsink.cc

@@ -6,7 +6,7 @@
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"

lib/fluxsink/hardwarefluxsink.cc

@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsink/fluxsink.h"

lib/fluxsink/scpfluxsink.cc

@@ -11,7 +11,7 @@
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/scp.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/fluxsource/dmkfluxsource.cc

@@ -4,7 +4,7 @@
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 #include <filesystem>
 

lib/fluxsource/hardwarefluxsource.cc

@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"

lib/fluxsource/scpfluxsource.cc

@@ -6,7 +6,7 @@
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/scp.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 
 static int trackno(int strack)

lib/globals.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <sys/time.h>
 #include <stdarg.h>
 

lib/imagereader/d64imagereader.cc

@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/d88imagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/dimimagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/config.pb.h"
 #include <algorithm>

lib/imagereader/diskcopyimagereader.cc

@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/fdiimagereader.cc

@@ -5,7 +5,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/imagereader.cc

@@ -8,7 +8,7 @@
 #include "lib/image.h"
 #include "lib/layout.h"
 #include "lib/config.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <ctype.h>
 

lib/imagereader/imdimagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/config.pb.h"
 #include <algorithm>

lib/imagereader/imgimagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include "lib/layout.pb.h"
 #include "lib/proto.h"

lib/imagereader/jv3imagereader.cc

@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/nfdimagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/nsiimagereader.cc

@@ -5,7 +5,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/imagereader/imagereader.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/td0imagereader.cc

@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/crc.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagewriter/d64imagewriter.cc

@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/ldbs.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagewriter/d88imagewriter.cc

@@ -5,7 +5,7 @@
 #include "lib/image.h"
 #include "lib/config.pb.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/diskcopyimagewriter.cc

@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagewriter/imagewriter.cc

@@ -8,7 +8,7 @@
 #include "lib/config.pb.h"
 #include "lib/proto.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <iostream>
 #include <fstream>
 

lib/imagewriter/imdimagewriter.cc

@@ -5,7 +5,7 @@
 #include "lib/image.h"
 #include "lib/config.pb.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/imgimagewriter.cc

@@ -8,7 +8,7 @@
 #include "lib/config.pb.h"
 #include "lib/layout.h"
 #include "lib/layout.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/ldbsimagewriter.cc

@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

lib/imagewriter/nsiimagewriter.cc

@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "arch/northstar/northstar.h"
 #include "lib/imagewriter/imagewriter.pb.h"
 #include <algorithm>

lib/imagewriter/rawimagewriter.cc

@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "arch/northstar/northstar.h"
 #include "lib/imagewriter/imagewriter.pb.h"
 #include <algorithm>

lib/layout.cc

@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/layout.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/fl2.h"
 
 static unsigned getTrackStep()

lib/logrenderer.cc

@@ -3,7 +3,7 @@
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
 #include "lib/flux.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 
 namespace
 {

lib/readerwriter.cc

@@ -13,7 +13,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/sector.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/core/utils.h"
 #include "lib/config.pb.h"

lib/usb/usb.cc

@@ -9,7 +9,7 @@
 #include "lib/core/bytes.h"
 #include "lib/proto.h"
 #include "usbfinder.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "applesauce.h"
 #include "greaseweazle.h"
 

lib/vfs/amigaffs.cc

@@ -4,7 +4,7 @@
 #include "lib/config.pb.h"
 #include "lib/proto.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 
 #include "adflib.h"
 #include "adf_blk.h"

src/gui/main.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "gui.h"
 #include "lib/core/utils.h"
 

src/gui/mainwindow.cc

@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/proto.h"
 #include "gui.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"