Move plugins to new layout.

bareos · Feb 17, 2015 · c615e72 · c615e72
1 parent 71c8a3a
commit c615e72
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 45 deletions.
diff --git a/autoconf/configure.in b/autoconf/configure.in
@@ -173,9 +173,9 @@ if test x$use_libtool != xno; then
    LIBTOOL_INSTALL_TARGET="libtool-install"
    LIBTOOL_CLEAN_TARGET="libtool-clean"
    QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
-   FD_PLUGIN_DIR="src/plugins/fd"
-   SD_PLUGIN_DIR="src/plugins/sd"
-   DIR_PLUGIN_DIR="src/plugins/dir"
+   FD_PLUGIN_DIR="src/plugins/filed"
+   SD_PLUGIN_DIR="src/plugins/stored"
+   DIR_PLUGIN_DIR="src/plugins/dird"
    have_plugins=yes
 else
    DEFAULT_OBJECT_TYPE=".o"
@@ -3793,9 +3793,9 @@ AC_OUTPUT([autoconf/Make.common \
 	   src/ndmp/Makefile \
 	   src/tests/Makefile \
 	   src/tools/Makefile \
-	   src/plugins/fd/Makefile \
-	   src/plugins/sd/Makefile \
-	   src/plugins/dir/Makefile \
+	   src/plugins/filed/Makefile \
+	   src/plugins/stored/Makefile \
+	   src/plugins/dird/Makefile \
 	   po/Makefile.in \
 	   src/defaultconfigs/diskonly/bareos-sd.conf \
 	   src/defaultconfigs/diskonly/bareos-dir.conf \

diff --git a/configure b/configure
@@ -16741,9 +16741,9 @@ if test x$use_libtool != xno; then
    LIBTOOL_INSTALL_TARGET="libtool-install"
    LIBTOOL_CLEAN_TARGET="libtool-clean"
    QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
-   FD_PLUGIN_DIR="src/plugins/fd"
-   SD_PLUGIN_DIR="src/plugins/sd"
-   DIR_PLUGIN_DIR="src/plugins/dir"
+   FD_PLUGIN_DIR="src/plugins/filed"
+   SD_PLUGIN_DIR="src/plugins/stored"
+   DIR_PLUGIN_DIR="src/plugins/dird"
    have_plugins=yes
 else
    DEFAULT_OBJECT_TYPE=".o"
@@ -31742,7 +31742,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile debian/bareos-common.preinst debian/bareos-filedaemon.preinst debian/bareos-director.preinst debian/bareos-storage.preinst scripts/bareos-config scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/findlib/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile debian/bareos-common.preinst debian/bareos-filedaemon.preinst debian/bareos-director.preinst debian/bareos-storage.preinst scripts/bareos-config scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/findlib/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile src/plugins/stored/Makefile src/plugins/dird/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -32906,9 +32906,9 @@ do
     "src/ndmp/Makefile") CONFIG_FILES="$CONFIG_FILES src/ndmp/Makefile" ;;
     "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
     "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
-    "src/plugins/fd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/fd/Makefile" ;;
-    "src/plugins/sd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sd/Makefile" ;;
-    "src/plugins/dir/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dir/Makefile" ;;
+    "src/plugins/filed/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/filed/Makefile" ;;
+    "src/plugins/stored/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/stored/Makefile" ;;
+    "src/plugins/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dird/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/defaultconfigs/diskonly/bareos-sd.conf") CONFIG_FILES="$CONFIG_FILES src/defaultconfigs/diskonly/bareos-sd.conf" ;;
     "src/defaultconfigs/diskonly/bareos-dir.conf") CONFIG_FILES="$CONFIG_FILES src/defaultconfigs/diskonly/bareos-dir.conf" ;;

diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -104,7 +104,8 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    qt-console/bat.exe console/bconsole.exe \
    filed/bareos-fd.exe lib/libbareos.dll \
    findlib/libbareosfind.dll \
-   plugins/fd/bpipe-fd.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+   plugins/filed/bpipe-fd.dll \
+   $RPM_BUILD_ROOT%{_mingw32_bindir}
 
 for cfg in  ../qt-tray-monitor/tray-monitor.conf.in \
    ../qt-console/bat.conf.in \

diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
@@ -104,7 +104,8 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    qt-console/bat.exe console/bconsole.exe \
    filed/bareos-fd.exe lib/libbareos.dll \
    findlib/libbareosfind.dll \
-   plugins/fd/bpipe-fd.dll $RPM_BUILD_ROOT%{_mingw64_bindir}
+   plugins/filed/bpipe-fd.dll \
+   $RPM_BUILD_ROOT%{_mingw64_bindir}
 
 for cfg in  ../qt-tray-monitor/tray-monitor.conf.in \
    ../qt-console/bat.conf.in \

diff --git a/src/plugins/Makefile b/src/plugins/Makefile
diff --git a/src/plugins/dir/Makefile.in → src/plugins/dird/Makefile.in b/src/plugins/dir/Makefile.in → src/plugins/dird/Makefile.in
@@ -13,7 +13,7 @@ basedir = ../..
 # top dir
 topdir = ../../..
 # this dir relative to top dir
-thisdir = src/plugins/dir
+thisdir = src/plugins/dird
 
 INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/dird
 

diff --git a/src/plugins/dir/example-plugin-dir.c → src/plugins/dird/example-plugin-dir.c b/src/plugins/dir/example-plugin-dir.c → src/plugins/dird/example-plugin-dir.c
diff --git a/src/plugins/dir/python-dir.c → src/plugins/dird/python-dir.c b/src/plugins/dir/python-dir.c → src/plugins/dird/python-dir.c
diff --git a/src/plugins/fd/Makefile.in → src/plugins/filed/Makefile.in b/src/plugins/fd/Makefile.in → src/plugins/filed/Makefile.in
@@ -13,7 +13,7 @@ basedir = ../..
 # top dir
 topdir = ../../..
 # this dir relative to top dir
-thisdir = src/plugins/fd
+thisdir = src/plugins/filed
 
 INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/filed
 

diff --git a/src/plugins/fd/bpipe-fd.c → src/plugins/filed/bpipe-fd.c b/src/plugins/fd/bpipe-fd.c → src/plugins/filed/bpipe-fd.c
diff --git a/src/plugins/fd/example-plugin-fd.c → src/plugins/filed/example-plugin-fd.c b/src/plugins/fd/example-plugin-fd.c → src/plugins/filed/example-plugin-fd.c
diff --git a/src/plugins/fd/fd_common.h → src/plugins/filed/fd_common.h b/src/plugins/fd/fd_common.h → src/plugins/filed/fd_common.h
diff --git a/src/plugins/fd/python-fd.c → src/plugins/filed/python-fd.c b/src/plugins/fd/python-fd.c → src/plugins/filed/python-fd.c
diff --git a/src/plugins/fd/test-deltaseq-fd.c → src/plugins/filed/test-deltaseq-fd.c b/src/plugins/fd/test-deltaseq-fd.c → src/plugins/filed/test-deltaseq-fd.c
diff --git a/src/plugins/fd/test-plugin-fd.c → src/plugins/filed/test-plugin-fd.c b/src/plugins/fd/test-plugin-fd.c → src/plugins/filed/test-plugin-fd.c
diff --git a/src/plugins/sd/Makefile.in → src/plugins/stored/Makefile.in b/src/plugins/sd/Makefile.in → src/plugins/stored/Makefile.in
@@ -15,7 +15,7 @@ basedir = ../..
 # top dir
 topdir = ../../..
 # this dir relative to top dir
-thisdir = src/plugins/sd
+thisdir = src/plugins/stored
 
 INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/stored
 

diff --git a/src/plugins/sd/example-plugin-sd.c → src/plugins/stored/example-plugin-sd.c b/src/plugins/sd/example-plugin-sd.c → src/plugins/stored/example-plugin-sd.c
diff --git a/src/plugins/sd/python-sd.c → src/plugins/stored/python-sd.c b/src/plugins/sd/python-sd.c → src/plugins/stored/python-sd.c
diff --git a/src/plugins/sd/scsicrypto-sd.c → src/plugins/stored/scsicrypto-sd.c b/src/plugins/sd/scsicrypto-sd.c → src/plugins/stored/scsicrypto-sd.c
diff --git a/src/win32/plugins/Makefile b/src/win32/plugins/Makefile
@@ -1,4 +1,4 @@
-all_subdirs = fd
+all_subdirs = filed
 
 all:
 	@for I in ${all_subdirs}; \

diff --git a/src/win32/plugins/fd/Makefile → src/win32/plugins/filed/Makefile b/src/win32/plugins/fd/Makefile → src/win32/plugins/filed/Makefile