From 4aa6d39fd8dfbb822db2f156ba371c1a5000f35c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 24 Jan 2014 00:09:37 +0100
Subject: [PATCH] archive/*: move to archive/plugins/
---
Makefile.am | 24 +++++++++----------
src/CommandLine.cxx | 4 ++--
src/Main.cxx | 2 +-
src/UpdateArchive.cxx | 8 +++----
src/{ => archive}/ArchiveDomain.cxx | 0
src/{ => archive}/ArchiveDomain.hxx | 0
src/{ => archive}/ArchiveFile.hxx | 0
src/{ => archive}/ArchiveList.cxx | 6 ++---
src/{ => archive}/ArchiveList.hxx | 0
src/{ => archive}/ArchiveLookup.cxx | 0
src/{ => archive}/ArchiveLookup.hxx | 0
src/{ => archive}/ArchivePlugin.cxx | 0
src/{ => archive}/ArchivePlugin.hxx | 0
src/{ => archive}/ArchiveVisitor.hxx | 0
.../{ => plugins}/Bzip2ArchivePlugin.cxx | 6 ++---
.../{ => plugins}/Bzip2ArchivePlugin.hxx | 0
.../{ => plugins}/Iso9660ArchivePlugin.cxx | 6 ++---
.../{ => plugins}/Iso9660ArchivePlugin.hxx | 0
.../{ => plugins}/ZzipArchivePlugin.cxx | 6 ++---
.../{ => plugins}/ZzipArchivePlugin.hxx | 0
src/input/ArchiveInputPlugin.cxx | 10 ++++----
test/dump_text_file.cxx | 2 +-
test/run_input.cxx | 2 +-
test/test_archive.cxx | 2 +-
test/visit_archive.cxx | 8 +++----
25 files changed, 43 insertions(+), 43 deletions(-)
rename src/{ => archive}/ArchiveDomain.cxx (100%)
rename src/{ => archive}/ArchiveDomain.hxx (100%)
rename src/{ => archive}/ArchiveFile.hxx (100%)
rename src/{ => archive}/ArchiveList.cxx (94%)
rename src/{ => archive}/ArchiveList.hxx (100%)
rename src/{ => archive}/ArchiveLookup.cxx (100%)
rename src/{ => archive}/ArchiveLookup.hxx (100%)
rename src/{ => archive}/ArchivePlugin.cxx (100%)
rename src/{ => archive}/ArchivePlugin.hxx (100%)
rename src/{ => archive}/ArchiveVisitor.hxx (100%)
rename src/archive/{ => plugins}/Bzip2ArchivePlugin.cxx (98%)
rename src/archive/{ => plugins}/Bzip2ArchivePlugin.hxx (100%)
rename src/archive/{ => plugins}/Iso9660ArchivePlugin.cxx (98%)
rename src/archive/{ => plugins}/Iso9660ArchivePlugin.hxx (100%)
rename src/archive/{ => plugins}/ZzipArchivePlugin.cxx (97%)
rename src/archive/{ => plugins}/ZzipArchivePlugin.hxx (100%)
diff --git a/Makefile.am b/Makefile.am
index 049975534..dbc720a82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -446,12 +446,12 @@ src_mpd_SOURCES += \
src/UpdateArchive.cxx src/UpdateArchive.hxx
libarchive_a_SOURCES = \
- src/ArchiveDomain.cxx src/ArchiveDomain.hxx \
- src/ArchiveLookup.cxx src/ArchiveLookup.hxx \
- src/ArchiveList.cxx src/ArchiveList.hxx \
- src/ArchivePlugin.cxx src/ArchivePlugin.hxx \
- src/ArchiveVisitor.hxx \
- src/ArchiveFile.hxx \
+ src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \
+ src/archive/ArchiveLookup.cxx src/archive/ArchiveLookup.hxx \
+ src/archive/ArchiveList.cxx src/archive/ArchiveList.hxx \
+ src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \
+ src/archive/ArchiveVisitor.hxx \
+ src/archive/ArchiveFile.hxx \
src/input/ArchiveInputPlugin.cxx src/input/ArchiveInputPlugin.hxx
libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(BZ2_CFLAGS) \
@@ -466,20 +466,20 @@ ARCHIVE_LIBS = \
if HAVE_BZ2
libarchive_a_SOURCES += \
- src/archive/Bzip2ArchivePlugin.cxx \
- src/archive/Bzip2ArchivePlugin.hxx
+ src/archive/plugins/Bzip2ArchivePlugin.cxx \
+ src/archive/plugins/Bzip2ArchivePlugin.hxx
endif
if HAVE_ZZIP
libarchive_a_SOURCES += \
- src/archive/ZzipArchivePlugin.cxx \
- src/archive/ZzipArchivePlugin.hxx
+ src/archive/plugins/ZzipArchivePlugin.cxx \
+ src/archive/plugins/ZzipArchivePlugin.hxx
endif
if HAVE_ISO9660
libarchive_a_SOURCES += \
- src/archive/Iso9660ArchivePlugin.cxx \
- src/archive/Iso9660ArchivePlugin.hxx
+ src/archive/plugins/Iso9660ArchivePlugin.cxx \
+ src/archive/plugins/Iso9660ArchivePlugin.hxx
endif
else
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 2b8f18a2c..399ecb393 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -48,8 +48,8 @@
#endif
#ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
#endif
#include <stdio.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index b4fc948f1..28afd12cf 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -76,7 +76,7 @@
#endif
#ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
#endif
#ifdef HAVE_GLIB
diff --git a/src/UpdateArchive.cxx b/src/UpdateArchive.cxx
index aabea821f..ec46a4e17 100644
--- a/src/UpdateArchive.cxx
+++ b/src/UpdateArchive.cxx
@@ -26,10 +26,10 @@
#include "Song.hxx"
#include "Mapper.hxx"
#include "fs/AllocatedPath.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
+#include "archive/ArchiveVisitor.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
diff --git a/src/ArchiveDomain.cxx b/src/archive/ArchiveDomain.cxx
similarity index 100%
rename from src/ArchiveDomain.cxx
rename to src/archive/ArchiveDomain.cxx
diff --git a/src/ArchiveDomain.hxx b/src/archive/ArchiveDomain.hxx
similarity index 100%
rename from src/ArchiveDomain.hxx
rename to src/archive/ArchiveDomain.hxx
diff --git a/src/ArchiveFile.hxx b/src/archive/ArchiveFile.hxx
similarity index 100%
rename from src/ArchiveFile.hxx
rename to src/archive/ArchiveFile.hxx
diff --git a/src/ArchiveList.cxx b/src/archive/ArchiveList.cxx
similarity index 94%
rename from src/ArchiveList.cxx
rename to src/archive/ArchiveList.cxx
index 7b6fb5045..bf6493588 100644
--- a/src/ArchiveList.cxx
+++ b/src/archive/ArchiveList.cxx
@@ -21,9 +21,9 @@
#include "ArchiveList.hxx"
#include "ArchivePlugin.hxx"
#include "util/StringUtil.hxx"
-#include "archive/Bzip2ArchivePlugin.hxx"
-#include "archive/Iso9660ArchivePlugin.hxx"
-#include "archive/ZzipArchivePlugin.hxx"
+#include "plugins/Bzip2ArchivePlugin.hxx"
+#include "plugins/Iso9660ArchivePlugin.hxx"
+#include "plugins/ZzipArchivePlugin.hxx"
#include "util/Macros.hxx"
#include <string.h>
diff --git a/src/ArchiveList.hxx b/src/archive/ArchiveList.hxx
similarity index 100%
rename from src/ArchiveList.hxx
rename to src/archive/ArchiveList.hxx
diff --git a/src/ArchiveLookup.cxx b/src/archive/ArchiveLookup.cxx
similarity index 100%
rename from src/ArchiveLookup.cxx
rename to src/archive/ArchiveLookup.cxx
diff --git a/src/ArchiveLookup.hxx b/src/archive/ArchiveLookup.hxx
similarity index 100%
rename from src/ArchiveLookup.hxx
rename to src/archive/ArchiveLookup.hxx
diff --git a/src/ArchivePlugin.cxx b/src/archive/ArchivePlugin.cxx
similarity index 100%
rename from src/ArchivePlugin.cxx
rename to src/archive/ArchivePlugin.cxx
diff --git a/src/ArchivePlugin.hxx b/src/archive/ArchivePlugin.hxx
similarity index 100%
rename from src/ArchivePlugin.hxx
rename to src/archive/ArchivePlugin.hxx
diff --git a/src/ArchiveVisitor.hxx b/src/archive/ArchiveVisitor.hxx
similarity index 100%
rename from src/ArchiveVisitor.hxx
rename to src/archive/ArchiveVisitor.hxx
diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx
similarity index 98%
rename from src/archive/Bzip2ArchivePlugin.cxx
rename to src/archive/plugins/Bzip2ArchivePlugin.cxx
index 643892917..0e75dd77f 100644
--- a/src/archive/Bzip2ArchivePlugin.cxx
+++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx
@@ -23,9 +23,9 @@
#include "config.h"
#include "Bzip2ArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
diff --git a/src/archive/Bzip2ArchivePlugin.hxx b/src/archive/plugins/Bzip2ArchivePlugin.hxx
similarity index 100%
rename from src/archive/Bzip2ArchivePlugin.hxx
rename to src/archive/plugins/Bzip2ArchivePlugin.hxx
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
similarity index 98%
rename from src/archive/Iso9660ArchivePlugin.cxx
rename to src/archive/plugins/Iso9660ArchivePlugin.cxx
index 120070cc1..8f3300b3e 100644
--- a/src/archive/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -23,9 +23,9 @@
#include "config.h"
#include "Iso9660ArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
diff --git a/src/archive/Iso9660ArchivePlugin.hxx b/src/archive/plugins/Iso9660ArchivePlugin.hxx
similarity index 100%
rename from src/archive/Iso9660ArchivePlugin.hxx
rename to src/archive/plugins/Iso9660ArchivePlugin.hxx
diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx
similarity index 97%
rename from src/archive/ZzipArchivePlugin.cxx
rename to src/archive/plugins/ZzipArchivePlugin.cxx
index 6b21d6ed4..c1446da74 100644
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@@ -23,9 +23,9 @@
#include "config.h"
#include "ZzipArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/RefCount.hxx"
diff --git a/src/archive/ZzipArchivePlugin.hxx b/src/archive/plugins/ZzipArchivePlugin.hxx
similarity index 100%
rename from src/archive/ZzipArchivePlugin.hxx
rename to src/archive/plugins/ZzipArchivePlugin.hxx
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx
index 97694fbc0..e5591a95e 100644
--- a/src/input/ArchiveInputPlugin.cxx
+++ b/src/input/ArchiveInputPlugin.cxx
@@ -19,11 +19,11 @@
#include "config.h"
#include "ArchiveInputPlugin.hxx"
-#include "ArchiveDomain.hxx"
-#include "ArchiveLookup.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
+#include "archive/ArchiveDomain.hxx"
+#include "archive/ArchiveLookup.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
#include "InputPlugin.hxx"
#include "fs/Traits.hxx"
#include "util/Alloc.hxx"
diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
index 37bd63a04..581bb8829 100644
--- a/test/dump_text_file.cxx
+++ b/test/dump_text_file.cxx
@@ -29,7 +29,7 @@
#include "Log.hxx"
#ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
#endif
#include <glib.h>
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 5f16e5a88..2587a80b0 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -30,7 +30,7 @@
#include "Log.hxx"
#ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
#endif
#ifdef HAVE_GLIB
diff --git a/test/test_archive.cxx b/test/test_archive.cxx
index dbb41fe42..353699574 100644
--- a/test/test_archive.cxx
+++ b/test/test_archive.cxx
@@ -1,5 +1,5 @@
#include "config.h"
-#include "ArchiveLookup.hxx"
+#include "archive/ArchiveLookup.hxx"
#include "Compiler.h"
#include <cppunit/TestFixture.h>
diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx
index f78be4564..001b9067b 100644
--- a/test/visit_archive.cxx
+++ b/test/visit_archive.cxx
@@ -23,10 +23,10 @@
#include "ConfigGlobal.hxx"
#include "IOThread.hxx"
#include "InputInit.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
+#include "archive/ArchiveVisitor.hxx"
#include "fs/Path.hxx"
#include "util/Error.hxx"