making fixes to the installation and Debian package creation

This commit is contained in:
maroy 2005-04-23 09:51:00 +00:00
parent ba93af0d0c
commit de3c9925c1
3 changed files with 15 additions and 6 deletions

View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.2 $ # Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -165,7 +165,7 @@ cp -pPR $products_dir/scheduler/bin/scheduler.sh $install_bin
cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport $install_bin cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport $install_bin
cp -pPR $products_dir/gLiveSupport/bin/gLiveSupport.sh $install_bin cp -pPR $products_dir/gLiveSupport/bin/gLiveSupport.sh $install_bin
cp -pPR $products_dir/gLiveSupport/var/widgets $install_var cp -pPR $products_dir/gLiveSupport/var/widgets $install_var
cp -pPR $products_dir/gLiveSupport/var/gLiveSuppprt*.res $install_var cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport*.res $install_var
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.2 $ # Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -100,6 +100,7 @@ PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor
EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler
SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient
WIDGETS_DIR = ${MODULES_DIR}/widgets WIDGETS_DIR = ${MODULES_DIR}/widgets
ARCHIVE_SERVER_DIR = ${MODULES_DIR}/archiveServer
STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
PRODUCTS_DIR = ${BASE_DIR}/products PRODUCTS_DIR = ${BASE_DIR}/products
@ -196,7 +197,7 @@ ${TMP_DIR}/modules_setup.stamp:
${EVENT_SCHEDULER_DIR}/bin/autogen.sh ${EVENT_SCHEDULER_DIR}/bin/autogen.sh
${SCHEDULER_CLIENT_DIR}/bin/autogen.sh ${SCHEDULER_CLIENT_DIR}/bin/autogen.sh
${WIDGETS_DIR}/bin/autogen.sh ${WIDGETS_DIR}/bin/autogen.sh
# -${MAKE} -C ${STORAGE_SERVER_DIR} dir_setup -${MAKE} -C ${ARCHIVE_SERVER_DIR} all
-${MAKE} -C ${STORAGE_SERVER_DIR} all -${MAKE} -C ${STORAGE_SERVER_DIR} all
touch ${TMP_DIR}/modules_setup.stamp touch ${TMP_DIR}/modules_setup.stamp
@ -229,6 +230,7 @@ depclean:
${MAKE} -C ${WIDGETS_DIR} depclean ${MAKE} -C ${WIDGETS_DIR} depclean
${MAKE} -C ${SCHEDULER_DIR} depclean ${MAKE} -C ${SCHEDULER_DIR} depclean
${MAKE} -C ${GLIVESUPPORT_DIR} depclean ${MAKE} -C ${GLIVESUPPORT_DIR} depclean
-${MAKE} -C ${ARCHIVE_SERVER_DIR} depclean
-${MAKE} -C ${STORAGE_SERVER_DIR} depclean -${MAKE} -C ${STORAGE_SERVER_DIR} depclean
compile: ${TMP_DIR}/compile.stamp compile: ${TMP_DIR}/compile.stamp
@ -256,6 +258,7 @@ check:
-${MAKE} -C ${WIDGETS_DIR} check -${MAKE} -C ${WIDGETS_DIR} check
-${MAKE} -C ${SCHEDULER_DIR} check -${MAKE} -C ${SCHEDULER_DIR} check
# -${MAKE} -C ${GLIVESUPPORT_DIR} check # -${MAKE} -C ${GLIVESUPPORT_DIR} check
# -${MAKE} -C ${ARCHIVE_SERVER_DIR} check
# -${MAKE} -C ${STORAGE_SERVER_DIR} check # -${MAKE} -C ${STORAGE_SERVER_DIR} check

View file

@ -81,6 +81,7 @@ install-arch:
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/bin mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/bin
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/etc mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/tmp mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/tmp
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/var
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallScheduler.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallScheduler.sh \
@ -88,8 +89,12 @@ install-arch:
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \
$(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \ $(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \
$(CURDIR)/debian/livesupport-station/opt/livesupport/etc $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/alib \
$(CURDIR)/debian/livesupport-station/opt/livesupport $(CURDIR)/debian/livesupport/opt/livesupport/var/archiveServer \
$(CURDIR)/debian/livesupport/opt/livesupport/var/getid3 \
$(CURDIR)/debian/livesupport/opt/livesupport/var/htmlUI \
$(CURDIR)/debian/livesupport/opt/livesupport/var/storageServer \
$(CURDIR)/debian/livesupport-station/opt/livesupport/var
# now separate the studio (client) files into debian/livesupport-studio # now separate the studio (client) files into debian/livesupport-studio
mkdir -p $(CURDIR)/debian/livesupport-studio mkdir -p $(CURDIR)/debian/livesupport-studio
@ -97,6 +102,7 @@ install-arch:
mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin
mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc
mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/tmp mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/tmp
mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var
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/opt/livesupport/bin/postInstallGLiveSupport.sh \