Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more changes to hopefully the final 1.0 release

Browse source
This commit is contained in:
maroy 2005-08-03 07:37:56 +00:00
parent 1f178670ca
commit 69247c704d
7 changed files with 66 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

49
livesupport/etc/Makefile.in
View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.12 $ # Version : $Revision: 1.13 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -36,6 +36,7 @@ DOXYTAG = doxytag
XSLTPROC = xsltproc XSLTPROC = xsltproc
ECHO = @echo ECHO = @echo
FLAWFINDER = flawfinder FLAWFINDER = flawfinder
CP = cp -f
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -51,18 +52,26 @@ TMP_DIR = ${BASE_DIR}/tmp
prefix = @prefix@ prefix = @prefix@
HOSTNAME = @HOSTNAME@ USR_DIR = ${prefix}
APACHE_GROUP = @APACHE_GROUP@ USR_BIN_DIR = ${USR_DIR}/bin
WWW_DOCROOT = @WWW_DOCROOT@ USR_ETC_DIR = ${USR_DIR}/etc
WWW_PORT = @WWW_PORT@
SCHEDULER_PORT = @SCHEDULER_PORT@ HOSTNAME = @HOSTNAME@
DB_SERVER = @DB_SERVER@ APACHE_GROUP = @APACHE_GROUP@
DATABASE = @DATABASE@ WWW_DOCROOT = @WWW_DOCROOT@
DB_USER = @DB_USER@ WWW_PORT = @WWW_PORT@
DB_PASSWORD = @DB_PASSWORD@ SCHEDULER_PORT = @SCHEDULER_PORT@
STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@" DB_SERVER = @DB_SERVER@
STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@" DATABASE = @DATABASE@
STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" DB_USER = @DB_USER@
DB_PASSWORD = @DB_PASSWORD@
CREATE_LS_DATABASE = @CREATE_LS_DATABASE@
INIT_LS_DATABASE = @INIT_LS_DATABASE@
CREATE_ODBC_DATA_SOURCE = @CREATE_ODBC_DATA_SOURCE@
CONFIGURE_APACHE = @CONFIGURE_APACHE@
STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@"
STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@"
STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@"
export LD_LIBRARY_PATH=${prefix}/lib export LD_LIBRARY_PATH=${prefix}/lib
@ -248,6 +257,9 @@ endif
cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix} cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install ${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install
cd ${PEAR_DIR} && ./configure --prefix=${prefix}
${MAKE} -C ${PEAR_DIR} install
touch ${TMP_DIR}/tools_setup.stamp touch ${TMP_DIR}/tools_setup.stamp
tools_distclean: tools_distclean:
@ -296,7 +308,7 @@ ${TMP_DIR}/modules_setup.stamp:
cd ${HTML_UI_DIR}/tmp && ./configure --prefix=${prefix} \ cd ${HTML_UI_DIR}/tmp && ./configure --prefix=${prefix} \
--with-apache-group=${APACHE_GROUP} \ --with-apache-group=${APACHE_GROUP} \
--with-www-docroot=${WWW_DOCROOT} \ --with-www-docroot=${WWW_DOCROOT} \
--with-configure-apache=yes --with-configure-apache=${CONFIGURE_APACHE}
cd ${STORAGE_ADMIN_DIR}/tmp && ./configure --prefix=${prefix} cd ${STORAGE_ADMIN_DIR}/tmp && ./configure --prefix=${prefix}
cd ${STORAGE_SERVER_DIR}/tmp && \ cd ${STORAGE_SERVER_DIR}/tmp && \
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
@ -307,7 +319,7 @@ ${TMP_DIR}/modules_setup.stamp:
--with-database=${DATABASE} \ --with-database=${DATABASE} \
--with-database-user=${DB_USER} \ --with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \ --with-database-password=${DB_PASSWORD} \
--with-init-database=yes --with-init-database=${INIT_LS_DATABASE}
cd ${CORE_DIR}/tmp && ./configure --prefix=${prefix} cd ${CORE_DIR}/tmp && ./configure --prefix=${prefix}
cd ${AUTHENTICATION_DIR}/tmp && ./configure --prefix=${prefix} cd ${AUTHENTICATION_DIR}/tmp && ./configure --prefix=${prefix}
cd ${DB_DIR}/tmp && ./configure --prefix=${prefix} cd ${DB_DIR}/tmp && ./configure --prefix=${prefix}
@ -331,8 +343,8 @@ ${TMP_DIR}/products_setup.stamp:
--with-database-user=${DB_USER} \ --with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \ --with-database-password=${DB_PASSWORD} \
--with-audio-out=${STATION_AUDIO_OUT} \ --with-audio-out=${STATION_AUDIO_OUT} \
--with-create-odbc-data-source=yes \ --with-create-odbc-data-source=${CREATE_ODBC_DATA_SOURCE} \
--with-init-database=yes --with-init-database=${INIT_LS_DATABASE}
cd ${GLIVESUPPORT_DIR}/tmp && \ cd ${GLIVESUPPORT_DIR}/tmp && \
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
--with-hostname=${HOSTNAME} \ --with-hostname=${HOSTNAME} \
@ -414,6 +426,9 @@ check:
.PHONY: install create_database install_modules install_products .PHONY: install create_database install_modules install_products
install: setup compile create_database install_modules install_products install: setup compile create_database install_modules install_products
${CP} ${BIN_DIR}/postInstallScheduler.sh ${USR_BIN_DIR}
${MKDIR} ${USR_ETC_DIR}/apache
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
create_database: create_database:
ifeq (@CREATE_LS_DATABASE@,yes) ifeq (@CREATE_LS_DATABASE@,yes)

1
livesupport/etc/debian/livesupport-station.conffiles
View file

@ -1,4 +1,3 @@
/opt/livesupport/var/LiveSupport/storageServer/var/conf.php /opt/livesupport/var/LiveSupport/storageServer/var/conf.php
/opt/livesupport/var/LiveSupport/archiveServer/var/conf.php /opt/livesupport/var/LiveSupport/archiveServer/var/conf.php
/opt/livesupport/etc/scheduler.xml /opt/livesupport/etc/scheduler.xml
/etc/apache/conf.d/90_php_livesupport.conf

6
livesupport/etc/debian/livesupport-station.init.d
View file

@ -10,8 +10,6 @@ GSTREAMER_DIR=`find $LIVESUPPORT_LIB -type d -name "gstreamer-*"`
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$LIVESUPPORT_BIN PATH=/sbin:/bin:/usr/sbin:/usr/bin:$LIVESUPPORT_BIN
LD_LIBRARY_PATH=$LIVESUPPORT_LIB:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$LIVESUPPORT_LIB:$LD_LIBRARY_PATH
GST_REGISTRY=$LIVESUPPORT_ETC/gst-registry.xml
GST_PLUGIN_PATH=$GSTREAMER_DIR
DAEMON=$LIVESUPPORT_BIN/scheduler DAEMON=$LIVESUPPORT_BIN/scheduler
NAME=livesupport-scheduler NAME=livesupport-scheduler
DESC="livesupport scheduler" DESC="livesupport scheduler"
@ -20,8 +18,6 @@ test -x $DAEMON || exit 0
export PATH export PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export GST_REGISTRY
export GST_PLUGIN_PATH
DAEMON_OPTS="-c $LIVESUPPORT_ETC/scheduler.xml" DAEMON_OPTS="-c $LIVESUPPORT_ETC/scheduler.xml"
@ -45,7 +41,7 @@ case "$1" in
$DAEMON -c $LIVESUPPORT_ETC/scheduler.xml start > /dev/null $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml start > /dev/null
echo "$NAME." echo "$NAME."
;; ;;
start) kill)
echo -n "Killing $DESC: " echo -n "Killing $DESC: "
$DAEMON -c $LIVESUPPORT_ETC/scheduler.xml kill > /dev/null $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml kill > /dev/null
echo "$NAME." echo "$NAME."

22
livesupport/etc/debian/rules
View file

@ -29,8 +29,14 @@ endif
config.status: configure config.status: configure
dh_testdir dh_testdir
rm -rf /opt/livesupport/* CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/livesupport --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/livesupport \
--with-www-docroot=/var/www \
--with-apache-group=www-data \
--with-station-audio-out=plughw:0 \
--with-studio-audio-out=plughw:1 \
--with-studio-audio-cue=plughw:2
build: build-arch build: build-arch
@ -72,7 +78,7 @@ install-arch:
mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/tmp mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/tmp
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/lib \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/lib \
$(CURDIR)/debian/livesupport-libs/opt/livesupport $(CURDIR)/debian/livesupport-libs/opt/livesupport
cp -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gst-* \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gst-* \
$(CURDIR)/debian/livesupport-libs/opt/livesupport/bin $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin
# now separate the station (server) files into debian/livesupport-station # now separate the station (server) files into debian/livesupport-station
@ -96,11 +102,8 @@ install-arch:
$(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \
$(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \
$(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/lib/pear \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/cache \
$(CURDIR)/debian/livesupport-station/opt/livesupport/usr/lib $(CURDIR)/debian/livesupport-station/opt/livesupport/var
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \
$(CURDIR)/debian/livesupport/opt/livesupport/usr/var \
$(CURDIR)/debian/livesupport-station/opt/livesupport/usr
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \
$(CURDIR)/debian/livesupport-station/opt/livesupport/etc $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
@ -113,14 +116,13 @@ install-arch:
mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport.sh \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallGLiveSupport.sh \
$(CURDIR)/debian/livesupport-studio/opt/livesupport/bin $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml* \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml* \
$(CURDIR)/debian/livesupport-studio/opt/livesupport/etc $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/Widgets \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/Widgets \
$(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/gLiveSupport*.res \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/gLiveSupport*.res \
$(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/livesupport.png \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/livesupport.png \
$(CURDIR)/debian/livesupport-studio/opt/livesupport/var $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport
mkdir -p $(CURDIR)/debian/livesupport-studio/usr/share/applications mkdir -p $(CURDIR)/debian/livesupport-studio/usr/share/applications
cp -a $(CURDIR)/debian/livesupport-studio.desktop \ cp -a $(CURDIR)/debian/livesupport-studio.desktop \
$(CURDIR)/debian/livesupport-studio/usr/share/applications/ $(CURDIR)/debian/livesupport-studio/usr/share/applications/

3
livesupport/modules/storageServer/etc/Makefile.in
View file

@ -20,7 +20,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.2 $ # Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -90,6 +90,7 @@ DATABASE = @DATABASE@
DB_USER = @DB_USER@ DB_USER = @DB_USER@
DB_PASSWORD = @DB_PASSWORD@ DB_PASSWORD = @DB_PASSWORD@
SCHEDULER_PORT = @SCHEDULER_PORT@ SCHEDULER_PORT = @SCHEDULER_PORT@
WWW_DOCROOT = @WWW_DOCROOT@
PHP_URL_PREFIX=livesupport PHP_URL_PREFIX=livesupport
SCHEDULER_URL_PREFIX = SCHEDULER_URL_PREFIX =

18
livesupport/modules/storageServer/etc/configure.ac
View file

@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl dnl
dnl Author : $Author: maroy $ dnl Author : $Author: maroy $
dnl Version : $Revision: 1.2 $ dnl Version : $Revision: 1.3 $
dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/configure.ac,v $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/configure.ac,v $
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
AC_INIT(StorageServer, 1.0, bugs@campware.org) AC_INIT(StorageServer, 1.0, bugs@campware.org)
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
AC_REVISION($Revision: 1.2 $) AC_REVISION($Revision: 1.3 $)
AC_CONFIG_SRCDIR(../var/BasicStor.php) AC_CONFIG_SRCDIR(../var/BasicStor.php)
@ -160,6 +160,19 @@ AC_ARG_WITH([database-password],
AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}])
dnl-----------------------------------------------------------------------------
dnl specify web document root
dnl-----------------------------------------------------------------------------
AC_SUBST(WWW_DOCROOT)
AC_ARG_WITH([www-docroot],
AC_HELP_STRING([--with-www-docroot],
[deploy LiveSupport under the specified docroot (/var/www)]),
[WWW_DOCROOT=${withval}], [WWW_DOCROOT=/var/www])
AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}])
dnl display status info on what libraries will get compiled dnl display status info on what libraries will get compiled
AC_MSG_NOTICE( AC_MSG_NOTICE(
@ -174,6 +187,7 @@ AC_MSG_NOTICE(
database user password: ${DB_PASSWORD} database user password: ${DB_PASSWORD}
creating LiveSupport database: ${CREATE_LS_DATABASE} creating LiveSupport database: ${CREATE_LS_DATABASE}
initialize LiveSupport database: ${INIT_LS_DATABASE} initialize LiveSupport database: ${INIT_LS_DATABASE}
www document root: ${WWW_DOCROOT}
]) ])

4
livesupport/products/scheduler/etc/Makefile.in
View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.65 $ # Version : $Revision: 1.66 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -368,6 +368,8 @@ copy_files:
${MKDIR} ${USR_ETC_DIR} ${MKDIR} ${USR_ETC_DIR}
${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR} ${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR}
${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR} ${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR}
${CP} ${ETC_DIR}/odbc_template ${ETC_DIR}/odbcinst_debian_template \
${ETC_DIR}/odbcinst_template ${USR_ETC_DIR}
${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \ ${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \
> ${USR_ETC_DIR}/scheduler.xml > ${USR_ETC_DIR}/scheduler.xml