Move the Kryoflux and Catweasel stuff into external.

build.py

@@ -34,7 +34,6 @@ cxxlibrary(
         "./lib/fluxsink/scpfluxsink.cc",
         "./lib/fluxsink/vcdfluxsink.cc",
         "./lib/fluxsource/a2rfluxsource.cc",
-        "./lib/fluxsource/catweasel.cc",
         "./lib/fluxsource/cwffluxsource.cc",
         "./lib/fluxsource/dmkfluxsource.cc",
         "./lib/fluxsource/erasefluxsource.cc",
@@ -43,7 +42,6 @@ cxxlibrary(
         "./lib/fluxsource/flx.cc",
         "./lib/fluxsource/flxfluxsource.cc",
         "./lib/fluxsource/hardwarefluxsource.cc",
-        "./lib/fluxsource/kryoflux.cc",
         "./lib/fluxsource/kryofluxfluxsource.cc",
         "./lib/fluxsource/memoryfluxsource.cc",
         "./lib/fluxsource/scpfluxsource.cc",
@@ -144,10 +142,8 @@ cxxlibrary(
         "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
-        "lib/fluxsource/catweasel.h": "lib/fluxsource/catweasel.h",
         "lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h",
         "lib/fluxsource/flx.h": "lib/fluxsource/flx.h",
-        "lib/fluxsource/kryoflux.h": "lib/fluxsource/kryoflux.h",
         "lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h",
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",

lib/external/build.py

@@ -9,12 +9,16 @@ cxxlibrary(
     srcs=[
         "./ldbs.cc",
         "./fl2.cc",
+        "./kryoflux.cc",
+        "./catweasel.cc",
     ],
     hdrs={
         "lib/external/ldbs.h": "./ldbs.h",
         "lib/external/a2r.h": "./a2r.h",
         "lib/external/scp.h": "./scp.h",
         "lib/external/fl2.h": "./fl2.h",
+        "lib/external/kryoflux.h": "./kryoflux.h",
+        "lib/external/catweasel.h": "./catweasel.h",
     },
     deps=["lib/core", ".+fl2_proto_lib", "lib/data"],
 )

lib/external/catweasel.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
 #include "lib/core/bytes.h"
-#include "lib/fluxsource/catweasel.h"
+#include "lib/external/catweasel.h"
 
 std::unique_ptr<Fluxmap> decodeCatweaselData(
     const Bytes& bytes, nanoseconds_t clock)

lib/external/kryoflux.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "kryoflux.h"
+#include "lib/external/kryoflux.h"
 #include "protocol.h"
 #include <fstream>
 #include <sys/types.h>

lib/fluxsource/cwffluxsource.cc

@@ -2,7 +2,7 @@
 #include "lib/data/fluxmap.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/fluxsource/catweasel.h"
+#include "lib/external/catweasel.h"
 #include "lib/config/proto.h"
 #include <fstream>
 

lib/fluxsource/dmkfluxsource.cc

@@ -2,7 +2,7 @@
 #include "lib/data/fluxmap.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/fluxsource/catweasel.h"
+#include "lib/external/catweasel.h"
 #include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include <fstream>

lib/fluxsource/flx.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "kryoflux.h"
+#include "lib/external/kryoflux.h"
 #include "protocol.h"
 #include "lib/fluxsource/flx.h"
 

lib/fluxsource/kryofluxfluxsource.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "kryoflux.h"
+#include "lib/external/kryoflux.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
 

lib/fluxsource/scpfluxsource.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "kryoflux.h"
+#include "lib/external/kryoflux.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/core/utils.h"
 #include "lib/fluxsource/fluxsource.h"

tests/kryoflux.cc

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/fluxsource/kryoflux.h"
+#include "lib/external/kryoflux.h"
 
 static void test_convert(const Bytes& kryofluxbytes, const Bytes& fluxmapbytes)
 {