CC-1309 Rationalize the Network Hub storage and Local Storage: put all the archiveServer functionality into the local storage. Removed install of separate archiveServer directories and database tables. Checked in some other minor tweaks.
This commit is contained in:
parent
aa9528b9fd
commit
956056747c
48 changed files with 643 additions and 3733 deletions
|
@ -115,7 +115,6 @@ EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler
|
|||
SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient
|
||||
WIDGETS_DIR = ${MODULES_DIR}/widgets
|
||||
ALIB_DIR = ${MODULES_DIR}/alib
|
||||
ARCHIVE_SERVER_DIR = ${MODULES_DIR}/archiveServer
|
||||
GETID3_DIR = ${MODULES_DIR}/getid3
|
||||
HTML_UI_DIR = ${MODULES_DIR}/htmlUI
|
||||
STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin
|
||||
|
@ -222,15 +221,6 @@ modules_setup: ${TMP_DIR}/modules_setup.stamp
|
|||
${TMP_DIR}/modules_setup.stamp:
|
||||
cd ${ALIB_DIR} && ./configure --prefix=${prefix} \
|
||||
PACKAGE_VERSION=${PACKAGE_VERSION}
|
||||
cd ${ARCHIVE_SERVER_DIR} && \
|
||||
./configure --prefix=${prefix} \
|
||||
--with-hostname=${HOSTNAME} \
|
||||
--with-www-port=${WWW_PORT} \
|
||||
--with-database-server=${DB_SERVER} \
|
||||
--with-database=${DATABASE} \
|
||||
--with-database-user=${DB_USER} \
|
||||
--with-database-password=${DB_PASSWORD} \
|
||||
PACKAGE_VERSION=${PACKAGE_VERSION}
|
||||
cd ${GETID3_DIR} && ./configure --prefix=${prefix} \
|
||||
PACKAGE_VERSION=${PACKAGE_VERSION}
|
||||
cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \
|
||||
|
@ -341,7 +331,6 @@ depclean:
|
|||
${MAKE} -C ${WIDGETS_DIR} depclean
|
||||
${MAKE} -C ${SCHEDULER_DIR} depclean
|
||||
${MAKE} -C ${GLIVESUPPORT_DIR} depclean
|
||||
-${MAKE} -C ${ARCHIVE_SERVER_DIR} depclean
|
||||
-${MAKE} -C ${STORAGE_SERVER_DIR} depclean
|
||||
|
||||
compile: ${TMP_DIR}/compile.stamp
|
||||
|
@ -369,7 +358,6 @@ check:
|
|||
# -${MAKE} -C ${WIDGETS_DIR} check # no tests defined
|
||||
# -${MAKE} -C ${SCHEDULER_DIR} check # has database issues
|
||||
# -${MAKE} -C ${GLIVESUPPORT_DIR} check # has database issues
|
||||
# -${MAKE} -C ${ARCHIVE_SERVER_DIR} check # no tests defined
|
||||
# -${MAKE} -C ${STORAGE_SERVER_DIR} check # has database issues
|
||||
|
||||
|
||||
|
@ -417,7 +405,6 @@ setup_install_dirs:
|
|||
|
||||
install_modules:
|
||||
${MAKE} -C ${ALIB_DIR} install
|
||||
${MAKE} -C ${ARCHIVE_SERVER_DIR} install
|
||||
${MAKE} -C ${GETID3_DIR} install
|
||||
${MAKE} -C ${HTML_UI_DIR} install
|
||||
${MAKE} -C ${STORAGE_ADMIN_DIR} install
|
||||
|
|
|
@ -282,10 +282,6 @@ dnl set up the alib module
|
|||
AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure],
|
||||
[../src/modules/alib/bin/autogen.sh])
|
||||
|
||||
dnl set up the archive server module
|
||||
AC_CONFIG_COMMANDS([../src/modules/archiveServer/tmp/configure],
|
||||
[../src/modules/archiveServer/bin/autogen.sh])
|
||||
|
||||
dnl set up the getid3 module
|
||||
AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure],
|
||||
[../src/modules/getid3/bin/autogen.sh])
|
||||
|
|
|
@ -433,7 +433,6 @@ INPUT = src/modules/core/include src/modules/core/src \
|
|||
# src/modules/alib/var \
|
||||
# src/modules/alib/var/xmlrpc \
|
||||
# src/modules/getid3/var \
|
||||
# src/modules/archiveServer/var \
|
||||
# src/modules/storageServer/var \
|
||||
# src/modules/storageServer/var/xmlrpc \
|
||||
# src/modules/storageAdmin/var
|
||||
|
|
|
@ -415,7 +415,6 @@ WARN_LOGFILE =
|
|||
# with spaces.
|
||||
|
||||
INPUT = src/products/scheduler/src \
|
||||
src/modules/archiveServer/var/xmlrpc/XR_Archive.php \
|
||||
src/modules/storageServer/var/xmlrpc/XR_LocStor.php
|
||||
|
||||
# If the value of the INPUT tag contains directories, you can use the
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue