diff --git a/livesupport/bin/nightlyBuild.sh b/livesupport/bin/nightlyBuild.sh new file mode 100755 index 000000000..efd0f16f4 --- /dev/null +++ b/livesupport/bin/nightlyBuild.sh @@ -0,0 +1,72 @@ +#!/bin/sh +#------------------------------------------------------------------------------- +# Copyright (c) 2004 Media Development Loan Fund +# +# This file is part of the LiveSupport project. +# http://livesupport.campware.org/ +# To report bugs, send an e-mail to bugs@campware.org +# +# LiveSupport is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LiveSupport is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LiveSupport; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# Author : $Author$ +# Version : $Revision$ +# Location : $URL$ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# This script generates the nightly builds and logs. +#------------------------------------------------------------------------------- + +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +bindir=${basedir}/bin +tmpdir=${basedir}/tmp +logdir=${basedir}/tmp + +cd ${basedir} + + +#------------------------------------------------------------------------------- +# Update the source from the repository. +#------------------------------------------------------------------------------- +mv -f ${logdir}/nightlySvnUpdate.log ${logdir}/nightlySvnUpdate.log~ +svn update &> ${logdir}/nightlySvnUpdate.log +ls -l ${logdir}/nightlySvnUpdate.log >> ${logdir}/nightlySvnUpdate.log + + +#------------------------------------------------------------------------------- +# Recompile the code. +#------------------------------------------------------------------------------- +mv -f ${logdir}/nightlyMakeRecompile.log ${logdir}/nightlyMakeRecompile.log~ +make recompile &> ${logdir}/nightlyMakeRecompile.log +ls -l ${logdir}/nightlyMakeRecompile.log >> ${logdir}/nightlyMakeRecompile.log + + +#------------------------------------------------------------------------------- +# Run the unit tests. +#------------------------------------------------------------------------------- +mv -f ${logdir}/nightlyMakeCheck.log ${logdir}/nightlyMakeCheck.log~ +make check &> ${logdir}/nightlyMakeCheck.log +ls -l ${logdir}/nightlyMakeCheck.log >> ${logdir}/nightlyMakeCheck.log + + +#------------------------------------------------------------------------------- +# Generate the documentation. +#------------------------------------------------------------------------------- +mv -f ${logdir}/nightlyMakeDoc.log ${logdir}/nightlyMakeDoc.log~ +make doc &> ${logdir}/nightlyMakeDoc.log +ls -l ${logdir}/nightlyMakeDoc.log >> ${logdir}/nightlyMakeDoc.log + diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 65dbfddac..6c884b2cf 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -426,7 +426,7 @@ check: -${MAKE} -C ${SCHEDULER_CLIENT_DIR} check -${MAKE} -C ${WIDGETS_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 diff --git a/livesupport/etc/testResults.xml b/livesupport/etc/testResults.xml index 5cee28ac5..46c5da096 100644 --- a/livesupport/etc/testResults.xml +++ b/livesupport/etc/testResults.xml @@ -10,7 +10,7 @@ - + ]> diff --git a/livesupport/src/products/gLiveSupport/etc/testResultToHtml.xsl b/livesupport/src/products/gLiveSupport/etc/testResultToHtml.xsl new file mode 100644 index 000000000..d2165c2a4 --- /dev/null +++ b/livesupport/src/products/gLiveSupport/etc/testResultToHtml.xsl @@ -0,0 +1,63 @@ + + + + + + + LiveSupport unit test results + + +

Preface

+This document is part of the +LiveSupport +project, Copyright © 2004 Media +Development Loan Fund, under the GNU +GPL. +
+This is an automatically generated document. +

Scope

+This document contains the generated unit test results for the +LiveSupport project. +

Summary

+ + + + + + + + + + + + + + + + + + +
Total number of tests:
Tests passed:
Tests failed:
Test errors:
+ +

Tests

+ + + + + + + + + + + + + +
test nametest status
failedpassed
+ + + + + + diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx index c7052fe69..924e55a9e 100644 --- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx +++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx @@ -582,7 +582,9 @@ GLiveSupport :: login(const std::string & login, loadWindowPositions(); - masterPanel->createScratchpadWindow(); + if (masterPanel) { + masterPanel->createScratchpadWindow(); + } return true; } diff --git a/livesupport/src/products/gLiveSupport/src/ScratchpadWindow.cxx b/livesupport/src/products/gLiveSupport/src/ScratchpadWindow.cxx index 75010a46f..6ec2b756b 100644 --- a/livesupport/src/products/gLiveSupport/src/ScratchpadWindow.cxx +++ b/livesupport/src/products/gLiveSupport/src/ScratchpadWindow.cxx @@ -636,7 +636,7 @@ ScratchpadWindow :: addItem(Ptr::Ref playable) // cache the item if it hasn't been cached yet if (!playable->getToken()) { try { - gLiveSupport->acquirePlayable(playable->getId()); + playable = gLiveSupport->acquirePlayable(playable->getId()); } catch (XmlRpcException &e) { std::cerr << "could not acquire playable in ScratchpadWindow: " << e.what() << std::endl;