created the nightly build script (part of #1466)

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
+

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
 

livesupport/etc/testResults.xml

@@ -10,7 +10,7 @@
 <!ENTITY schedulerClientResults SYSTEM "../src/modules/schedulerClient/doc/testResults.xml" >
 <!ENTITY storageClientResults SYSTEM "../src/modules/storageClient/doc/testResults.xml" >
 <!ENTITY schedulerResults SYSTEM "../src/products/scheduler/doc/testResults.xml" >
-<!ENTITY gLiveSupportResults SYSTEM "../src/products/scheduler/doc/testResults.xml" >
+<!ENTITY gLiveSupportResults SYSTEM "../src/products/gLiveSupport/doc/testResults.xml" >
 
 ]>
 <TestResults>

livesupport/src/products/gLiveSupport/etc/testResultToHtml.xsl

@@ -0,0 +1,63 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template match="/">
+<html>
+<head>
+    <title>LiveSupport unit test results</title>
+</head>
+<body>
+<h1>Preface</h1>
+This document is part of the
+<a href="http://livesupport.campware.org/">LiveSupport</a>
+project, Copyright &#169; 2004 <a href="http://www.mdlf.org/">Media
+Development Loan Fund</a>, under the GNU
+<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>.
+<br/>
+This is an automatically generated document.
+<h1>Scope</h1>
+This document contains the generated unit test results for the
+<a href="http://livesupport.campware.org/">LiveSupport</a> project.
+<h1>Summary</h1>
+<xsl:for-each select="//Statistics">
+<table>
+    <tr>
+        <td><b>Total number of tests:</b></td>
+        <td><xsl:value-of select="Tests"/></td>
+    </tr>
+    <tr>
+        <td><b>Tests passed:</b></td>
+        <td><xsl:value-of select="count(/*/SuccessfulTests/Test)"/></td>
+    </tr>
+    <tr>
+        <td><b>Tests failed:</b></td>
+        <td><xsl:value-of select="Failures"/></td>
+    </tr>
+    <tr>
+        <td><b>Test errors:</b></td>
+        <td><xsl:value-of select="Errors"/></td>
+    </tr>
+</table>
+</xsl:for-each>
+<h1>Tests</h1>
+<table>
+    <tr>
+        <th>test name</th>
+        <th>test status</th>
+    </tr>
+<xsl:for-each select="//Test | //FailedTest">
+    <xsl:sort select="Name"/>
+    <tr>
+        <td><xsl:value-of select="Name"/></td>
+        <xsl:if test="ancestor::FailedTests"><td bgcolor="red">failed</td></xsl:if>
+        <xsl:if test="ancestor::SuccessfulTests"><td bgcolor="lightblue">passed</td></xsl:if>
+    </tr>
+</xsl:for-each>
+</table>
+</body>
+</html>
+</xsl:template>
+
+</xsl:stylesheet>
+

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;
 }

livesupport/src/products/gLiveSupport/src/ScratchpadWindow.cxx

@@ -636,7 +636,7 @@ ScratchpadWindow :: addItem(Ptr<Playable>::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;