Move csvreader into external. Why was it in core?

davidgiven · Oct 14, 2024 · 900ba11 · 900ba11
1 parent 7da4e15
commit 900ba11
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/lib/core/build.py b/lib/core/build.py
@@ -6,7 +6,6 @@
         "./bitmap.cc",
         "./bytes.cc",
         "./crc.cc",
-        "./csvreader.cc",
         "./hexdump.cc",
         "./utils.cc",
         "./logger.cc",
@@ -16,7 +15,6 @@
         "lib/core/bitmap.h": "./bitmap.h",
         "lib/core/bytes.h": "./bytes.h",
         "lib/core/crc.h": "./crc.h",
-        "lib/core/csvreader.h": "./csvreader.h",
         "lib/core/globals.h": "./globals.h",
         "lib/core/utils.h": "./utils.h",
         "lib/core/logger.h": "./logger.h",

diff --git a/lib/external/build.py b/lib/external/build.py
@@ -11,14 +11,16 @@
         "./fl2.cc",
         "./kryoflux.cc",
         "./catweasel.cc",
+        "./csvreader.cc",
     ],
     hdrs={
-        "lib/external/ldbs.h": "./ldbs.h",
         "lib/external/a2r.h": "./a2r.h",
-        "lib/external/scp.h": "./scp.h",
+        "lib/external/catweasel.h": "./catweasel.h",
+        "lib/external/csvreader.h": "./csvreader.h",
         "lib/external/fl2.h": "./fl2.h",
         "lib/external/kryoflux.h": "./kryoflux.h",
-        "lib/external/catweasel.h": "./catweasel.h",
+        "lib/external/ldbs.h": "./ldbs.h",
+        "lib/external/scp.h": "./scp.h",
     },
     deps=["lib/core", ".+fl2_proto_lib", "lib/data"],
 )
diff --git a/lib/core/csvreader.cc → lib/external/csvreader.cc b/lib/core/csvreader.cc → lib/external/csvreader.cc
@@ -1,6 +1,6 @@
 #include <string>
 #include <vector>
-#include "lib/core/csvreader.h"
+#include "lib/external/csvreader.h"
 
 std::vector<std::string> CsvReader::readLine()
 {

diff --git a/lib/core/csvreader.h → lib/external/csvreader.h b/lib/core/csvreader.h → lib/external/csvreader.h
diff --git a/src/fe-analyselayout.cc b/src/fe-analyselayout.cc
@@ -5,7 +5,7 @@
 #include "lib/core/bitmap.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/sector.h"
-#include "lib/core/csvreader.h"
+#include "lib/external/csvreader.h"
 #include "lib/data/image.h"
 #include "lib/data/fluxmapreader.h"
 #include "agg2d.h"

diff --git a/tests/csvreader.cc b/tests/csvreader.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/core/csvreader.h"
+#include "lib/external/csvreader.h"
 #include <assert.h>
 
 typedef std::vector<std::string> strings;