renamed the scheduler executable and config files to campcaster-scheduler;
merging the rename-scheduler branch back to the trunk; the branch is now dead. this closes #1952
This commit is contained in:
parent
277097e14c
commit
ff08dedbc6
|
@ -394,7 +394,7 @@ cd -
|
||||||
|
|
||||||
# create scheduler-related database tables
|
# create scheduler-related database tables
|
||||||
cd $installdir
|
cd $installdir
|
||||||
./bin/scheduler.sh install || exit 1;
|
./bin/campcaster-scheduler.sh install || exit 1;
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ ls_scheduler_port=$scheduler_port
|
||||||
ls_scheduler_urlPrefix=
|
ls_scheduler_urlPrefix=
|
||||||
ls_scheduler_xmlRpcPrefix=RC2
|
ls_scheduler_xmlRpcPrefix=RC2
|
||||||
ls_tmp_dir=$installdir/tmp
|
ls_tmp_dir=$installdir/tmp
|
||||||
ls_scheduler_daemon_command="$scheduler_bin_dir/scheduler_devenv.sh"
|
ls_scheduler_daemon_command="$scheduler_bin_dir/campcaster-scheduler_devenv.sh"
|
||||||
|
|
||||||
ls_audio_output_device=$output_device
|
ls_audio_output_device=$output_device
|
||||||
ls_audio_cue_device=$cue_device
|
ls_audio_cue_device=$cue_device
|
||||||
|
@ -304,9 +304,9 @@ cat $modules_dir/storageClient/etc/webStorage.xml.template \
|
||||||
| sed -e "$replace_sed_string" \
|
| sed -e "$replace_sed_string" \
|
||||||
> $configdir/webStorage.xml
|
> $configdir/webStorage.xml
|
||||||
|
|
||||||
cat $products_dir/scheduler/etc/scheduler.xml.template \
|
cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \
|
||||||
| sed -e "$replace_sed_string" \
|
| sed -e "$replace_sed_string" \
|
||||||
> $configdir/scheduler.xml
|
> $configdir/campcaster-scheduler.xml
|
||||||
|
|
||||||
cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
|
cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
|
||||||
| sed -e "$replace_sed_string" \
|
| sed -e "$replace_sed_string" \
|
||||||
|
|
|
@ -129,7 +129,7 @@ After a successful installation, the Campcaster scheduler has to be
|
||||||
started. The scheduler has a System V runlevel-style startup script,
|
started. The scheduler has a System V runlevel-style startup script,
|
||||||
under <code><installation directory>/bin/scheduler.sh<code>.
|
under <code><installation directory>/bin/scheduler.sh<code>.
|
||||||
To start the scheduler, simply type:
|
To start the scheduler, simply type:
|
||||||
<pre><code><installation directory>/bin/scheduler.sh start</code></pre>
|
<pre><installation directory>/bin/campcaster-scheduler.sh start</pre>
|
||||||
|
|
||||||
<p>To use the the web interface, point your browser to
|
<p>To use the the web interface, point your browser to
|
||||||
<code>http://localhost/campcaster</code>. You can also use the web interface
|
<code>http://localhost/campcaster</code>. You can also use the web interface
|
||||||
|
@ -137,7 +137,7 @@ from other computers; simply put the name or IP number of the computer where
|
||||||
Campcaster was installed in place of <code>localhost</code>.
|
Campcaster was installed in place of <code>localhost</code>.
|
||||||
|
|
||||||
<p>To start Campcaster Studio, type the following:
|
<p>To start Campcaster Studio, type the following:
|
||||||
<pre><code><installation directory>/bin/campcaster-studio.sh</code></pre>
|
<pre><installation directory>/bin/campcaster-studio.sh</pre>
|
||||||
|
|
||||||
<p>For your first login, use the following values:
|
<p>For your first login, use the following values:
|
||||||
<ul>
|
<ul>
|
||||||
|
@ -147,10 +147,10 @@ Campcaster was installed in place of <code>localhost</code>.
|
||||||
Later you can change the password, and add more users, from the web interface.
|
Later you can change the password, and add more users, from the web interface.
|
||||||
|
|
||||||
<p>You can make the scheduler start automatically when the system boots up,
|
<p>You can make the scheduler start automatically when the system boots up,
|
||||||
by installing the <installation directory>/bin/campcaster-scheduler
|
by installing the <installation directory>/etc/campcaster-scheduler
|
||||||
init script. In Debian-based systems, this is done by
|
init script. In Debian-based systems, this is done by
|
||||||
typing
|
typing
|
||||||
<pre>cp <installation directory>/bin/campcaster-scheduler /etc/init.d/
|
<pre>cp <installation directory>/etc/campcaster-scheduler /etc/init.d/
|
||||||
update-rc.d campcaster-scheduler defaults 92
|
update-rc.d campcaster-scheduler defaults 92
|
||||||
</pre>
|
</pre>
|
||||||
as root. Note: in the init script, the variable <code>CAMPCASTER_DIR</code>
|
as root. Note: in the init script, the variable <code>CAMPCASTER_DIR</code>
|
||||||
|
|
|
@ -69,10 +69,8 @@ and the database that Campcaster uses to store its data. Type the following:
|
||||||
|
|
||||||
<h2>5. Start Campcaster</h2>
|
<h2>5. Start Campcaster</h2>
|
||||||
After a successful installation, the Campcaster scheduler has to be
|
After a successful installation, the Campcaster scheduler has to be
|
||||||
started. The scheduler has a System V runlevel-style startup script,
|
started, by typing:
|
||||||
under <code>/opt/campcaster/bin/scheduler.sh<code>. To start the scheduler,
|
<pre>/opt/campcaster/bin/campcaster-scheduler.sh start</pre>
|
||||||
simply type:
|
|
||||||
<pre>/opt/campcaster/bin/scheduler.sh start</pre>
|
|
||||||
|
|
||||||
<p>To use the the web interface, point your browser to
|
<p>To use the the web interface, point your browser to
|
||||||
<code>http://localhost/campcaster</code>. You can also use the web interface
|
<code>http://localhost/campcaster</code>. You can also use the web interface
|
||||||
|
@ -91,7 +89,7 @@ Later you can change the password, and add more users, from the web interface.
|
||||||
|
|
||||||
<p>You can make the scheduler start automatically when the system boots up,
|
<p>You can make the scheduler start automatically when the system boots up,
|
||||||
by doing the following:
|
by doing the following:
|
||||||
<pre>sudo cp /opt/livesupport/bin/campcaster-scheduler /etc/init.d/
|
<pre>sudo cp /opt/livesupport/etc/campcaster-scheduler /etc/init.d/
|
||||||
sudo update-rc.d campcaster-scheduler defaults 92
|
sudo update-rc.d campcaster-scheduler defaults 92
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ PRODUCTS_DIR = ${SRC_DIR}/products
|
||||||
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
|
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
|
||||||
GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
|
GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
|
||||||
|
|
||||||
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/scheduler
|
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
|
||||||
GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
|
GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
@ -405,7 +405,7 @@ install: setup compile setup_install_dirs create_database install_modules instal
|
||||||
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
|
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
|
||||||
${MKDIR} ${USR_BIN_DIR}
|
${MKDIR} ${USR_BIN_DIR}
|
||||||
${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
|
${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
|
||||||
${CP} ${BIN_DIR}/campcaster-scheduler ${USR_BIN_DIR}
|
${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR}
|
||||||
${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
|
${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
|
||||||
|
|
||||||
create_database:
|
create_database:
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
/opt/campcaster/var/Campcaster/storageServer/var/conf.php
|
/opt/campcaster/var/Campcaster/storageServer/var/conf.php
|
||||||
/opt/campcaster/var/Campcaster/archiveServer/var/conf.php
|
/opt/campcaster/var/Campcaster/archiveServer/var/conf.php
|
||||||
/opt/campcaster/etc/scheduler.xml
|
/opt/campcaster/etc/campcaster-scheduler.xml
|
||||||
|
|
|
@ -28,7 +28,7 @@ case "$1" in
|
||||||
--postgresql-init-script=/etc/init.d/postgresql-8.1
|
--postgresql-init-script=/etc/init.d/postgresql-8.1
|
||||||
|
|
||||||
# register and start the livesupport scheduler daemon
|
# register and start the livesupport scheduler daemon
|
||||||
cp -f $installdir/bin/campcaster-scheduler /etc/init.d
|
cp -f $installdir/etc/campcaster-scheduler /etc/init.d
|
||||||
update-rc.d campcaster-scheduler defaults 92 || true
|
update-rc.d campcaster-scheduler defaults 92 || true
|
||||||
/etc/init.d/campcaster-scheduler start || true
|
/etc/init.d/campcaster-scheduler start || true
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -74,7 +74,7 @@ case "$1" in
|
||||||
|
|
||||||
echo "Deleting data files...";
|
echo "Deleting data files...";
|
||||||
|
|
||||||
rm -rf $installdir/etc/scheduler.xml
|
rm -rf $installdir/etc/campcaster-scheduler.xml
|
||||||
rm -rf $installdir/etc/gst-registry.xml
|
rm -rf $installdir/etc/gst-registry.xml
|
||||||
rm -rf $installdir/etc/pear.conf
|
rm -rf $installdir/etc/pear.conf
|
||||||
rm -rf $installdir/var/Campcaster/htmlUI/var/html/img/*
|
rm -rf $installdir/var/Campcaster/htmlUI/var/html/img/*
|
||||||
|
|
|
@ -92,14 +92,13 @@ install-arch:
|
||||||
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/tmp
|
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/tmp
|
||||||
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/var/Campcaster
|
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/var/Campcaster
|
||||||
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/usr/lib
|
mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/usr/lib
|
||||||
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/scheduler \
|
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/bin/scheduler.sh \
|
$(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler.sh \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/bin/postInstallStation.sh \
|
$(CURDIR)/debian/campcaster/opt/campcaster/bin/postInstallStation.sh \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler \
|
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/bin/createDatabase.sh \
|
$(CURDIR)/debian/campcaster/opt/campcaster/bin/createDatabase.sh \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/bin/createOdbcDataSource.sh \
|
$(CURDIR)/debian/campcaster/opt/campcaster/bin/createOdbcDataSource.sh \
|
||||||
$(CURDIR)/debian/campcaster-station/opt/campcaster/bin
|
$(CURDIR)/debian/campcaster-station/opt/campcaster/bin
|
||||||
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/scheduler.xml* \
|
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler.xml* \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/etc/odbc* \
|
$(CURDIR)/debian/campcaster/opt/campcaster/etc/odbc* \
|
||||||
$(CURDIR)/debian/campcaster-station/opt/campcaster/etc
|
$(CURDIR)/debian/campcaster-station/opt/campcaster/etc
|
||||||
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/alib \
|
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/alib \
|
||||||
|
@ -119,6 +118,7 @@ install-arch:
|
||||||
$(CURDIR)/debian/campcaster-station/opt/campcaster/var
|
$(CURDIR)/debian/campcaster-station/opt/campcaster/var
|
||||||
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/apache \
|
mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/apache \
|
||||||
$(CURDIR)/debian/campcaster/opt/campcaster/etc/pg_hba.conf \
|
$(CURDIR)/debian/campcaster/opt/campcaster/etc/pg_hba.conf \
|
||||||
|
$(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler \
|
||||||
$(CURDIR)/debian/campcaster-station/opt/campcaster/etc
|
$(CURDIR)/debian/campcaster-station/opt/campcaster/etc
|
||||||
|
|
||||||
# now separate the studio (client) files into debian/campcaster-studio
|
# now separate the studio (client) files into debian/campcaster-studio
|
||||||
|
|
|
@ -81,7 +81,7 @@ AUDIO_CUE = "@AUDIO_CUE@"
|
||||||
PHP_URL_PREFIX=campcaster
|
PHP_URL_PREFIX=campcaster
|
||||||
ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php
|
ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php
|
||||||
SCHEDULER_XML_RPC_PREFIX=RC2
|
SCHEDULER_XML_RPC_PREFIX=RC2
|
||||||
SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/scheduler.sh"
|
SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/campcaster-scheduler.sh"
|
||||||
|
|
||||||
USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
|
USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
|
||||||
PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \
|
PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \
|
||||||
|
@ -127,7 +127,7 @@ PRODUCTS_DIR = ${BASE_DIR}/../../products
|
||||||
STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
|
STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
|
||||||
|
|
||||||
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
|
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
|
||||||
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/scheduler
|
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
|
||||||
|
|
||||||
CORE_DIR = ${MODULES_DIR}/core
|
CORE_DIR = ${MODULES_DIR}/core
|
||||||
CORE_INCLUDE_DIR = ${CORE_DIR}/include
|
CORE_INCLUDE_DIR = ${CORE_DIR}/include
|
||||||
|
|
|
@ -157,8 +157,8 @@
|
||||||
</schedulerClientFactory>
|
</schedulerClientFactory>
|
||||||
|
|
||||||
<schedulerDaemonCommands
|
<schedulerDaemonCommands
|
||||||
start = "../scheduler/bin/scheduler_devenv.sh start"
|
start = "../scheduler/bin/campcaster-scheduler_devenv.sh start"
|
||||||
stop = "../scheduler/bin/scheduler_devenv.sh stop" />
|
stop = "../scheduler/bin/campcaster-scheduler_devenv.sh stop" />
|
||||||
|
|
||||||
<outputPlayer>
|
<outputPlayer>
|
||||||
<audioPlayer>
|
<audioPlayer>
|
||||||
|
|
|
@ -46,8 +46,8 @@ libdir=$basedir/lib
|
||||||
gstreamer_dir=`find $libdir -type d -name "gstreamer-*"`
|
gstreamer_dir=`find $libdir -type d -name "gstreamer-*"`
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
|
||||||
scheduler_exe=$bindir/scheduler
|
scheduler_exe=$bindir/campcaster-scheduler
|
||||||
config_file=$etcdir/scheduler.xml
|
config_file=$etcdir/campcaster-scheduler.xml
|
||||||
|
|
||||||
mode=$1
|
mode=$1
|
||||||
|
|
||||||
|
@ -94,9 +94,9 @@ case "$mode" in
|
||||||
|
|
||||||
'kill')
|
'kill')
|
||||||
echo "Killing all Campcaster scheduler processes..."
|
echo "Killing all Campcaster scheduler processes..."
|
||||||
killall scheduler
|
killall campcaster-scheduler
|
||||||
sleep 2
|
sleep 2
|
||||||
killall -9 scheduler
|
killall -9 campcaster-scheduler
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
|
@ -49,18 +49,18 @@ usrdir=`cd $basedir/../../../usr; pwd;`
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
export LD_LIBRARY_PATH=$usrdir/lib:$LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=$usrdir/lib:$LD_LIBRARY_PATH
|
||||||
|
|
||||||
if [ -x $bindir/scheduler ]; then
|
if [ -x $bindir/campcaster-scheduler ]; then
|
||||||
scheduler_exe=$bindir/scheduler
|
scheduler_exe=$bindir/campcaster-scheduler
|
||||||
elif [ -x $tmpdir/scheduler ]; then
|
elif [ -x $tmpdir/campcaster-scheduler ]; then
|
||||||
scheduler_exe=$tmpdir/scheduler
|
scheduler_exe=$tmpdir/campcaster-scheduler
|
||||||
else
|
else
|
||||||
echo "Can't find scheduler executable.";
|
echo "Can't find scheduler executable.";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.campcaster/scheduler.xml ]; then
|
if [ -f ~/.campcaster/campcaster-scheduler.xml ]; then
|
||||||
config_file=~/.campcaster/scheduler.xml
|
config_file=~/.campcaster/campcaster-scheduler.xml
|
||||||
elif [ -f $etcdir/scheduler.xml ]; then
|
elif [ -f $etcdir/campcaster-scheduler.xml ]; then
|
||||||
config_file=$etcdir/scheduler.xml
|
config_file=$etcdir/campcaster-scheduler.xml
|
||||||
else
|
else
|
||||||
echo "Can't find configuration file.";
|
echo "Can't find configuration file.";
|
||||||
fi
|
fi
|
||||||
|
@ -119,9 +119,9 @@ case "$mode" in
|
||||||
|
|
||||||
'kill')
|
'kill')
|
||||||
echo "Killing all Campcaster scheduler processes..."
|
echo "Killing all Campcaster scheduler processes..."
|
||||||
killall scheduler
|
killall campcaster-scheduler
|
||||||
sleep 2
|
sleep 2
|
||||||
killall -9 scheduler
|
killall -9 campcaster-scheduler
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
|
@ -54,10 +54,10 @@ else
|
||||||
echo "Can't find testRunner executable.";
|
echo "Can't find testRunner executable.";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.campcaster/scheduler.xml ]; then
|
if [ -f ~/.campcaster/campcaster-scheduler.xml ]; then
|
||||||
config_file=~/.campcaster/scheduler.xml
|
config_file=~/.campcaster/campcaster-scheduler.xml
|
||||||
elif [ -f $etcdir/scheduler.xml ]; then
|
elif [ -f $etcdir/campcaster-scheduler.xml ]; then
|
||||||
config_file=$etcdir/scheduler.xml
|
config_file=$etcdir/campcaster-scheduler.xml
|
||||||
else
|
else
|
||||||
echo "Can't find configuration file.";
|
echo "Can't find configuration file.";
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -180,10 +180,10 @@ TEST_RESULTS = ${DOC_DIR}/testResults.xml
|
||||||
# the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
|
# the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
|
||||||
TEST_XSLT = ../etc/testResultToHtml.xsl
|
TEST_XSLT = ../etc/testResultToHtml.xsl
|
||||||
|
|
||||||
SCHEDULER_EXE = ${TMP_DIR}/scheduler
|
SCHEDULER_EXE = ${TMP_DIR}/campcaster-scheduler
|
||||||
SCHEDULER_SH = ${BIN_DIR}/scheduler_devenv.sh
|
SCHEDULER_SH = ${BIN_DIR}/campcaster-scheduler_devenv.sh
|
||||||
SCHEDULER_CFG = ${ETC_DIR}/scheduler.xml
|
SCHEDULER_CFG = ${ETC_DIR}/campcaster-scheduler.xml
|
||||||
SCHEDULER_LOCAL_CFG = ${ETC_DIR}/scheduler-local.xml
|
SCHEDULER_LOCAL_CFG = ${ETC_DIR}/campcaster-scheduler-local.xml
|
||||||
TEST_RUNNER = ${TMP_DIR}/testRunner
|
TEST_RUNNER = ${TMP_DIR}/testRunner
|
||||||
TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh
|
TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh
|
||||||
|
|
||||||
|
@ -355,7 +355,7 @@ copy_files:
|
||||||
${MKDIR} ${USR_BIN_DIR}
|
${MKDIR} ${USR_BIN_DIR}
|
||||||
${MKDIR} ${USR_ETC_DIR}
|
${MKDIR} ${USR_ETC_DIR}
|
||||||
${MKDIR} ${USR_TMP_DIR}
|
${MKDIR} ${USR_TMP_DIR}
|
||||||
${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR}
|
${CP} ${BIN_DIR}/campcaster-scheduler.sh ${USR_BIN_DIR}
|
||||||
${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR}
|
${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR}
|
||||||
${CP} ${ETC_DIR}/odbcinst_old_debian_template \
|
${CP} ${ETC_DIR}/odbcinst_old_debian_template \
|
||||||
${ETC_DIR}/odbcinst_new_debian_template \
|
${ETC_DIR}/odbcinst_new_debian_template \
|
||||||
|
@ -364,8 +364,9 @@ copy_files:
|
||||||
${BIN_DIR}/createOdbcDataSource.sh ${USR_BIN_DIR}
|
${BIN_DIR}/createOdbcDataSource.sh ${USR_BIN_DIR}
|
||||||
${CAT} ${ETC_DIR}/odbc_template | ${SED} -e ${REPLACE_SED_STRING} \
|
${CAT} ${ETC_DIR}/odbc_template | ${SED} -e ${REPLACE_SED_STRING} \
|
||||||
> ${USR_ETC_DIR}/odbc_template
|
> ${USR_ETC_DIR}/odbc_template
|
||||||
${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \
|
${CAT} ${ETC_DIR}/campcaster-scheduler.xml.template \
|
||||||
> ${USR_ETC_DIR}/scheduler.xml
|
| ${SED} -e ${REPLACE_SED_STRING} \
|
||||||
|
> ${USR_ETC_DIR}/campcaster-scheduler.xml
|
||||||
|
|
||||||
create_database:
|
create_database:
|
||||||
ifeq (@CREATE_LS_DATABASE@,yes)
|
ifeq (@CREATE_LS_DATABASE@,yes)
|
||||||
|
@ -383,7 +384,7 @@ endif
|
||||||
|
|
||||||
init_database:
|
init_database:
|
||||||
ifeq (@INIT_LS_DATABASE@,yes)
|
ifeq (@INIT_LS_DATABASE@,yes)
|
||||||
${USR_BIN_DIR}/scheduler.sh install
|
${USR_BIN_DIR}/campcaster-scheduler.sh install
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -437,9 +438,9 @@ storage_server_init:
|
||||||
${MAKE} -C ${STORAGE_SERVER_DIR}
|
${MAKE} -C ${STORAGE_SERVER_DIR}
|
||||||
|
|
||||||
kill:
|
kill:
|
||||||
${KILLALL} scheduler || true
|
${KILLALL} campcaster-scheduler || true
|
||||||
sleep 2
|
sleep 2
|
||||||
${KILLALL} -9 scheduler || true
|
${KILLALL} -9 campcaster-scheduler || true
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -32,7 +32,7 @@ dnl This is due to the fact that configure spreads a lot of trash around,
|
||||||
dnl like atom4te cache directories, config.* files, etc. into the directory
|
dnl like atom4te cache directories, config.* files, etc. into the directory
|
||||||
dnl it is being run from. We clearly don't want these in our base directory.
|
dnl it is being run from. We clearly don't want these in our base directory.
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
AC_INIT(Scheduler, 1.1.0, bugs@campware.org)
|
AC_INIT(Campcaster-Scheduler, 1.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$)
|
AC_REVISION($Revision$)
|
||||||
|
|
Loading…
Reference in New Issue