CC-1024 Update installation/build for webapp-only

Removed compilation of C++ stuff.
Should now only install web app stuff.
Moved Alib.php and Subjects.php to the storageServer dir.
Removed the playlog DB table, the schedule table IS the playlog now.

Also removed archiveServer stuff from Debian files.
This commit is contained in:
paul.baranowski 2010-09-28 13:25:03 -04:00
parent c5d1faf0f9
commit f0c313f1dd
15 changed files with 336 additions and 360 deletions

View File

@ -113,9 +113,6 @@ ALTER TABLE cc_files
ADD COLUMN language character varying(512);
ALTER TABLE cc_schedule RENAME playlist TO playlist_id;
ALTER TABLE cc_schedule ALTER playlist_id TYPE integer;
ALTER TABLE cc_schedule ADD COLUMN group_id integer;

View File

@ -251,49 +251,49 @@ cat $modules_dir/storageServer/var/conf_only.php.template \
| sed -e "$replace_sed_string" \
> $configdir/storageServer.conf.php
cat $modules_dir/authentication/etc/webAuthentication.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/webAuthentication.xml
cat $modules_dir/db/etc/connectionManagerFactory.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/connectionManagerFactory.xml
cat $modules_dir/db/etc/simpleConnectionManager.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/simpleConnectionManager.xml
cat $modules_dir/schedulerClient/etc/schedulerClientFactory.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/schedulerClientFactory.xml
cat $modules_dir/schedulerClient/etc/schedulerDaemonXmlRpcClient.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/schedulerDaemonXmlRpcClient.xml
cat $modules_dir/storageClient/etc/webAuthenticationClient.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/webAuthenticationClient.xml
cat $modules_dir/storageClient/etc/webStorage.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/webStorage.xml
cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \
| sed -e "$replace_sed_string" \
> $configdir/campcaster-scheduler.xml
cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
| sed -e "$replace_sed_string" \
> $configdir/campcaster-studio.xml
cat $products_dir/gLiveSupport/etc/authenticationClient.xml.user-template \
| sed -e "$replace_sed_string" \
> $configdir/authenticationClient.xml
cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \
| sed -e "$replace_sed_string" \
> $configdir/storageClient.xml
#cat $modules_dir/authentication/etc/webAuthentication.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/webAuthentication.xml
#
#cat $modules_dir/db/etc/connectionManagerFactory.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/connectionManagerFactory.xml
#
#cat $modules_dir/db/etc/simpleConnectionManager.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/simpleConnectionManager.xml
#
#cat $modules_dir/schedulerClient/etc/schedulerClientFactory.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/schedulerClientFactory.xml
#
#cat $modules_dir/schedulerClient/etc/schedulerDaemonXmlRpcClient.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/schedulerDaemonXmlRpcClient.xml
#
#cat $modules_dir/storageClient/etc/webAuthenticationClient.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/webAuthenticationClient.xml
#
#cat $modules_dir/storageClient/etc/webStorage.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/webStorage.xml
#
#cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \
# | sed -e "$replace_sed_string" \
# > $configdir/campcaster-scheduler.xml
#
#cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
# | sed -e "$replace_sed_string" \
# > $configdir/campcaster-studio.xml
#
#cat $products_dir/gLiveSupport/etc/authenticationClient.xml.user-template \
# | sed -e "$replace_sed_string" \
# > $configdir/authenticationClient.xml
#
#cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \
# | sed -e "$replace_sed_string" \
# > $configdir/storageClient.xml
#-------------------------------------------------------------------------------
@ -302,9 +302,7 @@ cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \
echo "Creating public HTML directory and links to web interfaces..."
mkdir -p $htmldir
rm -f $htmldir/campcaster
ln -s $modules_dir $htmldir/campcaster

View File

@ -1,12 +1,9 @@
# Upstream uses realtive paths to data folders, so we use
# syminks to /var/campcaster/.. where persistant data is stored
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/stor/buffer/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/trans/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/htmlUI/var/templates_c/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/access/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/stor/buffer/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/trans/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/access/
# Upstream uses a patched/customized version of Smarty - but is
# working on getting solving issue to move to a maintained one.
campcaster-data: embedded-php-library usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php

View File

@ -28,8 +28,6 @@ case "$1" in
# remove generated files
rm -rf $vardir/htmlUI/var/html/img/*
rm -rf $vardir/htmlUI/var/templates_c/*
rm -rf $vardir/archiveServer/var/access/*
rm -rf $vardir/archiveServer/var/trans/*
rm -rf $vardir/storageServer/var/access/*
rm -rf $vardir/storageServer/var/trans/*

5
debian/rules vendored
View File

@ -76,13 +76,10 @@ override_dh_install:
debian/tmp/etc/apache/90_php_campcaster.conf \
debian/campcaster-station/usr/share/campcaster/etc/
# CONFIG files
mkdir -p debian/campcaster-station/etc/campcaster/archiveServer
mkdir -p debian/campcaster-station/etc/campcaster/storageServer
mkdir -p debian/campcaster-station/etc/campcaster/storageAdmin
mkdir -p debian/campcaster-station/etc/campcaster/htmlUI
#
mv -f debian/tmp/var/Campcaster/archiveServer/var/conf.php \
debian/campcaster-station/etc/campcaster/archiveServer/conf.php
mv -f debian/tmp/var/Campcaster/storageServer/var/conf.php \
debian/campcaster-station/etc/campcaster/storageServer/conf.php
mv -f debian/tmp/var/Campcaster/storageServer/var/campcaster_version.php \
@ -93,7 +90,6 @@ override_dh_install:
debian/campcaster-station/etc/campcaster/htmlUI/ui_conf.php
#
mv -f debian/tmp/var/Campcaster/alib \
debian/tmp/var/Campcaster/archiveServer \
debian/tmp/var/Campcaster/getid3 \
debian/tmp/var/Campcaster/htmlUI \
debian/tmp/var/Campcaster/index.php \
@ -102,7 +98,6 @@ override_dh_install:
debian/tmp/var/Campcaster/storageAdmin \
debian/campcaster-station/usr/share/campcaster/www
# symlink CONFIG files
ln -s /etc/campcaster/archiveServer/conf.php debian/campcaster-station/usr/share/campcaster/www/archiveServer/var/conf.php
ln -s /etc/campcaster/storageServer/conf.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/conf.php
ln -s /etc/campcaster/storageServer/campcaster_version.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/
ln -s /etc/campcaster/storageAdmin/conf.php debian/campcaster-station/usr/share/campcaster/www/storageAdmin/var/conf.php

View File

@ -75,66 +75,66 @@ STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@"
STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@"
export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH:=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
#export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH}
#export PKG_CONFIG_PATH:=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
DEBUG = @DEBUG@
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config
XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++
EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \
${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod.html \
${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod-members.html
TAGFILE = ${DOXYGEN_DIR}/xmlrpc++.tag
TESTRESULTS_XSLT = ${ETC_DIR}/testResultsToHtml.xsl
TESTRESULTS_IN = ${ETC_DIR}/testResults.xml
TESTRESULTS_FILE = ${DOC_DIR}/testResults.html
FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html
#DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
#XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config
#
#XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++
#EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \
# ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod.html \
# ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod-members.html
#TAGFILE = ${DOXYGEN_DIR}/xmlrpc++.tag
#
#TESTRESULTS_XSLT = ${ETC_DIR}/testResultsToHtml.xsl
#TESTRESULTS_IN = ${ETC_DIR}/testResults.xml
#TESTRESULTS_FILE = ${DOC_DIR}/testResults.html
#
#FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html
#
TOOLS_DIR = ${SRC_DIR}/tools
LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
LIBODBCXX_VERSION = libodbc++-0.2.5
XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
XMLRPCXX_VERSION = xmlrpc++-20040713
TAGLIB_DIR = ${TOOLS_DIR}/taglib
TAGLIB_VERSION = taglib-1.5
#LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
#LIBODBCXX_VERSION = libodbc++-0.2.5
#XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
#XMLRPCXX_VERSION = xmlrpc++-20040713
#TAGLIB_DIR = ${TOOLS_DIR}/taglib
#TAGLIB_VERSION = taglib-1.5
PEAR_DIR = ${TOOLS_DIR}/pear
MODULES_DIR = ${SRC_DIR}/modules
CORE_DIR = ${MODULES_DIR}/core
AUTHENTICATION_DIR = ${MODULES_DIR}/authentication
DB_DIR = ${MODULES_DIR}/db
STORAGE_CLIENT_DIR = ${MODULES_DIR}/storageClient
PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor
EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler
SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient
WIDGETS_DIR = ${MODULES_DIR}/widgets
ALIB_DIR = ${MODULES_DIR}/alib
#CORE_DIR = ${MODULES_DIR}/core
#AUTHENTICATION_DIR = ${MODULES_DIR}/authentication
#DB_DIR = ${MODULES_DIR}/db
#STORAGE_CLIENT_DIR = ${MODULES_DIR}/storageClient
#PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor
#EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler
#SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient
#WIDGETS_DIR = ${MODULES_DIR}/widgets
#ALIB_DIR = ${MODULES_DIR}/alib
GETID3_DIR = ${MODULES_DIR}/getid3
HTML_UI_DIR = ${MODULES_DIR}/htmlUI
STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin
STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
PRODUCTS_DIR = ${SRC_DIR}/products
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
#PRODUCTS_DIR = ${SRC_DIR}/products
#SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
#GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
#SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
#GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
#-------------------------------------------------------------------------------
# Targets
#-------------------------------------------------------------------------------
.PHONY: all doc clean docclean depclean distclean doxygen testresults
.PHONY: setup tools_setup doxytag_setup modules_setup products_setup
.PHONY: start stop status run
.PHONY: all clean depclean distclean
.PHONY: setup tools_setup modules_setup
.PHONY: start stop status
all: setup compile
all: setup
help:
${ECHO} "Campcaster project main Makefile"
@ -144,83 +144,83 @@ help:
${ECHO} "Useful targets for this makefile:"
${ECHO} " all - set up and compile everthing"
${ECHO} " install - install everything"
${ECHO} " doc - build autogenerated documentation"
# ${ECHO} " doc - build autogenerated documentation"
${ECHO} " clean - clean all modules"
${ECHO} " check - check all modules"
${ECHO} ""
${ECHO} "Some less frequently used targets:"
${ECHO} " setup - set up the development environment"
${ECHO} " doxygen - build autogenerated doxygen documentation only"
${ECHO} " compile - compile all modules"
${ECHO} " recompile - recompile all modules"
# ${ECHO} " doxygen - build autogenerated doxygen documentation only"
# ${ECHO} " compile - compile all modules"
# ${ECHO} " recompile - recompile all modules"
doc: doxygen testresults flawfinder
doxygen:
${DOXYGEN} ${DOXYGEN_CONFIG}
${DOXYGEN} ${XMLRPC-DOXYGEN_CONFIG}
testresults:
${XSLTPROC} ${TESTRESULT_XSLT} ${TESTRESULTS_IN} > ${TESTRESULTS_FILE}
flawfinder:
${FLAWFINDER} -c --immediate --html \
${CORE_DIR}/include ${CORE_DIR}/src \
${AUTHENTICATION_DIR}/include ${AUTHENTICATION_DIR}/src \
${DB_DIR}/include ${DB_DIR}/src \
${STORAGE_CLIENT_DIR}/include ${STORAGE_CLIENT_DIR}/src \
${PLAYLIST_EXECUTOR_DIR}/include \
${PLAYLIST_EXECUTOR_DIR}/src \
${EVENT_SCHEDULER_DIR}/include ${EVENT_SCHEDULER_DIR}/src \
${SCHEDULER_CLIENT_DIR}/include ${SCHEDULER_CLIENT_DIR}/src \
${WIDGETS_DIR}/include ${WIDGETS_DIR}/src \
${SCHEDULER_DIR}/src > ${FLAWFINDER_FILE} \
${GLIVESUPPORT_DIR}/src > ${FLAWFINDER_FILE} \
#doc: doxygen testresults flawfinder
#
#doxygen:
# ${DOXYGEN} ${DOXYGEN_CONFIG}
# ${DOXYGEN} ${XMLRPC-DOXYGEN_CONFIG}
#
#testresults:
# ${XSLTPROC} ${TESTRESULT_XSLT} ${TESTRESULTS_IN} > ${TESTRESULTS_FILE}
#
#flawfinder:
# ${FLAWFINDER} -c --immediate --html \
# ${CORE_DIR}/include ${CORE_DIR}/src \
# ${AUTHENTICATION_DIR}/include ${AUTHENTICATION_DIR}/src \
# ${DB_DIR}/include ${DB_DIR}/src \
# ${STORAGE_CLIENT_DIR}/include ${STORAGE_CLIENT_DIR}/src \
# ${PLAYLIST_EXECUTOR_DIR}/include \
# ${PLAYLIST_EXECUTOR_DIR}/src \
# ${EVENT_SCHEDULER_DIR}/include ${EVENT_SCHEDULER_DIR}/src \
# ${SCHEDULER_CLIENT_DIR}/include ${SCHEDULER_CLIENT_DIR}/src \
# ${WIDGETS_DIR}/include ${WIDGETS_DIR}/src \
# ${SCHEDULER_DIR}/src > ${FLAWFINDER_FILE} \
# ${GLIVESUPPORT_DIR}/src > ${FLAWFINDER_FILE} \
clean:
${RMDIR} ${DOXYGEN_DIR}/html
${RMDIR} ${COVERAGE_DIR}/*
${RM} ${TMP_DIR}/*.stamp
${RM} ${TMP_DIR}/ac* ${TMP_DIR}/config* ${TMP_DIR}/install-sh
${RMDIR} ${TMP_DIR}/auto*
# ${RMDIR} ${DOXYGEN_DIR}/html
# ${RMDIR} ${COVERAGE_DIR}/*
# ${RM} ${TMP_DIR}/*.stamp
# ${RM} ${TMP_DIR}/ac* ${TMP_DIR}/config* ${TMP_DIR}/install-sh
# ${RMDIR} ${TMP_DIR}/auto*
#
setup: ${TMP_DIR}/setup.stamp
${TMP_DIR}/setup.stamp: tools_setup doxytag_setup modules_setup products_setup
${TMP_DIR}/setup.stamp: tools_setup modules_setup
touch ${TMP_DIR}/setup.stamp
recompile: modprod_distclean modules_setup products_setup compile
recompile: modprod_distclean modules_setup products_setup
tools_setup: ${TMP_DIR}/tools_setup.stamp
${TMP_DIR}/tools_setup.stamp:
cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install
cd ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} install
cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install
# cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && ./configure --prefix=${prefix}
# ${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install
#
# cd ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} && ./configure --prefix=${prefix}
# ${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} install
#
# cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix}
# ${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install
#
cd ${PEAR_DIR} && ./configure --prefix=${prefix}
${MAKE} -C ${PEAR_DIR} install
touch ${TMP_DIR}/tools_setup.stamp
tools_distclean:
-${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean
-${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean
-${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean
# -${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean
# -${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean
# -${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean
${RM} ${TMP_DIR}/tools_setup.stamp
doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp
${TMP_DIR}/doxytag_setup.stamp:
${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES}
touch ${TMP_DIR}/doxytag_setup.stamp
#doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp
#${TMP_DIR}/doxytag_setup.stamp:
# ${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES}
# touch ${TMP_DIR}/doxytag_setup.stamp
modules_setup: ${TMP_DIR}/modules_setup.stamp
${TMP_DIR}/modules_setup.stamp:
cd ${ALIB_DIR} && ./configure --prefix=${prefix} \
PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${ALIB_DIR} && ./configure --prefix=${prefix} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${GETID3_DIR} && ./configure --prefix=${prefix} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \
@ -246,115 +246,115 @@ ${TMP_DIR}/modules_setup.stamp:
--with-database-password=${DB_PASSWORD} \
--with-init-database=${INIT_LS_DATABASE} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${CORE_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${AUTHENTICATION_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${DB_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${STORAGE_CLIENT_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${PLAYLIST_EXECUTOR_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${EVENT_SCHEDULER_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${SCHEDULER_CLIENT_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${WIDGETS_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${CORE_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${AUTHENTICATION_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${DB_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${STORAGE_CLIENT_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${PLAYLIST_EXECUTOR_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${EVENT_SCHEDULER_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${SCHEDULER_CLIENT_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${WIDGETS_DIR} && \
# ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
touch ${TMP_DIR}/modules_setup.stamp
products_setup: ${TMP_DIR}/products_setup.stamp
${TMP_DIR}/products_setup.stamp:
cd ${SCHEDULER_DIR} && \
./configure --prefix=${prefix} \
--enable-debug=${DEBUG} \
--with-hostname=${HOSTNAME} \
--with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \
--with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \
--with-audio-out=${STATION_AUDIO_OUT} \
--with-create-odbc-data-source=${CREATE_ODBC_DATA_SOURCE} \
--with-init-database=${INIT_LS_DATABASE} \
PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${GLIVESUPPORT_DIR} && \
./configure --prefix=${prefix} \
--enable-debug=${DEBUG} \
--with-hostname=${HOSTNAME} \
--with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \
--with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \
--with-audio-out=${STUDIO_AUDIO_OUT} \
--with-audio-cue=${STUDIO_AUDIO_CUE} \
PACKAGE_VERSION=${PACKAGE_VERSION}
touch ${TMP_DIR}/products_setup.stamp
#products_setup: ${TMP_DIR}/products_setup.stamp
#${TMP_DIR}/products_setup.stamp:
# cd ${SCHEDULER_DIR} && \
# ./configure --prefix=${prefix} \
# --enable-debug=${DEBUG} \
# --with-hostname=${HOSTNAME} \
# --with-www-port=${WWW_PORT} \
# --with-scheduler-port=${SCHEDULER_PORT} \
# --with-database-server=${DB_SERVER} \
# --with-database=${DATABASE} \
# --with-database-user=${DB_USER} \
# --with-database-password=${DB_PASSWORD} \
# --with-audio-out=${STATION_AUDIO_OUT} \
# --with-create-odbc-data-source=${CREATE_ODBC_DATA_SOURCE} \
# --with-init-database=${INIT_LS_DATABASE} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# cd ${GLIVESUPPORT_DIR} && \
# ./configure --prefix=${prefix} \
# --enable-debug=${DEBUG} \
# --with-hostname=${HOSTNAME} \
# --with-www-port=${WWW_PORT} \
# --with-scheduler-port=${SCHEDULER_PORT} \
# --with-database-server=${DB_SERVER} \
# --with-database=${DATABASE} \
# --with-database-user=${DB_USER} \
# --with-database-password=${DB_PASSWORD} \
# --with-audio-out=${STUDIO_AUDIO_OUT} \
# --with-audio-cue=${STUDIO_AUDIO_CUE} \
# PACKAGE_VERSION=${PACKAGE_VERSION}
# touch ${TMP_DIR}/products_setup.stamp
distclean: clean tools_distclean modprod_distclean
modprod_distclean:
${MAKE} -C ${CORE_DIR} distclean
${MAKE} -C ${AUTHENTICATION_DIR} distclean
${MAKE} -C ${DB_DIR} distclean
${MAKE} -C ${STORAGE_CLIENT_DIR} distclean
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} distclean
${MAKE} -C ${EVENT_SCHEDULER_DIR} distclean
${MAKE} -C ${SCHEDULER_CLIENT_DIR} distclean
${MAKE} -C ${WIDGETS_DIR} distclean
${MAKE} -C ${SCHEDULER_DIR} distclean
${MAKE} -C ${GLIVESUPPORT_DIR} distclean
${RM} ${TMP_DIR}/compile.stamp
# ${MAKE} -C ${CORE_DIR} distclean
# ${MAKE} -C ${AUTHENTICATION_DIR} distclean
# ${MAKE} -C ${DB_DIR} distclean
# ${MAKE} -C ${STORAGE_CLIENT_DIR} distclean
# ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} distclean
# ${MAKE} -C ${EVENT_SCHEDULER_DIR} distclean
# ${MAKE} -C ${SCHEDULER_CLIENT_DIR} distclean
# ${MAKE} -C ${WIDGETS_DIR} distclean
# ${MAKE} -C ${SCHEDULER_DIR} distclean
# ${MAKE} -C ${GLIVESUPPORT_DIR} distclean
# ${RM} ${TMP_DIR}/compile.stamp
${RM} ${TMP_DIR}/modules_setup.stamp
${RM} ${TMP_DIR}/products_setup.stamp
# ${RM} ${TMP_DIR}/products_setup.stamp
depclean:
${MAKE} -C ${CORE_DIR} depclean
${MAKE} -C ${AUTHENTICATION_DIR} depclean
${MAKE} -C ${DB_DIR} depclean
${MAKE} -C ${STORAGE_CLIENT_DIR} depclean
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} depclean
${MAKE} -C ${EVENT_SCHEDULER_DIR} depclean
${MAKE} -C ${SCHEDULER_CLIENT_DIR} depclean
${MAKE} -C ${WIDGETS_DIR} depclean
${MAKE} -C ${SCHEDULER_DIR} depclean
${MAKE} -C ${GLIVESUPPORT_DIR} depclean
# ${MAKE} -C ${CORE_DIR} depclean
# ${MAKE} -C ${AUTHENTICATION_DIR} depclean
# ${MAKE} -C ${DB_DIR} depclean
# ${MAKE} -C ${STORAGE_CLIENT_DIR} depclean
# ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} depclean
# ${MAKE} -C ${EVENT_SCHEDULER_DIR} depclean
# ${MAKE} -C ${SCHEDULER_CLIENT_DIR} depclean
# ${MAKE} -C ${WIDGETS_DIR} depclean
# ${MAKE} -C ${SCHEDULER_DIR} depclean
# ${MAKE} -C ${GLIVESUPPORT_DIR} depclean
-${MAKE} -C ${STORAGE_SERVER_DIR} depclean
compile: ${TMP_DIR}/compile.stamp
${TMP_DIR}/compile.stamp:
${MAKE} -C ${CORE_DIR} all
${MAKE} -C ${AUTHENTICATION_DIR} all
${MAKE} -C ${DB_DIR} all
${MAKE} -C ${STORAGE_CLIENT_DIR} all
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} all
${MAKE} -C ${EVENT_SCHEDULER_DIR} all
${MAKE} -C ${SCHEDULER_CLIENT_DIR} all
${MAKE} -C ${WIDGETS_DIR} all
${MAKE} -C ${SCHEDULER_DIR} all
${MAKE} -C ${GLIVESUPPORT_DIR} all
touch ${TMP_DIR}/compile.stamp
#compile: ${TMP_DIR}/compile.stamp
#${TMP_DIR}/compile.stamp:
# ${MAKE} -C ${CORE_DIR} all
# ${MAKE} -C ${AUTHENTICATION_DIR} all
# ${MAKE} -C ${DB_DIR} all
# ${MAKE} -C ${STORAGE_CLIENT_DIR} all
# ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} all
# ${MAKE} -C ${EVENT_SCHEDULER_DIR} all
# ${MAKE} -C ${SCHEDULER_CLIENT_DIR} all
# ${MAKE} -C ${WIDGETS_DIR} all
# ${MAKE} -C ${SCHEDULER_DIR} all
# ${MAKE} -C ${GLIVESUPPORT_DIR} all
# touch ${TMP_DIR}/compile.stamp
check:
-${MAKE} -C ${CORE_DIR} check
-${MAKE} -C ${AUTHENTICATION_DIR} check
-${MAKE} -C ${DB_DIR} check
-${MAKE} -C ${STORAGE_CLIENT_DIR} check
#check:
# -${MAKE} -C ${CORE_DIR} check
# -${MAKE} -C ${AUTHENTICATION_DIR} check
# -${MAKE} -C ${DB_DIR} check
# -${MAKE} -C ${STORAGE_CLIENT_DIR} check
# -${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check # hangs on edge.campware.org
-${MAKE} -C ${EVENT_SCHEDULER_DIR} check
-${MAKE} -C ${SCHEDULER_CLIENT_DIR} check
# -${MAKE} -C ${EVENT_SCHEDULER_DIR} check
# -${MAKE} -C ${SCHEDULER_CLIENT_DIR} 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
@ -370,22 +370,22 @@ stop: ${SCHEDULER_EXE}
status: ${SCHEDULER_EXE}
${MAKE} -C ${SCHEDULER_DIR} status
run: ${GLIVESUPPORT_EXE}
${MAKE} -C ${GLIVESUPPORT_DIR} run
#run: ${GLIVESUPPORT_EXE}
# ${MAKE} -C ${GLIVESUPPORT_DIR} run
#-------------------------------------------------------------------------------
# Installation related targets
#-------------------------------------------------------------------------------
.PHONY: install create_database setup_install_dirs
.PHONY: install_modules install_products
.PHONY: install_modules
install: setup compile setup_install_dirs create_database install_modules install_products
install: setup setup_install_dirs create_database install_modules
${MKDIR} ${USR_ETC_DIR}/apache
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
${MKDIR} ${USR_BIN_DIR}
${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR}
# ${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR}
${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
create_database:
@ -398,28 +398,28 @@ endif
setup_install_dirs:
${MKDIR} ${USR_BIN_DIR}
${MKDIR} ${USR_DOC_DIR}
# ${MKDIR} ${USR_DOC_DIR}
${MKDIR} ${USR_ETC_DIR}
${MKDIR} ${USR_LIB_DIR}
${MKDIR} ${USR_VAR_DIR}
install_modules:
${MAKE} -C ${ALIB_DIR} install
# ${MAKE} -C ${ALIB_DIR} install
${MAKE} -C ${GETID3_DIR} install
${MAKE} -C ${HTML_UI_DIR} install
${MAKE} -C ${STORAGE_ADMIN_DIR} install
${MAKE} -C ${STORAGE_SERVER_DIR} install
${MAKE} -C ${CORE_DIR} install
${MAKE} -C ${AUTHENTICATION_DIR} install
${MAKE} -C ${DB_DIR} install
${MAKE} -C ${STORAGE_CLIENT_DIR} install
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
${MAKE} -C ${EVENT_SCHEDULER_DIR} install
${MAKE} -C ${SCHEDULER_CLIENT_DIR} install
${MAKE} -C ${WIDGETS_DIR} install
# ${MAKE} -C ${CORE_DIR} install
# ${MAKE} -C ${AUTHENTICATION_DIR} install
# ${MAKE} -C ${DB_DIR} install
# ${MAKE} -C ${STORAGE_CLIENT_DIR} install
# ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
# ${MAKE} -C ${EVENT_SCHEDULER_DIR} install
# ${MAKE} -C ${SCHEDULER_CLIENT_DIR} install
# ${MAKE} -C ${WIDGETS_DIR} install
install_products:
${MAKE} -C ${SCHEDULER_DIR} install
${MAKE} -C ${GLIVESUPPORT_DIR} install
#install_products:
# ${MAKE} -C ${SCHEDULER_DIR} install
# ${MAKE} -C ${GLIVESUPPORT_DIR} install

View File

@ -32,23 +32,23 @@ AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2010 Sourcefabric O.P.S. under the GNU GPL])
AC_REVISION($Revision$)
AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx)
dnl AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx)
AC_PROG_CC()
AC_PROG_CXX()
dnl AC_PROG_CC()
dnl AC_PROG_CXX()
dnl-----------------------------------------------------------------------------
dnl specify whether debug info should be compiled into the executable
dnl-----------------------------------------------------------------------------
AC_SUBST(DEBUG)
dnl AC_SUBST(DEBUG)
AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug], [compile with debug info (no)]),
[DEBUG=${enable_debug}],
[DEBUG=no])
dnl AC_ARG_ENABLE([debug],
dnl AC_HELP_STRING([--enable-debug], [compile with debug info (no)]),
dnl [DEBUG=${enable_debug}],
dnl [DEBUG=no])
AC_MSG_RESULT([compiling with debug info: ${DEBUG}])
dnl AC_MSG_RESULT([compiling with debug info: ${DEBUG}])
dnl-----------------------------------------------------------------------------
@ -245,29 +245,29 @@ AC_MSG_RESULT([using audio output device for the station: ${STATION_AUDIO_OUT}])
dnl-----------------------------------------------------------------------------
dnl specify the audio output device for the studio
dnl-----------------------------------------------------------------------------
AC_SUBST(STUDIO_AUDIO_OUT)
dnl AC_SUBST(STUDIO_AUDIO_OUT)
AC_ARG_WITH([studio-audio-out],
AC_HELP_STRING([--with-studio-audio-out],
[use the specified audio output device for the studio,
either ALSA or OSS (default)]),
[STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=default])
dnl AC_ARG_WITH([studio-audio-out],
dnl AC_HELP_STRING([--with-studio-audio-out],
dnl [use the specified audio output device for the studio,
dnl either ALSA or OSS (default)]),
dnl [STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}])
dnl AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}])
dnl-----------------------------------------------------------------------------
dnl specify the audio output device for the studio for cueing
dnl-----------------------------------------------------------------------------
AC_SUBST(STUDIO_AUDIO_CUE)
dnl AC_SUBST(STUDIO_AUDIO_CUE)
AC_ARG_WITH([studio-audio-cue],
AC_HELP_STRING([--with-studio-audio-cue],
[use the specified audio cue device for the studio,
either ALSA or OSS (default)]),
[STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=default])
dnl AC_ARG_WITH([studio-audio-cue],
dnl AC_HELP_STRING([--with-studio-audio-cue],
dnl [use the specified audio cue device for the studio,
dnl either ALSA or OSS (default)]),
dnl [STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=default])
AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}])
dnl AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}])
dnl-----------------------------------------------------------------------------
@ -279,8 +279,8 @@ dnl fancy variables to avoid duplication of hard-coded values :(
dnl-----------------------------------------------------------------------------
dnl set up the alib module
AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure],
[../src/modules/alib/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure],
dnl [../src/modules/alib/bin/autogen.sh])
dnl set up the getid3 module
AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure],
@ -299,57 +299,51 @@ AC_CONFIG_COMMANDS([../src/modules/storageServer/tmp/configure],
[../src/modules/storageServer/bin/autogen.sh])
dnl set up the core module
AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure],
[../src/modules/core/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure],
dnl [../src/modules/core/bin/autogen.sh])
dnl set up the authentication module
AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure],
[../src/modules/authentication/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure],
dnl [../src/modules/authentication/bin/autogen.sh])
dnl set up the db module
AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure],
[../src/modules/db/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure],
dnl [../src/modules/db/bin/autogen.sh])
dnl set up the storage client module
AC_CONFIG_COMMANDS([../src/modules/storageClient/tmp/configure],
[../src/modules/storageClient/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/storageClient/tmp/configure],
dnl [../src/modules/storageClient/bin/autogen.sh])
dnl set up the playlist executor module
AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure],
[../src/modules/playlistExecutor/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure],
dnl [../src/modules/playlistExecutor/bin/autogen.sh])
dnl set up the event scheduler module
AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure],
[../src/modules/eventScheduler/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure],
dnl [../src/modules/eventScheduler/bin/autogen.sh])
dnl set up the scheduler client module
AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure],
[../src/modules/schedulerClient/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure],
dnl [../src/modules/schedulerClient/bin/autogen.sh])
dnl set up the widgets module
AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure],
[../src/modules/widgets/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure],
dnl [../src/modules/widgets/bin/autogen.sh])
dnl set up the scheduler product
AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure],
[../src/products/scheduler/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure],
dnl [../src/products/scheduler/bin/autogen.sh])
dnl set up the gLiveSupport product
AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure],
[../src/products/gLiveSupport/bin/autogen.sh])
dnl AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure],
dnl [../src/products/gLiveSupport/bin/autogen.sh])
dnl display status info on what libraries will get compiled
AC_MSG_NOTICE(
[compiling the following external libraries that are needed
by Campcaster:
libodbc++ 0.2.5
taglib 1.5
xmlrpc++ 2004-07-13
[
using the following configuration settings:
hostname: ${HOSTNAME}
@ -362,8 +356,6 @@ using the following configuration settings:
database user: ${DB_USER}
database user password: ${DB_PASSWORD}
station audio output device: ${STATION_AUDIO_OUT}
studio audio output device: ${STUDIO_AUDIO_OUT}
studio audio cue device: ${STUDIO_AUDIO_CUE}
creating Campcaster database: ${CREATE_LS_DATABASE}
creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}
initialize Campcaster database: ${INIT_LS_DATABASE}

View File

@ -85,28 +85,27 @@ TEST_RUNNER = ${PHP_DIR}/tests/index.php
#-------------------------------------------------------------------------------
# Targets
#-------------------------------------------------------------------------------
.PHONY: all dir_setup doc clean docclean depclean distclean dist install
.PHONY: db_init db_clean
.PHONY: all clean depclean distclean dist install
all:
dir_setup: ${DOXYGEN_DIR}
#dir_setup: ${DOXYGEN_DIR}
doc:
${DOXYGEN} ${DOXYGEN_CONFIG}
#doc:
# ${DOXYGEN} ${DOXYGEN_CONFIG}
clean: db_clean
clean:
# ${RM} ...
docclean:
${RMDIR} ${DOXYGEN_DIR}/html
#docclean:
# ${RMDIR} ${DOXYGEN_DIR}/html
depclean: clean
dist: all
${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} *
#dist: all
# ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} *
distclean: clean docclean
distclean: clean
# ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te*
#check: all ${TEST_RUNNER}
@ -126,19 +125,19 @@ install: all
# IMPORTANT: db_init and db_clean are commented out only for Campcaster,
# where alib is initialized through storageServer module
db_init:
#db_init:
# cd var/install; php -q install.php
db_clean:
#db_clean:
# cd var/install; php -q uninstall.php
${TMP_DIR}:
${MKDIR} ${TMP_DIR}
#${TMP_DIR}:
# ${MKDIR} ${TMP_DIR}
${DOXYGEN_DIR}:
${MKDIR} ${DOXYGEN_DIR}
#${DOXYGEN_DIR}:
# ${MKDIR} ${DOXYGEN_DIR}
${TEST_RUNNER}:
#${TEST_RUNNER}:
#-------------------------------------------------------------------------------
# Pattern rules

View File

@ -54,9 +54,9 @@ define('GBERR_GUNID', 53);
define('GBERR_BGERR', 54);
define('GBERR_NOTIMPL', 69);
require_once(dirname(__FILE__)."/../../alib/var/Alib.php");
require_once("StoredFile.php");
require_once("Transport.php");
require_once(dirname(__FILE__)."/Alib.php");
require_once(dirname(__FILE__)."/StoredFile.php");
require_once(dirname(__FILE__)."/Transport.php");
$g_metadata_xml_to_db_mapping = array(
'dc:format' => "format",

View File

@ -124,7 +124,7 @@ $CC_CONFIG['subjTable'] = $CC_CONFIG['tblNamePrefix'].'subjs';
$CC_CONFIG['smembTable'] = $CC_CONFIG['tblNamePrefix'].'smemb';
$CC_CONFIG['transTable'] = $CC_CONFIG['tblNamePrefix'].'trans';
$CC_CONFIG['prefTable'] = $CC_CONFIG['tblNamePrefix'].'pref';
$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog';
//$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog';
$CC_CONFIG['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule';
$CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup';

View File

@ -1,7 +1,7 @@
#!/usr/bin/php
<?php
require_once(dirname(__FILE__).'/../conf.php');
require_once(dirname(__FILE__).'/../../../alib/var/Subjects.php');
require_once(dirname(__FILE__).'/../Subjects.php');
require_once('DB.php');
require_once('Console/Getopt.php');

View File

@ -452,17 +452,17 @@ if (!camp_db_table_exists($CC_CONFIG['scheduleTable'])) {
}
if (!camp_db_table_exists($CC_CONFIG['playlogTable'])) {
echo " * Creating database table ".$CC_CONFIG['playlogTable']."...";
$sql = "CREATE TABLE ".$CC_CONFIG['playlogTable']."("
." id BIGINT NOT NULL,"
." audioClipId BIGINT NOT NULL,"
." timestamp TIMESTAMP NOT NULL,"
." PRIMARY KEY(id))";
camp_install_query($sql);
} else {
echo " * Skipping: database table already exists: ".$CC_CONFIG['playlogTable']."\n";
}
//if (!camp_db_table_exists($CC_CONFIG['playlogTable'])) {
// echo " * Creating database table ".$CC_CONFIG['playlogTable']."...";
// $sql = "CREATE TABLE ".$CC_CONFIG['playlogTable']."("
// ." id BIGINT NOT NULL,"
// ." audioClipId BIGINT NOT NULL,"
// ." timestamp TIMESTAMP NOT NULL,"
// ." PRIMARY KEY(id))";
// camp_install_query($sql);
//} else {
// echo " * Skipping: database table already exists: ".$CC_CONFIG['playlogTable']."\n";
//}
if (!camp_db_table_exists($CC_CONFIG['backupTable'])) {

View File

@ -193,13 +193,13 @@ if (camp_db_table_exists($CC_CONFIG['backupTable'])) {
echo " * Skipping: database table ".$CC_CONFIG['backupTable']."\n";
}
if (camp_db_table_exists($CC_CONFIG['playlogTable'])) {
echo " * Removing database table ".$CC_CONFIG['playlogTable']."...";
$sql = "DROP TABLE ".$CC_CONFIG['playlogTable'];
camp_install_query($sql);
} else {
echo " * Skipping: database table ".$CC_CONFIG['playlogTable']."\n";
}
//if (camp_db_table_exists($CC_CONFIG['playlogTable'])) {
// echo " * Removing database table ".$CC_CONFIG['playlogTable']."...";
// $sql = "DROP TABLE ".$CC_CONFIG['playlogTable'];
// camp_install_query($sql);
//} else {
// echo " * Skipping: database table ".$CC_CONFIG['playlogTable']."\n";
//}
echo "************************************\n";
echo "* StorageServer Uninstall Complete *\n";