From d097fd47dbf6a53498740c5433c0a59d72a3da38 Mon Sep 17 00:00:00 2001 From: maroy Date: Mon, 1 Aug 2005 19:26:00 +0000 Subject: [PATCH] merged autoconf-install branch to main branch --- livesupport/bin/autogen.sh | 32 +- livesupport/bin/copyInstall.sh | 215 ------- .../bin/{install.sh => createDatabase.sh} | 182 +++--- livesupport/bin/dist.sh | 10 +- livesupport/bin/install-sh | 323 +++++++++++ livesupport/bin/postInstallGLiveSupport.sh | 275 --------- livesupport/bin/postInstallScheduler.sh | 542 ------------------ livesupport/bin/setupDeveopmentEnvironment.sh | 105 ++++ livesupport/configure | 8 +- livesupport/doc/gettingStarted.html | 36 +- livesupport/doc/install.html | 82 ++- livesupport/etc/Makefile.in | 245 ++++++-- livesupport/etc/acinclude.m4 | 204 +++++++ livesupport/etc/configure.ac | 406 ++++++++++++- livesupport/modules/alib/bin/autogen.sh | 101 ++++ livesupport/modules/alib/configure | 52 ++ .../alib/{Makefile => etc/Makefile.in} | 28 +- livesupport/modules/alib/etc/configure.ac | 45 ++ .../modules/archiveServer/bin/autogen.sh | 101 ++++ livesupport/modules/archiveServer/configure | 52 ++ .../etc/Makefile.in} | 90 ++- .../modules/archiveServer/etc/configure.ac | 138 +++++ .../archiveServer/var/conf.php.template | 6 +- livesupport/modules/authentication/configure | 52 ++ .../modules/authentication/etc/Makefile.in | 13 +- .../modules/authentication/etc/configure.ac | 21 +- livesupport/modules/core/configure | 52 ++ livesupport/modules/core/etc/Makefile.in | 13 +- livesupport/modules/core/etc/configure.ac | 20 +- .../splayTest.sh => modules/db/configure} | 30 +- livesupport/modules/db/etc/Makefile.in | 13 +- livesupport/modules/db/etc/configure.ac | 24 +- livesupport/modules/eventScheduler/configure | 52 ++ .../modules/eventScheduler/etc/Makefile.in | 13 +- .../modules/eventScheduler/etc/configure.ac | 21 +- livesupport/modules/getid3/bin/autogen.sh | 101 ++++ livesupport/modules/getid3/configure | 52 ++ .../getid3/{Makefile => etc/Makefile.in} | 22 +- livesupport/modules/getid3/etc/configure.ac | 45 ++ .../modules/gstreamerElements/configure | 52 ++ .../modules/gstreamerElements/etc/Makefile.in | 19 +- .../gstreamerElements/etc/configure.ac | 19 +- livesupport/modules/htmlUI/.htaccess | 12 - livesupport/modules/htmlUI/bin/autogen.sh | 101 ++++ .../modules/htmlUI/bin/configureApache.sh | 150 +++++ livesupport/modules/htmlUI/configure | 52 ++ .../htmlUI/etc/90_php_livesupport.conf | 2 + livesupport/modules/htmlUI/etc/Makefile.in | 228 ++++++++ livesupport/modules/htmlUI/etc/configure.ac | 96 ++++ .../modules/htmlUI/var/Smarty/ChangeLog | 2 +- .../var/Smarty/libs/Config_File.class.php | 2 +- .../htmlUI/var/Smarty/libs/Smarty.class.php | 2 +- .../var/Smarty/libs/Smarty_Compiler.class.php | 2 +- livesupport/modules/htmlUI/var/redirect.php | 3 + .../var/ui_schedulerPhpClient.class.php | 4 +- .../modules/playlistExecutor/configure | 52 ++ .../modules/playlistExecutor/etc/Makefile.in | 13 +- .../modules/playlistExecutor/etc/configure.ac | 21 +- livesupport/modules/schedulerClient/configure | 52 ++ .../modules/schedulerClient/etc/Makefile.in | 23 +- .../modules/schedulerClient/etc/configure.ac | 21 +- livesupport/modules/storage/configure | 52 ++ livesupport/modules/storage/etc/Makefile.in | 13 +- livesupport/modules/storage/etc/configure.ac | 23 +- .../modules/storageAdmin/bin/autogen.sh | 101 ++++ livesupport/modules/storageAdmin/configure | 52 ++ .../Makefile => storageAdmin/etc/Makefile.in} | 88 +-- .../modules/storageAdmin/etc/configure.ac | 45 ++ .../storageAdmin/var/conf.php.template | 6 +- .../modules/storageServer/bin/autogen.sh | 101 ++++ .../storageServer/bin/createDatabase.sh | 216 +++++++ livesupport/modules/storageServer/configure | 52 ++ .../modules/storageServer/etc/Makefile.in | 258 +++++++++ .../modules/storageServer/etc/configure.ac | 184 ++++++ .../modules/storageServer/var/conf.php | 6 +- .../storageServer/var/conf.php.template | 6 +- livesupport/modules/widgets/configure | 52 ++ livesupport/modules/widgets/etc/Makefile.in | 45 +- livesupport/modules/widgets/etc/configure.ac | 23 +- .../widgets/var/imageButton/masterPause.png | Bin 0 -> 1079 bytes .../var/imageButton/masterPauseRoll.png | Bin 0 -> 1080 bytes .../products/gLiveSupport/bin/gLiveSupport.sh | 6 +- livesupport/products/gLiveSupport/configure | 52 ++ .../products/gLiveSupport/etc/Makefile.in | 85 ++- .../products/gLiveSupport/etc/configure.ac | 161 +++++- .../etc/gLiveSupport.xml.template | 12 +- .../products/scheduler/bin/createDatabase.sh | 216 +++++++ .../scheduler/bin/createOdbcDataSource.sh | 190 ++++++ .../products/scheduler/bin/scheduler.sh | 6 +- livesupport/products/scheduler/configure | 52 ++ .../products/scheduler/etc/Makefile.in | 98 +++- .../products/scheduler/etc/configure.ac | 193 ++++++- .../scheduler/etc/scheduler.xml.template | 6 +- .../tools/boost/boost-1.31/bin/autogen.sh | 87 +++ .../tools/boost/boost-1.31/bin/install-sh | 323 +++++++++++ .../boost-1.31/bin/{install.sh => prepare.sh} | 30 +- .../tools/boost/boost-1.31/etc/Makefile.in | 85 +++ .../tools/boost/boost-1.31/etc/configure.ac | 50 ++ .../tools/boost/boost-1.31/tmp/.keepme | 1 + .../cppunit/cppunit-1.10.2/bin/autogen.sh | 101 ++++ .../cppunit/cppunit-1.10.2/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 28 +- .../cppunit/cppunit-1.10.2/etc/Makefile.in | 72 +++ .../cppunit/cppunit-1.10.2/etc/configure.ac | 53 ++ .../tools/curl/curl-7.12.3/bin/autogen.sh | 101 ++++ .../tools/curl/curl-7.12.3/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 29 +- .../tools/curl/curl-7.12.3/etc/Makefile.in | 72 +++ .../tools/curl/curl-7.12.3/etc/configure.ac | 53 ++ .../gstreamer/gstreamer-0.8.10/bin/autogen.sh | 101 ++++ .../gstreamer/gstreamer-0.8.10/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 77 +-- .../gstreamer-0.8.10/etc/Makefile.in | 106 ++++ .../gstreamer-0.8.10/etc/configure.ac | 50 ++ .../tools/gtk+/gtk+-2.6.1/bin/autogen.sh | 101 ++++ .../tools/gtk+/gtk+-2.6.1/bin/install-sh | 323 +++++++++++ .../gtk+-2.6.1/bin/{install.sh => prepare.sh} | 89 ++- .../tools/gtk+/gtk+-2.6.1/etc/Makefile.in | 121 ++++ .../tools/gtk+/gtk+-2.6.1/etc/configure.ac | 50 ++ livesupport/tools/gtk+/gtk+-2.6.1/tmp/.keepme | 1 + .../tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh | 101 ++++ .../tools/gtkmm/gtkmm-2.5.5/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 64 +-- .../tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in | 95 +++ .../tools/gtkmm/gtkmm-2.5.5/etc/configure.ac | 50 ++ .../tools/gtkmm/gtkmm-2.5.5/tmp/.keepme | 1 + livesupport/tools/icu/icu-3.0/bin/autogen.sh | 101 ++++ livesupport/tools/icu/icu-3.0/bin/install-sh | 323 +++++++++++ .../icu-3.0/bin/{install.sh => prepare.sh} | 48 +- livesupport/tools/icu/icu-3.0/etc/Makefile.in | 79 +++ .../tools/icu/icu-3.0/etc/configure.ac | 54 ++ .../tools/lcov/lcov-1.3/bin/autogen.sh | 101 ++++ .../tools/lcov/lcov-1.3/bin/install-sh | 323 +++++++++++ .../lcov-1.3/bin/{install.sh => prepare.sh} | 38 +- .../tools/lcov/lcov-1.3/etc/Makefile.in | 81 +++ .../tools/lcov/lcov-1.3/etc/configure.ac | 50 ++ .../etc/lcov-1.3-install-to-prefix.patch | 13 + .../libodbc++-0.2.3-20050404/bin/autogen.sh | 101 ++++ .../libodbc++-0.2.3-20050404/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 42 +- .../libodbc++-0.2.3-20050404/etc/Makefile.in | 78 +++ .../libodbc++-0.2.3-20050404/etc/configure.ac | 54 ++ .../libxml++/libxml++-2.8.1/bin/autogen.sh | 96 ++++ .../libxml++/libxml++-2.8.1/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 51 +- .../libxml++/libxml++-2.8.1/etc/Makefile.in | 102 ++++ .../libxml++/libxml++-2.8.1/etc/configure.ac | 50 ++ .../tools/libxml++/libxml++-2.8.1/tmp/.keepme | 1 + .../bin/install.sh => pear/bin/autogen.sh} | 94 +-- livesupport/tools/pear/bin/install.sh | 96 ++-- livesupport/tools/pear/etc/Makefile.in | 65 +++ livesupport/tools/pear/etc/configure.ac | 43 ++ .../tools/taglib/taglib-1.3.1/bin/autogen.sh | 101 ++++ .../tools/taglib/taglib-1.3.1/bin/install-sh | 323 +++++++++++ .../tools/taglib/taglib-1.3.1/bin/prepare.sh | 55 ++ .../tools/taglib/taglib-1.3.1/etc/Makefile.in | 90 +++ .../taglib/taglib-1.3.1/etc/configure.ac | 54 ++ .../xmlrpc++/xmlrpc++-20040713/bin/autogen.sh | 101 ++++ .../xmlrpc++/xmlrpc++-20040713/bin/install-sh | 323 +++++++++++ .../bin/{install.sh => prepare.sh} | 44 +- .../xmlrpc++-20040713/etc/Makefile.in | 78 +++ .../xmlrpc++-20040713/etc/configure.ac | 55 ++ .../etc/xmlrpc++-automake.patch | 4 +- 163 files changed, 12931 insertions(+), 1884 deletions(-) delete mode 100755 livesupport/bin/copyInstall.sh rename livesupport/bin/{install.sh => createDatabase.sh} (55%) create mode 100755 livesupport/bin/install-sh delete mode 100755 livesupport/bin/postInstallGLiveSupport.sh delete mode 100755 livesupport/bin/postInstallScheduler.sh create mode 100755 livesupport/bin/setupDeveopmentEnvironment.sh create mode 100644 livesupport/etc/acinclude.m4 create mode 100755 livesupport/modules/alib/bin/autogen.sh create mode 100755 livesupport/modules/alib/configure rename livesupport/modules/alib/{Makefile => etc/Makefile.in} (88%) create mode 100644 livesupport/modules/alib/etc/configure.ac create mode 100755 livesupport/modules/archiveServer/bin/autogen.sh create mode 100755 livesupport/modules/archiveServer/configure rename livesupport/modules/{storageServer/Makefile => archiveServer/etc/Makefile.in} (70%) create mode 100644 livesupport/modules/archiveServer/etc/configure.ac create mode 100755 livesupport/modules/authentication/configure create mode 100755 livesupport/modules/core/configure rename livesupport/{bin/splayTest.sh => modules/db/configure} (76%) create mode 100755 livesupport/modules/eventScheduler/configure create mode 100755 livesupport/modules/getid3/bin/autogen.sh create mode 100755 livesupport/modules/getid3/configure rename livesupport/modules/getid3/{Makefile => etc/Makefile.in} (91%) create mode 100644 livesupport/modules/getid3/etc/configure.ac create mode 100755 livesupport/modules/gstreamerElements/configure delete mode 100644 livesupport/modules/htmlUI/.htaccess create mode 100755 livesupport/modules/htmlUI/bin/autogen.sh create mode 100755 livesupport/modules/htmlUI/bin/configureApache.sh create mode 100755 livesupport/modules/htmlUI/configure create mode 100644 livesupport/modules/htmlUI/etc/90_php_livesupport.conf create mode 100644 livesupport/modules/htmlUI/etc/Makefile.in create mode 100644 livesupport/modules/htmlUI/etc/configure.ac create mode 100644 livesupport/modules/htmlUI/var/redirect.php create mode 100755 livesupport/modules/playlistExecutor/configure create mode 100755 livesupport/modules/schedulerClient/configure create mode 100755 livesupport/modules/storage/configure create mode 100755 livesupport/modules/storageAdmin/bin/autogen.sh create mode 100755 livesupport/modules/storageAdmin/configure rename livesupport/modules/{archiveServer/Makefile => storageAdmin/etc/Makefile.in} (75%) create mode 100644 livesupport/modules/storageAdmin/etc/configure.ac create mode 100755 livesupport/modules/storageServer/bin/autogen.sh create mode 100755 livesupport/modules/storageServer/bin/createDatabase.sh create mode 100755 livesupport/modules/storageServer/configure create mode 100644 livesupport/modules/storageServer/etc/Makefile.in create mode 100644 livesupport/modules/storageServer/etc/configure.ac create mode 100755 livesupport/modules/widgets/configure create mode 100644 livesupport/modules/widgets/var/imageButton/masterPause.png create mode 100644 livesupport/modules/widgets/var/imageButton/masterPauseRoll.png create mode 100755 livesupport/products/gLiveSupport/configure create mode 100755 livesupport/products/scheduler/bin/createDatabase.sh create mode 100755 livesupport/products/scheduler/bin/createOdbcDataSource.sh create mode 100755 livesupport/products/scheduler/configure create mode 100755 livesupport/tools/boost/boost-1.31/bin/autogen.sh create mode 100755 livesupport/tools/boost/boost-1.31/bin/install-sh rename livesupport/tools/boost/boost-1.31/bin/{install.sh => prepare.sh} (79%) create mode 100644 livesupport/tools/boost/boost-1.31/etc/Makefile.in create mode 100644 livesupport/tools/boost/boost-1.31/etc/configure.ac create mode 100644 livesupport/tools/boost/boost-1.31/tmp/.keepme create mode 100755 livesupport/tools/cppunit/cppunit-1.10.2/bin/autogen.sh create mode 100755 livesupport/tools/cppunit/cppunit-1.10.2/bin/install-sh rename livesupport/tools/cppunit/cppunit-1.10.2/bin/{install.sh => prepare.sh} (77%) create mode 100644 livesupport/tools/cppunit/cppunit-1.10.2/etc/Makefile.in create mode 100644 livesupport/tools/cppunit/cppunit-1.10.2/etc/configure.ac create mode 100755 livesupport/tools/curl/curl-7.12.3/bin/autogen.sh create mode 100755 livesupport/tools/curl/curl-7.12.3/bin/install-sh rename livesupport/tools/curl/curl-7.12.3/bin/{install.sh => prepare.sh} (77%) create mode 100644 livesupport/tools/curl/curl-7.12.3/etc/Makefile.in create mode 100644 livesupport/tools/curl/curl-7.12.3/etc/configure.ac create mode 100755 livesupport/tools/gstreamer/gstreamer-0.8.10/bin/autogen.sh create mode 100755 livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install-sh rename livesupport/tools/gstreamer/gstreamer-0.8.10/bin/{install.sh => prepare.sh} (53%) create mode 100644 livesupport/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in create mode 100644 livesupport/tools/gstreamer/gstreamer-0.8.10/etc/configure.ac create mode 100755 livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh create mode 100755 livesupport/tools/gtk+/gtk+-2.6.1/bin/install-sh rename livesupport/tools/gtk+/gtk+-2.6.1/bin/{install.sh => prepare.sh} (62%) create mode 100644 livesupport/tools/gtk+/gtk+-2.6.1/etc/Makefile.in create mode 100644 livesupport/tools/gtk+/gtk+-2.6.1/etc/configure.ac create mode 100644 livesupport/tools/gtk+/gtk+-2.6.1/tmp/.keepme create mode 100755 livesupport/tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh create mode 100755 livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install-sh rename livesupport/tools/gtkmm/gtkmm-2.5.5/bin/{install.sh => prepare.sh} (68%) create mode 100644 livesupport/tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in create mode 100644 livesupport/tools/gtkmm/gtkmm-2.5.5/etc/configure.ac create mode 100644 livesupport/tools/gtkmm/gtkmm-2.5.5/tmp/.keepme create mode 100755 livesupport/tools/icu/icu-3.0/bin/autogen.sh create mode 100755 livesupport/tools/icu/icu-3.0/bin/install-sh rename livesupport/tools/icu/icu-3.0/bin/{install.sh => prepare.sh} (72%) create mode 100644 livesupport/tools/icu/icu-3.0/etc/Makefile.in create mode 100644 livesupport/tools/icu/icu-3.0/etc/configure.ac create mode 100755 livesupport/tools/lcov/lcov-1.3/bin/autogen.sh create mode 100755 livesupport/tools/lcov/lcov-1.3/bin/install-sh rename livesupport/tools/lcov/lcov-1.3/bin/{install.sh => prepare.sh} (73%) create mode 100644 livesupport/tools/lcov/lcov-1.3/etc/Makefile.in create mode 100644 livesupport/tools/lcov/lcov-1.3/etc/configure.ac create mode 100644 livesupport/tools/lcov/lcov-1.3/etc/lcov-1.3-install-to-prefix.patch create mode 100755 livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/autogen.sh create mode 100755 livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install-sh rename livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/{install.sh => prepare.sh} (68%) create mode 100644 livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/Makefile.in create mode 100644 livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/configure.ac create mode 100755 livesupport/tools/libxml++/libxml++-2.8.1/bin/autogen.sh create mode 100755 livesupport/tools/libxml++/libxml++-2.8.1/bin/install-sh rename livesupport/tools/libxml++/libxml++-2.8.1/bin/{install.sh => prepare.sh} (66%) create mode 100644 livesupport/tools/libxml++/libxml++-2.8.1/etc/Makefile.in create mode 100644 livesupport/tools/libxml++/libxml++-2.8.1/etc/configure.ac create mode 100644 livesupport/tools/libxml++/libxml++-2.8.1/tmp/.keepme rename livesupport/tools/{taglib/taglib-1.3.1/bin/install.sh => pear/bin/autogen.sh} (53%) create mode 100644 livesupport/tools/pear/etc/Makefile.in create mode 100644 livesupport/tools/pear/etc/configure.ac create mode 100755 livesupport/tools/taglib/taglib-1.3.1/bin/autogen.sh create mode 100755 livesupport/tools/taglib/taglib-1.3.1/bin/install-sh create mode 100755 livesupport/tools/taglib/taglib-1.3.1/bin/prepare.sh create mode 100644 livesupport/tools/taglib/taglib-1.3.1/etc/Makefile.in create mode 100644 livesupport/tools/taglib/taglib-1.3.1/etc/configure.ac create mode 100755 livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/autogen.sh create mode 100755 livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install-sh rename livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/{install.sh => prepare.sh} (66%) create mode 100644 livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/Makefile.in create mode 100644 livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/configure.ac diff --git a/livesupport/bin/autogen.sh b/livesupport/bin/autogen.sh index 84ed11a18..1791efe8e 100755 --- a/livesupport/bin/autogen.sh +++ b/livesupport/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -53,6 +53,14 @@ DIE=0 DIE=1 } +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + if test "$DIE" -eq 1; then exit 1 fi @@ -68,13 +76,21 @@ configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure aclocal_m4=${tmpdir}/aclocal.m4 -if [ -f ${etcdir}/acinclude.m4 ]; then -# run aclocal in etc, as it's blind, only sees files in the current directory - ACLOCAL_FLAGS="--output=${aclocal_m4}" - echo " aclocal $ACLOCAL_FLAGS" - cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} -fi +# copy over install-sh, as it's going to be missed by autoconf +cp -f ${bindir}/install-sh ${tmpdir} + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cp -f ${configure_ac} ${tmpdir} +cp -f ${etcdir}/acinclude.m4 ${tmpdir} +aclocal $ACLOCAL_FLAGS + echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" autoconf -I ${tmpdir} -o ${configure} ${configure_ac} -${configure} "$@" && echo +#${configure} "$@" && echo + diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh deleted file mode 100755 index 3f4101712..000000000 --- a/livesupport/bin/copyInstall.sh +++ /dev/null @@ -1,215 +0,0 @@ -#!/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: maroy $ -# Version : $Revision: 1.13 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# This script installs LiveSupport files to their installation location. -# -# Invoke as: -# ./bin/copyInstall.sh -# -# To get usage help, try the -h option -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Determine directories, files -#------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -docdir=$basedir/doc -tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products -gstreamer_lib_dir=$modules_dir/gstreamerElements/lib - -usrdir=`cd $basedir/usr; pwd;` - - -#------------------------------------------------------------------------------- -# Print the usage information for this script. -#------------------------------------------------------------------------------- -printUsage() -{ - echo "LiveSupport install copy script."; - echo "parameters"; - echo ""; - echo " -d, --directory The installation directory, required."; - echo " -h, --help Print this message and exit."; - echo ""; -} - - -#------------------------------------------------------------------------------- -# Process command line parameters -#------------------------------------------------------------------------------- -CMD=${0##*/} - -opts=$(getopt -o d:h -l directory:,help -n $CMD -- "$@") || exit 1 -eval set -- "$opts" -while true; do - case "$1" in - -d|--directory) - installdir=$2; - shift; shift;; - -h|--help) - printUsage; - exit 0;; - --) - shift; - break;; - *) - echo "Unrecognized option $1."; - printUsage; - exit 1; - esac -done - -if [ "x$installdir" == "x" ]; then - echo "Required parameter install directory not specified."; - printUsage; - exit 1; -fi - - -echo "Installing LiveSupport files."; -echo ""; -echo "Using the following installation parameters:"; -echo ""; -echo " installation directory: $installdir"; -echo "" - - -#------------------------------------------------------------------------------- -# The details of installation -#------------------------------------------------------------------------------- -install_bin=$installdir/bin -install_etc=$installdir/etc -install_lib=$installdir/lib -install_tmp=$installdir/tmp -install_usr=$installdir/usr -install_var=$installdir/var - - -#------------------------------------------------------------------------------- -# Create the installation directory structure -#------------------------------------------------------------------------------- -echo "Copying files..." - -mkdir -p $installdir -mkdir -p $install_bin -mkdir -p $install_etc -mkdir -p $install_lib -mkdir -p $install_tmp -mkdir -p $install_usr -mkdir -p $install_var - - -#------------------------------------------------------------------------------- -# Copy the PHP files -#------------------------------------------------------------------------------- -mkdir $install_var/getid3 -cp -pPR $modules_dir/getid3/var $install_var/getid3 - -mkdir $install_var/alib -cp -pPR $modules_dir/alib/var $install_var/alib - -mkdir $install_var/storageServer -cp -pPR $modules_dir/storageServer/var $install_var/storageServer - -mkdir $install_var/archiveServer -cp -pPR $modules_dir/archiveServer/var $install_var/archiveServer - -mkdir $install_var/htmlUI -cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI - -cp -pPR $modules_dir/storageAdmin/bin $install_usr -cp -pPR $modules_dir/storageAdmin/var $install_usr - -mkdir -p $install_usr/lib -cp -pPR $toolsdir/pear $install_usr/lib - - -#------------------------------------------------------------------------------- -# Copy libraries and related files -#------------------------------------------------------------------------------- -cp -pPR $usrdir/lib/* $install_lib -cp -pPR $usrdir/etc/* $install_etc - - -#------------------------------------------------------------------------------- -# Copy our gstreamer elements and create the gstreamer registry -#------------------------------------------------------------------------------- -gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` - -cp -pPR $usrdir/bin/gst-* $install_bin -cp -pPR $modules_dir/gstreamerElements/lib/lib*.so $gstreamer_dir - - -#------------------------------------------------------------------------------- -# Copy scheduler related files -#------------------------------------------------------------------------------- -cp -pPR $products_dir/scheduler/tmp/scheduler $install_bin -cp -pPR $products_dir/scheduler/bin/scheduler.sh $install_bin - - -#------------------------------------------------------------------------------- -# Copy gLiveSupport related files -#------------------------------------------------------------------------------- -cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport $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/livesupport.png $install_var -cp -pPR $products_dir/gLiveSupport/var/stationLogo.png $install_var -cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport*.res $install_var - - -#------------------------------------------------------------------------------- -# Copy post-installation configuration related files -#------------------------------------------------------------------------------- -cp -pPR $bindir/postInstallScheduler.sh $install_bin -cp -pPR $bindir/postInstallGLiveSupport.sh $install_bin -cp -pPR $etcdir/apache $install_etc -cp -pPR $products_dir/scheduler/etc/scheduler.xml.template $install_etc -cp -pPR $products_dir/scheduler/etc/odbcinst_template $install_etc -cp -pPR $products_dir/scheduler/etc/odbcinst_debian_template $install_etc -cp -pPR $products_dir/scheduler/etc/odbc_template $install_etc -cp -pPR $products_dir/gLiveSupport/etc/gLiveSupport.xml.template $install_etc - - -#------------------------------------------------------------------------------- -# Clean up remnants of the CVS system -#------------------------------------------------------------------------------- -rm -rf `find $install_var -type d -name CVS` - - -#------------------------------------------------------------------------------- -# Say goodbye -#------------------------------------------------------------------------------- -echo "Done." - diff --git a/livesupport/bin/install.sh b/livesupport/bin/createDatabase.sh similarity index 55% rename from livesupport/bin/install.sh rename to livesupport/bin/createDatabase.sh index 759aae136..16ecc9d94 100755 --- a/livesupport/bin/install.sh +++ b/livesupport/bin/createDatabase.sh @@ -22,14 +22,14 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.14 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/createDatabase.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script installs LiveSupport. +# This script reates the database used by LiveSupport # # Invoke as: -# ./bin/install.sh +# ./bin/createDatabase.sh # # To get usage help, try the -h option #------------------------------------------------------------------------------- @@ -43,11 +43,7 @@ bindir=$basedir/bin etcdir=$basedir/etc docdir=$basedir/doc tmpdir=$basedir/tmp -toolsdir=$basedir/tools -modules_dir=$basedir/modules -products_dir=$basedir/products - -usrdir=`cd $basedir/usr; pwd;` +usrdir=$basedir/usr #------------------------------------------------------------------------------- @@ -55,21 +51,11 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport install script."; + echo "LiveSupport scheduler database creation script."; echo "parameters"; echo ""; - echo " -d, --directory The installation directory, required."; echo " -D, --database The name of the LiveSupport database."; echo " [default: LiveSupport]"; - echo " -g, --apache-group The group the apache daemon runs as."; - echo " [default: apache]"; - echo " -H, --host The fully qualified host name of the system"; - echo " [default: guess]."; - echo " -p, --port The port of the apache web server [default: 80]" - echo " -P, --scheduler-port The port of the scheduler daemon to install" - echo " [default: 3344]"; - echo " -r, --www-root The root directory for web documents served"; - echo " by apache [default: /var/www]"; echo " -s, --dbserver The name of the database server host."; echo " [default: localhost]"; echo " -u, --dbuser The name of the database user to access the" @@ -86,34 +72,16 @@ printUsage() #------------------------------------------------------------------------------- CMD=${0##*/} -opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root: -n $CMD -- "$@") || exit 1 +opts=$(getopt -o D:hs:u:w: -l database:,dbserver:,dbuser:,dbpassword:,help, -n $CMD -- "$@") || exit 1 eval set -- "$opts" while true; do case "$1" in - -d|--directory) - installdir=$2; - shift; shift;; -D|--database) database=$2; shift; shift;; - -g|--apache-group) - apache_group=$2; - shift; shift;; - -H|--host) - hostname=$2; - shift; shift;; -h|--help) printUsage; exit 0;; - -p|--port) - http_port=$2; - shift; shift;; - -P|--scheduler-port) - scheduler_port=$2; - shift; shift;; - -r|--www-root) - www_root=$2; - shift; shift;; -s|--dbserver) dbserver=$2; shift; shift;; @@ -133,24 +101,6 @@ while true; do esac done -if [ "x$installdir" == "x" ]; then - echo "Required parameter install directory not specified."; - printUsage; - exit 1; -fi - -if [ "x$hostname" == "x" ]; then - hostname=`hostname -f`; -fi - -if [ "x$http_port" == "x" ]; then - http_port=80; -fi - -if [ "x$scheduler_port" == "x" ]; then - scheduler_port=3344; -fi - if [ "x$dbserver" == "x" ]; then dbserver=localhost; fi @@ -167,76 +117,98 @@ if [ "x$dbpassword" == "x" ]; then dbpassword=livesupport; fi -if [ "x$apache_group" == "x" ]; then - apache_group=apache; -fi - -if [ "x$www_root" == "x" ]; then - www_root=/var/www -fi - - -echo "Installing LiveSupport."; +echo "Creating database for LiveSupport scheduler."; echo ""; -echo "Using the following installation parameters:"; +echo "Using the following parameters:"; echo ""; -echo " installation directory: $installdir"; -echo " host name: $hostname"; -echo " web server port: $http_port"; -echo " scheduler port: $scheduler_port"; echo " database server: $dbserver"; echo " database: $database"; echo " database user: $dbuser"; echo " database user password: $dbpassword"; -echo " apache daemon group: $apache_group"; -echo " apache document root: $www_root"; echo "" +#------------------------------------------------------------------------------- +# The details of installation +#------------------------------------------------------------------------------- +ls_dbserver=$dbserver +ls_dbuser=$dbuser +ls_dbpassword=$dbpassword +ls_database=$database + + +postgres_user=postgres #------------------------------------------------------------------------------- -# Check if we're in the CVS, and bail out if so +# Function to check for the existence of an executable on the PATH +# +# @param $1 the name of the exectuable +# @return 0 if the executable exists on the PATH, non-0 otherwise #------------------------------------------------------------------------------- -if [ -f CVS/Root ]; then - echo "ERROR: this script is not intended to be run from the CVS sources."; - echo " run this script from inside the source tarball"; - exit 1; +check_exe() { + if [ -x "`which $1 2> /dev/null`" ]; then + echo "Executable $1 found..."; + return 0; + else + echo "Executable $1 not found..."; + return 1; + fi +} + + +#------------------------------------------------------------------------------- +# Check to see if this script is being run as root +#------------------------------------------------------------------------------- +if [ `whoami` != "root" ]; then + echo "Please run this script as root."; + exit ; fi #------------------------------------------------------------------------------- -# Do pre-install checks +# Check for required tools #------------------------------------------------------------------------------- -$bindir/preInstall.sh --apache-group $apache_group || exit 1; +echo "Checking for required tools..." + +check_exe "su" || exit 1; +check_exe "psql" || exit 1; #------------------------------------------------------------------------------- -# Copy the files +# Create the necessary database user and database itself #------------------------------------------------------------------------------- -$bindir/copyInstall.sh --directory $installdir || exit 1; - - -#------------------------------------------------------------------------------- -# Do post-install setup -#------------------------------------------------------------------------------- -$installdir/bin/postInstallScheduler.sh --directory $installdir \ - --database $database \ - --apache-group $apache_group \ - --host $hostname \ - --port $http_port \ - --scheduler-port $scheduler_port \ - --dbserver $dbserver \ - --dbuser $dbuser \ - --dbpassword $dbpassword \ - --www-root $www_root \ - || exit 1; - -$installdir/bin/postInstallGLiveSupport.sh --directory $installdir \ - --host $hostname \ - --port $http_port \ - --scheduler-port $scheduler_port \ - || exit 1; +echo "Creating database and database user..."; + +# FIXME: the below might not work for remote databases + +if [ "x$ls_dbserver" == "xlocalhost" ]; then + su - $postgres_user -c "echo \"CREATE USER $ls_dbuser \ + ENCRYPTED PASSWORD '$ls_dbpassword' \ + CREATEDB NOCREATEUSER;\" \ + | psql template1" \ + || echo "Couldn't create database user $ls_dbuser."; + + su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \ + OWNER $ls_dbuser ENCODING 'utf-8';\" \ + | psql template1" \ + || echo "Couldn't create database $ls_database."; +else + echo "Unable to automatically create database user and table for"; + echo "remote database $ls_dbserver."; + echo "Make sure to create database user $ls_dbuser with password"; + echo "$ls_dbpassword on database server at $ls_dbserver."; + echo "Also create a database called $ld_database, owned by this user."; + echo ""; + echo "The easiest way to achieve this is by issuing the following SQL"; + echo "commands to PostgreSQL:"; + echo "CREATE USER $ls_dbuser"; + echo " ENCRYPTED PASSWORD '$ls_dbpassword'"; + echo " CREATEDB NOCREATEUSER;"; + echo "CREATE DATABASE \"$ls_database\""; + echo " OWNER $ls_dbuser ENCODING 'utf-8';"; +fi +# TODO: check for the success of these operations somehow #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh index edbd28215..e5f47791d 100755 --- a/livesupport/bin/dist.sh +++ b/livesupport/bin/dist.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.15 $ +# Version : $Revision: 1.16 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/dist.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -231,6 +231,14 @@ cp -pPR README INSTALL configure $ls_tmpdir rm -rf `find $ls_tmpdir -name CVS -type d` +#------------------------------------------------------------------------------- +# Create the main configure script +#------------------------------------------------------------------------------- +cd $tmpdir/livesupport-$version +./bin/autogen.sh +cd $basedir + + #------------------------------------------------------------------------------- # Create the tarball #------------------------------------------------------------------------------- diff --git a/livesupport/bin/install-sh b/livesupport/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/bin/postInstallGLiveSupport.sh b/livesupport/bin/postInstallGLiveSupport.sh deleted file mode 100755 index 82d1a19d1..000000000 --- a/livesupport/bin/postInstallGLiveSupport.sh +++ /dev/null @@ -1,275 +0,0 @@ -#!/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: fgerlits $ -# Version : $Revision: 1.8 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $ -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# This script makes post-installation steps for GLiveSupport. -# -# Invoke as: -# ./bin/postInstallGLiveSupport.sh -# -# To get usage help, try the -h option -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Determine directories, files -#------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -docdir=$basedir/doc -tmpdir=$basedir/tmp - - -#------------------------------------------------------------------------------- -# Print the usage information for this script. -#------------------------------------------------------------------------------- -printUsage() -{ - echo "GLiveSupport post-install script."; - echo "parameters"; - echo ""; - echo " -d, --directory The installation directory, required."; - echo " -H, --host The fully qualified host name of the system"; - echo " [default: guess]."; - echo " -p, --port The port of the apache web server [default: 80]" - echo " -P, --scheduler-port The port of the scheduler daemon to install" - echo " [default: 3344]"; - echo " -o, --output-device The audio device of live-mode broadcast"; - echo " [default: plughw:0,0]"; - echo " -c, --cue-device The audio device of preview listening"; - echo " [default: plughw:0,0]"; - echo " -h, --help Print this message and exit."; - echo ""; -} - - -#------------------------------------------------------------------------------- -# Process command line parameters -#------------------------------------------------------------------------------- -CMD=${0##*/} - -opts=$(getopt -o d:H:hp:P:c:o: -l directory:,host:,help,port:,scheduler-port:,cue-device:,output-device: -n $CMD -- "$@") || exit 1 -eval set -- "$opts" -while true; do - case "$1" in - -d|--directory) - installdir=$2; - shift; shift;; - -H|--host) - hostname=$2; - shift; shift;; - -h|--help) - printUsage; - exit 0;; - -p|--port) - http_port=$2; - shift; shift;; - -P|--scheduler-port) - scheduler_port=$2; - shift; shift;; - -o|--output-device) - output_alsa_device=$2; - shift; shift;; - -c|--cue-device) - cue_alsa_device=$2; - shift; shift;; - --) - shift; - break;; - *) - echo "Unrecognized option $1."; - printUsage; - exit 1; - esac -done - -if [ "x$installdir" == "x" ]; then - echo "Required parameter install directory not specified."; - printUsage; - exit 1; -fi - -if [ "x$hostname" == "x" ]; then - hostname=`hostname -f`; -fi - -if [ "x$http_port" == "x" ]; then - http_port=80; -fi - -if [ "x$scheduler_port" == "x" ]; then - scheduler_port=3344; -fi - -if [ "x$output_alsa_device" == "x" ]; then - output_alsa_device="plughw:0,0"; -fi - -if [ "x$cue_alsa_device" == "x" ]; then - cue_alsa_device="plughw:0,0"; -fi - -echo "Making post-install steps for GLiveSupport."; -echo ""; -echo "Using the following installation parameters:"; -echo ""; -echo " installation directory: $installdir"; -echo " host name: $hostname"; -echo " web server port: $http_port"; -echo " scheduler port: $scheduler_port"; -echo " live broadcast device: $output_alsa_device"; -echo " preview device: $cue_alsa_device"; -echo "" - -#------------------------------------------------------------------------------- -# The details of installation -#------------------------------------------------------------------------------- -ls_php_host=$hostname -ls_php_port=$http_port -ls_php_urlPrefix=livesupport - -ls_alib_xmlRpcPrefix="xmlrpc/xrLocStor.php" -ls_storage_xmlRpcPrefix="xmlrpc/xrLocStor.php" - -ls_scheduler_host=$hostname -ls_scheduler_port=$scheduler_port -ls_scheduler_urlPrefix= -ls_scheduler_xmlRpcPrefix=RC2 -ls_output_alsa_device=$output_alsa_device -ls_cue_alsa_device=$cue_alsa_device - - -install_bin=$installdir/bin -install_etc=$installdir/etc -install_lib=$installdir/lib -install_tmp=$installdir/tmp -install_var=$installdir/var - - -# replace / characters with a \/ sequence, for sed below -# the sed statement is really "s/\//\\\\\//g", but needs escaping because of -# bash, hence the extra '\' characters -installdir_s=`echo $installdir | sed -e "s/\//\\\\\\\\\//g"` -ls_storage_xmlRpcPrefix_s=`echo $ls_storage_xmlRpcPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_alib_xmlRpcPrefix_s=`echo $ls_alib_xmlRpcPrefix | sed -e "s/\//\\\\\\\\\//g"` -ls_php_urlPrefix_s=`echo $ls_php_urlPrefix | sed -e "s/\//\\\\\\\\\//g"` -ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_output_alsa_device_s=`echo $ls_output_alsa_device | sed -e "s/\//\\\\\\\\\//g"` -ls_cue_alsa_device_s=`echo $ls_cue_alsa_device | sed -e "s/\//\\\\\\\\\//g"` - -replace_sed_string="s/ls_install_dir/$installdir_s/; \ - s/ls_storageUrlPath/\/$ls_php_urlPrefix_s\/storageServer\/var/; \ - s/ls_php_urlPrefix/$ls_php_urlPrefix_s/; \ - s/ls_storage_xmlRpcPrefix/$ls_storage_xmlRpcPrefix_s/; \ - s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \ - s/ls_php_host/$ls_php_host/; \ - s/ls_php_port/$ls_php_port/; \ - s/ls_output_alsa_device/$ls_output_alsa_device_s/; \ - s/ls_cue_alsa_device/$ls_cue_alsa_device_s/; \ - s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \ - s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \ - s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \ - s/ls_scheduler_host/$ls_scheduler_host/; \ - s/ls_scheduler_port/$ls_scheduler_port/;" - - - -#------------------------------------------------------------------------------- -# Function to check for the existence of an executable on the PATH -# -# @param $1 the name of the exectuable -# @return 0 if the executable exists on the PATH, non-0 otherwise -#------------------------------------------------------------------------------- -check_exe() { - if [ -x "`which $1 2> /dev/null`" ]; then - echo "Executable $1 found..."; - return 0; - else - echo "Executable $1 not found..."; - return 1; - fi -} - - -#------------------------------------------------------------------------------- -# Check for required tools -#------------------------------------------------------------------------------- -echo "Checking for required tools..." - -check_exe "sed" || exit 1; - - -#------------------------------------------------------------------------------- -# Customize the configuration files with the appropriate values -#------------------------------------------------------------------------------- -echo "Customizing configuration files..." - -tmp_file=/tmp/livesupport_setup.$$ - -# customize the GTK- config files, which have hard-coded values in them :( -cat $install_etc/gtk-2.0/gdk-pixbuf.loaders \ - | sed -e "s/^\"\/.*\/usr\/lib/\"$installdir_s\/lib/g" \ - > $tmp_file -mv -f $tmp_file $install_etc/gtk-2.0/gdk-pixbuf.loaders - -# customize the pango config files, which have hard-coded values in them :( -pango_rc=$install_etc/pango/pango.rc -echo "[Pango]" > $pango_rc -echo "ModuleFiles=$install_etc/pango/pango.modules" >> $pango_rc -cat $install_etc/pango/pango.modules \ - | sed -e "s/^\/.*\/usr\/lib/$installdir_s\/lib/g" \ - > $tmp_file -mv -f $tmp_file $install_etc/pango/pango.modules - -# customize the gLiveSupport config file -cat $install_etc/gLiveSupport.xml.template \ - | sed -e "$replace_sed_string" \ - > $install_etc/gLiveSupport.xml - - -#------------------------------------------------------------------------------- -# Create the gstreamer registry -#------------------------------------------------------------------------------- -echo "Creating gstreamer registry..."; - -gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` -export LD_LIBRARY_PATH=$install_lib -export GST_REGISTRY=$install_etc/gst-registry.xml -export GST_PLUGIN_PATH=$gstreamer_dir -$install_bin/gst-register > /dev/null 2>&1 - - -#------------------------------------------------------------------------------- -# Say goodbye -#------------------------------------------------------------------------------- -echo "Done." - diff --git a/livesupport/bin/postInstallScheduler.sh b/livesupport/bin/postInstallScheduler.sh deleted file mode 100755 index c2199030f..000000000 --- a/livesupport/bin/postInstallScheduler.sh +++ /dev/null @@ -1,542 +0,0 @@ -#!/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: fgerlits $ -# Version : $Revision: 1.9 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $ -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# This script makes post-installation steps for the LiveSupport scheduler. -# -# Invoke as: -# ./bin/postInstallScheduler.sh -# -# To get usage help, try the -h option -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Determine directories, files -#------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -docdir=$basedir/doc -tmpdir=$basedir/tmp -usrdir=$basedir/usr - - -#------------------------------------------------------------------------------- -# Print the usage information for this script. -#------------------------------------------------------------------------------- -printUsage() -{ - echo "LiveSupport scheduler post-install script."; - echo "parameters"; - echo ""; - echo " -d, --directory The installation directory, required."; - echo " -D, --database The name of the LiveSupport database."; - echo " [default: LiveSupport]"; - echo " -g, --apache-group The group the apache daemon runs as."; - echo " [default: apache]"; - echo " -H, --host The fully qualified host name of the system"; - echo " [default: guess]."; - echo " -p, --port The port of the apache web server [default: 80]" - echo " -P, --scheduler-port The port of the scheduler daemon to install" - echo " [default: 3344]"; - echo " -r, --www-root The root directory for web documents served"; - echo " by apache [default: /var/www]"; - echo " -s, --dbserver The name of the database server host."; - echo " [default: localhost]"; - echo " -u, --dbuser The name of the database user to access the" - echo " database. [default: livesupport]"; - echo " -w, --dbpassword The database user password."; - echo " [default: livesupport]"; - echo " -o, --output-device The audio device of broadcast"; - echo " [default: plughw:0,0]"; - echo " -h, --help Print this message and exit."; - echo ""; -} - - -#------------------------------------------------------------------------------- -# Process command line parameters -#------------------------------------------------------------------------------- -CMD=${0##*/} - -opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w:o: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root:,output-device -n $CMD -- "$@") || exit 1 -eval set -- "$opts" -while true; do - case "$1" in - -d|--directory) - installdir=$2; - shift; shift;; - -D|--database) - database=$2; - shift; shift;; - -g|--apache-group) - apache_group=$2; - shift; shift;; - -H|--host) - hostname=$2; - shift; shift;; - -h|--help) - printUsage; - exit 0;; - -p|--port) - http_port=$2; - shift; shift;; - -P|--scheduler-port) - scheduler_port=$2; - shift; shift;; - -r|--www-root) - www_root=$2; - shift; shift;; - -s|--dbserver) - dbserver=$2; - shift; shift;; - -u|--dbuser) - dbuser=$2; - shift; shift;; - -w|--dbpassword) - dbpassword=$2; - shift; shift;; - -o|--output-device) - output_alsa_device=$2; - shift; shift;; - --) - shift; - break;; - *) - echo "Unrecognized option $1."; - printUsage; - exit 1; - esac -done - -if [ "x$installdir" == "x" ]; then - echo "Required parameter install directory not specified."; - printUsage; - exit 1; -fi - -if [ "x$hostname" == "x" ]; then - hostname=`hostname -f`; -fi - -if [ "x$http_port" == "x" ]; then - http_port=80; -fi - -if [ "x$scheduler_port" == "x" ]; then - scheduler_port=3344; -fi - -if [ "x$dbserver" == "x" ]; then - dbserver=localhost; -fi - -if [ "x$database" == "x" ]; then - database=LiveSupport; -fi - -if [ "x$dbuser" == "x" ]; then - dbuser=livesupport; -fi - -if [ "x$dbpassword" == "x" ]; then - dbpassword=livesupport; -fi - -if [ "x$apache_group" == "x" ]; then - apache_group=apache; -fi - -if [ "x$www_root" == "x" ]; then - www_root=/var/www -fi - -if [ "x$output_alsa_device" == "x" ]; then - output_alsa_device="plughw:0,0"; -fi - -echo "Making post-install steps for the LiveSupport scheduler."; -echo ""; -echo "Using the following installation parameters:"; -echo ""; -echo " installation directory: $installdir"; -echo " host name: $hostname"; -echo " web server port: $http_port"; -echo " scheduler port: $scheduler_port"; -echo " database server: $dbserver"; -echo " database: $database"; -echo " database user: $dbuser"; -echo " database user password: $dbpassword"; -echo " apache daemon group: $apache_group"; -echo " apache document root: $www_root"; -echo " broadcast device: $output_alsa_device"; -echo "" - -#------------------------------------------------------------------------------- -# The details of installation -#------------------------------------------------------------------------------- -ls_php_host=$hostname -ls_php_port=$http_port -ls_php_urlPrefix=livesupport - -ls_alib_xmlRpcPrefix="xmlrpc/xrLocStor.php" -ls_storage_xmlRpcPrefix="xmlrpc/xrLocStor.php" - -ls_dbserver=$dbserver -ls_dbuser=$dbuser -ls_dbpassword=$dbpassword -ls_database=$database - -ls_scheduler_host=$hostname -ls_scheduler_port=$scheduler_port -ls_scheduler_urlPrefix= -ls_scheduler_xmlRpcPrefix=RC2 -ls_output_alsa_device=$output_alsa_device - - -postgres_user=postgres - -install_bin=$installdir/bin -install_etc=$installdir/etc -install_lib=$installdir/lib -install_tmp=$installdir/tmp -install_usr=$installdir/usr -install_var=$installdir/var - - -# replace / characters with a \/ sequence, for sed below -# the sed statement is really "s/\//\\\\\//g", but needs escaping because of -# bash, hence the extra '\' characters -installdir_s=`echo $installdir | sed -e "s/\//\\\\\\\\\//g"` -ls_storage_xmlRpcPrefix_s=`echo $ls_storage_xmlRpcPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_alib_xmlRpcPrefix_s=`echo $ls_alib_xmlRpcPrefix | sed -e "s/\//\\\\\\\\\//g"` -ls_php_urlPrefix_s=`echo $ls_php_urlPrefix | sed -e "s/\//\\\\\\\\\//g"` -ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \ - sed -e "s/\//\\\\\\\\\//g"` -ls_output_alsa_device_s=`echo $ls_output_alsa_device | sed -e "s/\//\\\\\\\\\//g"` - -replace_sed_string="s/ls_install_dir/$installdir_s/; \ - s/ls_dbuser/$ls_dbuser/; \ - s/ls_dbpassword/$ls_dbpassword/; \ - s/ls_dbserver/$ls_dbserver/; \ - s/ls_database/$ls_database/; \ - s/ls_storageUrlPath/\/$ls_php_urlPrefix_s\/storageServer\/var/; \ - s/ls_php_urlPrefix/$ls_php_urlPrefix_s/; \ - s/ls_storage_xmlRpcPrefix/$ls_storage_xmlRpcPrefix_s/; \ - s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \ - s/ls_php_host/$ls_php_host/; \ - s/ls_php_port/$ls_php_port/; \ - s/ls_output_alsa_device/$ls_output_alsa_device_s/; \ - s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \ - s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \ - s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \ - s/ls_scheduler_host/$ls_scheduler_host/; \ - s/ls_scheduler_port/$ls_scheduler_port/;" - - - -#------------------------------------------------------------------------------- -# Function to check for the existence of an executable on the PATH -# -# @param $1 the name of the exectuable -# @return 0 if the executable exists on the PATH, non-0 otherwise -#------------------------------------------------------------------------------- -check_exe() { - if [ -x "`which $1 2> /dev/null`" ]; then - echo "Executable $1 found..."; - return 0; - else - echo "Executable $1 not found..."; - return 1; - fi -} - - -#------------------------------------------------------------------------------- -# Check to see if this script is being run as root -#------------------------------------------------------------------------------- -if [ `whoami` != "root" ]; then - echo "Please run this script as root."; - exit ; -fi - - -#------------------------------------------------------------------------------- -# Check for required tools -#------------------------------------------------------------------------------- -echo "Checking for required tools..." - -check_exe "sed" || exit 1; -check_exe "psql" || exit 1; -check_exe "php" || exit 1; -check_exe "pear" || exit 1; -check_exe "odbcinst" || exit 1; - - -#------------------------------------------------------------------------------- -# Check for the apache group to be a real group -#------------------------------------------------------------------------------- -group_tmp_file=/tmp/ls_group_check.$$ -touch $group_tmp_file -test_result=`chgrp $apache_group $group_tmp_file 2> /dev/null` -if [ $? != 0 ]; then - rm -f $group_tmp_file; - echo "Unable to use apache deamon group $apache_group."; - echo "Please check if $apache_group is a correct user group."; - exit 1; -fi -rm -f $group_tmp_file; - - -#------------------------------------------------------------------------------- -# Create the necessary database user and database itself -#------------------------------------------------------------------------------- -echo "Creating database and database user..."; - -# FIXME: the below might not work for remote databases - -if [ "x$ls_dbserver" == "xlocalhost" ]; then - su - $postgres_user -c "echo \"CREATE USER $ls_dbuser \ - ENCRYPTED PASSWORD '$ls_dbpassword' \ - CREATEDB NOCREATEUSER;\" \ - | psql template1" \ - || echo "Couldn't create database user $ls_dbuser."; - - su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \ - OWNER $ls_dbuser ENCODING 'utf-8';\" \ - | psql template1" \ - || echo "Couldn't create database $ls_database."; -else - echo "Unable to automatically create database user and table for"; - echo "remote database $ls_dbserver."; - echo "Make sure to create database user $ls_dbuser with password"; - echo "$ls_dbpassword on database server at $ls_dbserver."; - echo "Also create a database called $ld_database, owned by this user."; - echo ""; - echo "The easiest way to achieve this is by issuing the following SQL"; - echo "commands to PostgreSQL:"; - echo "CREATE USER $ls_dbuser"; - echo " ENCRYPTED PASSWORD '$ls_dbpassword'"; - echo " CREATEDB NOCREATEUSER;"; - echo "CREATE DATABASE \"$ls_database\""; - echo " OWNER $ls_dbuser ENCODING 'utf-8';"; -fi - - -# TODO: check for the success of these operations somehow - - -#------------------------------------------------------------------------------- -# Create the ODBC data source and driver -#------------------------------------------------------------------------------- -echo "Creating ODBC data source and driver..."; - -odbcinst_template=$install_etc/odbcinst_template -odbc_template=$install_etc/odbc_template -odbc_template_tmp=/tmp/odbc_template.$$ - -# check for an existing PostgreSQL ODBC driver, and only install if necessary -odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"` -if [ "x$odbcinst_res" == "x" ]; then - echo "Registering ODBC PostgreSQL driver..."; - odbcinst -i -d -v -f $odbcinst_template || exit 1; -fi - -echo "Registering LiveSupport ODBC data source..."; -cat $odbc_template | sed -e "$replace_sed_string" > $odbc_template_tmp -odbcinst -i -s -l -f $odbc_template_tmp || exit 1; -rm -f $odbc_template_tmp - - -#------------------------------------------------------------------------------- -# Install PEAR packages (locally in the LiveSupport) -#------------------------------------------------------------------------------- -$install_usr/lib/pear/bin/install.sh -d $installdir || exit 1; - - -#------------------------------------------------------------------------------- -# Customize the configuration files with the appropriate values -#------------------------------------------------------------------------------- -echo "Customizing configuration files..." - -cat $install_var/storageServer/var/conf.php.template \ - | sed -e "$replace_sed_string" \ - > $install_var/storageServer/var/conf.php - -cat $install_var/archiveServer/var/conf.php.template \ - | sed -e "$replace_sed_string" \ - > $install_var/archiveServer/var/conf.php - -cat $install_usr/var/conf.php.template \ - | sed -e "$replace_sed_string" \ - > $install_usr/var/conf.php - -cat $install_etc/scheduler.xml.template \ - | sed -e "$replace_sed_string" \ - > $install_etc/scheduler.xml - - -#------------------------------------------------------------------------------- -# Setup working directories -#------------------------------------------------------------------------------- -echo "Setting up working directories..." - -mkdir -p $install_var/storageServer/var/stor/buffer -mkdir -p $install_var/storageServer/var/access -mkdir -p $install_var/storageServer/var/trans - -mkdir -p $install_var/archiveServer/var/stor/buffer -mkdir -p $install_var/archiveServer/var/access -mkdir -p $install_var/archiveServer/var/trans - -#------------------------------------------------------------------------------- -# Setup directory permissions -#------------------------------------------------------------------------------- -echo "Setting up directory permissions..." - -chgrp $apache_group $install_var/archiveServer/var/stor -chgrp $apache_group $install_var/archiveServer/var/access -chgrp $apache_group $install_var/archiveServer/var/trans -chgrp $apache_group $install_var/archiveServer/var/stor/buffer - -chmod g+sw $install_var/archiveServer/var/stor -chmod g+sw $install_var/archiveServer/var/access -chmod g+sw $install_var/archiveServer/var/trans -chmod g+sw $install_var/archiveServer/var/stor/buffer - -chgrp $apache_group $install_var/storageServer/var/stor -chgrp $apache_group $install_var/storageServer/var/access -chgrp $apache_group $install_var/storageServer/var/trans -chgrp $apache_group $install_var/storageServer/var/stor/buffer - -chmod g+sw $install_var/storageServer/var/stor -chmod g+sw $install_var/storageServer/var/access -chmod g+sw $install_var/storageServer/var/trans -chmod g+sw $install_var/storageServer/var/stor/buffer - -chgrp $apache_group $install_var/htmlUI/var/templates_c -chgrp $apache_group $install_var/htmlUI/var/html/img - -chmod g+sw $install_var/htmlUI/var/templates_c -chmod g+sw $install_var/htmlUI/var/html/img - - -#------------------------------------------------------------------------------- -# Configuring Apache -#------------------------------------------------------------------------------- -echo "Configuring apache ..." -CONFFILE=90_php_livesupport.conf -AP_DDIR_FOUND=no -for APACHE_DDIR in \ - /etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d -do - echo -n "$APACHE_DDIR " - if [ -d $APACHE_DDIR ]; then - echo "Y" - AP_DDIR_FOUND=yes - cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR - else - echo "N" - fi -done -if [ "$AP_DDIR_FOUND" != "yes" ]; then - echo "###############################" - echo " Could not configure Apache" - echo " include following file into apache config manually:" - echo " $basedir/etc/apache/$CONFFILE" - echo "###############################" -fi -echo "done" - -echo "Restarting apache..."; -AP_SCR_FOUND=no -for APACHE_SCRIPT in apache apache2 httpd ; do - echo -n "$APACHE_SCRIPT " - if [ -x /etc/init.d/$APACHE_SCRIPT ]; then - echo "Y" - AP_SCR_FOUND=yes - /etc/init.d/$APACHE_SCRIPT restart - else - echo "N" - fi -done -if [ "$AP_SCR_FOUND" != "yes" ]; then - echo "###############################" - echo " Could not reload Apache" - echo " please reload apache manually" - echo "###############################" -fi -echo "done" - - -#------------------------------------------------------------------------------- -# Create symlinks -#------------------------------------------------------------------------------- -echo "Creating symlinks..."; - -# create symlink for the PHP pages in apache's document root -rm -f $www_root/livesupport -ln -s $install_var $www_root/livesupport - - -#------------------------------------------------------------------------------- -# Initialize the database -#------------------------------------------------------------------------------- -echo "Initializing database..."; - -# create PHP-related database tables -cd $install_var/storageServer/var/install -php -q install.php || exit 1; -cd - - -# create scheduler-related database tables -cd $installdir -$bindir/scheduler.sh install || exit 1; -cd - - - -#------------------------------------------------------------------------------- -# Create the gstreamer registry -#------------------------------------------------------------------------------- -echo "Creating gstreamer registry..."; - -gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` -export LD_LIBRARY_PATH=$install_lib -export GST_REGISTRY=$install_etc/gst-registry.xml -export GST_PLUGIN_PATH=$gstreamer_dir -$install_bin/gst-register > /dev/null 2>&1 - - -#------------------------------------------------------------------------------- -# Say goodbye -#------------------------------------------------------------------------------- -echo "Done." - diff --git a/livesupport/bin/setupDeveopmentEnvironment.sh b/livesupport/bin/setupDeveopmentEnvironment.sh new file mode 100755 index 000000000..7683cf0f9 --- /dev/null +++ b/livesupport/bin/setupDeveopmentEnvironment.sh @@ -0,0 +1,105 @@ +#!/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: maroy $ +# Version : $Revision: 1.1 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/setupDeveopmentEnvironment.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# A script to set up the development environment for LiveSupport +# +# Invoke as: +# ./bin/setupDevelopmentEnvironment.sh +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Determine directories, files +#------------------------------------------------------------------------------- +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +bindir=$basedir/bin +etcdir=$basedir/etc +docdir=$basedir/doc +tmpdir=$basedir/tmp +toolsdir=$basedir/tools +modules_dir=$basedir/modules +products_dir=$basedir/products + +usrdir=`cd $basedir/usr; pwd;` + + +#------------------------------------------------------------------------------- +# Print the usage information for this script. +#------------------------------------------------------------------------------- +printUsage() +{ + echo "LiveSupport development environment setup script."; + echo "parameters"; + echo ""; + echo " -h, --help Print this message and exit."; + echo ""; +} + + +#------------------------------------------------------------------------------- +# Process command line parameters +#------------------------------------------------------------------------------- +CMD=${0##*/} + +opts=$(getopt -o h -l help -n $CMD -- "$@") || exit 1 +eval set -- "$opts" +while true; do + case "$1" in + -h|--help) + printUsage; + exit 0;; + --) + shift; + break;; + *) + echo "Unrecognized option $1."; + printUsage; + exit 1; + esac +done + + +#------------------------------------------------------------------------------- +# Create the configure script +#------------------------------------------------------------------------------- +rm -rf $tmpdir/configure +$bindir/autogen.sh +$basedir/configure --prefix=$usrdir --with-www-docroot=$usrdir/var + + +#------------------------------------------------------------------------------- +# Compile everything at once, including the tools +#------------------------------------------------------------------------------- +make all + + +#------------------------------------------------------------------------------- +# We're done +#------------------------------------------------------------------------------- +echo "Done." + diff --git a/livesupport/configure b/livesupport/configure index ae049e8f6..8b025cf75 100755 --- a/livesupport/configure +++ b/livesupport/configure @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/configure,v $ #------------------------------------------------------------------------------- @@ -32,7 +32,7 @@ # This script in effect calls the real automake / autoconf configure script #------------------------------------------------------------------------------- -# assume we're in $basedir/bin +# assume we're in $basedir reldir=`dirname $0` basedir=`cd $reldir; pwd;` test -z "$basedir" && basedir=. @@ -45,8 +45,8 @@ autogen=$bindir/autogen.sh configure=$tmpdir/configure if [ -x $configure ]; then - (cd $tmpdir && $configure "$*") + (cd $tmpdir && $configure $*) else - (cd $basedir && $autogen "$*") + (cd $basedir && $autogen $*) fi diff --git a/livesupport/doc/gettingStarted.html b/livesupport/doc/gettingStarted.html index 175d9f2e8..5bccc887b 100644 --- a/livesupport/doc/gettingStarted.html +++ b/livesupport/doc/gettingStarted.html @@ -3,7 +3,7 @@ Getting started with the LiveSupport development environment - +

Preface

@@ -12,8 +12,8 @@ project, Copyright © 2004 Media Development Loan Fund, under the GNU GPL.
@@ -103,32 +103,16 @@ This will check out and create the LiveSupport development directory structure.

Configure the environment

+The development environment is most easily set up by running the +following script:
+
The development environment as to be configured with an autoconf-style configure script. To do this, simply type:
-

cd livesupport
./configure
-after checking out the sources.
-

Set up tools

-LiveSupport uses widely available tools for development, like the GNU -C++ compiler, but also uses more specific tools. As these tools, or the -exact versions of these tools are not expected to be installed on the -development system, the LiveSupport development environment contains -them. The tools are installed into the livesupport/usr -directory, as described in the directory structure document.
+

cd livesupport
./bin/setupDeveopmentEnvironment.sh

-Moreover, some components in livesupport have to be set up prior to -compilation, for example running autoconf or similar configuration -programs. This ensures that the components compile fine on the -development system.
-
-To achieve all these goals, invoke the target setup in -the main Makefile, at the root of the LiveSupport -directory structure, by issuing the following command in the -livesupport directory:
-

make setup

-The execution of this command will take a while, as all the supporting -libraries and tools are compiled and installed to the livesupport/usr -directory. Please note that nothing is installed outside of the -LiveSupport directory structure.
+This script will set up the libraries used by LiveSupport (by compiling +and installing them under livesupport/usr), and set up the development +environment for all LiveSupport modules.

Personalize your LiveSupport development environment

The LiveSupport development environment can be run in two ways: either only one developer actively doing LiveSupport development on the diff --git a/livesupport/doc/install.html b/livesupport/doc/install.html index 25b038cae..57931a353 100644 --- a/livesupport/doc/install.html +++ b/livesupport/doc/install.html @@ -3,7 +3,7 @@ LiveSupport installation documentation - +

Preface

@@ -12,8 +12,8 @@ project, Copyright © 2004 Media Development Loan Fund, under the GNU GPL.

Scope

@@ -36,9 +36,9 @@ Those who think they know everything, the quick steps to install LiveSupport are (make sure to run at least the ./bin/install.sh script as root):

-
wget http://livesupport.campware.org/look/campware/download/livesupport-<version>.tar.bz2
wget http://livesupport.campware.org/look/campware/download/livesupport-libraries-<version>.tar.bz2
tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2
cd livesupport-<version>
./configure
make setup && make compile
./bin/install.sh -d /usr/local/livesupport -g apache -r /var/www
/usr/local/livesupport/bin/scheduler.sh start
+
wget http://livesupport.campware.org/look/campware/download/livesupport-<version>.tar.bz2
wget http://livesupport.campware.org/look/campware/download/livesupport-libraries-<version>.tar.bz2
tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2
cd livesupport-<version>
./configure --with-prefix=/usr/local/livesupport --with-apache-group=apache --with-www-docroot=/var/www
make
make install
/usr/local/livesupport/bin/scheduler.sh start

-Then try the URL http://localhost/livesupport/htmlUI/var/html/ , +Then try the URL http://localhost/livesupport/ , and log in using username: root, password: q.

Everyone else, please read the lines below carefully.
@@ -145,7 +145,7 @@ on in this document, this group will be referred to as <apache-group> Also note the document root directory for your apache installation (usually /var/www or /var/www/htdocs or /var/www/<yourhost>/htdocs). Later on in this -document, this directory will be reffered to as <www-root>.
+document, this directory will be referred to as <www-root>.

Obtaining LiveSupport sources

LiveSupport sources come in two different tarballs:
-Both files can be downloaded from http://sourceforge.net/projects/livesupport/. -

+Both files can be downloaded from http://sourceforge.net/projects/livesupport/. +
+
After downloading the files, untar them in the same directory:

tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2
@@ -169,61 +171,49 @@ LiveSupport.
To compile LiveSupport, enter the LiveSupport directory, and execute the following commands:

-
cd livesupport-<version>
./configure
make setup && make compile
+
cd livesupport-<version>
./configure --with-prefix=/usr/local/livesupport --with-apache-group=apache --with-www-docroot=/var/www
make

-This will take quite a while, so go have a tea, watch a movie, relax, -etc.
-

Installing LiveSupport
-

-After a successful compilation, to install LiveSupport, you have to -decide which directory you want LiveSupport installed into. This -directory will be referred to as <ls-installdir> -later on in this document.
+The configure options used above are the options most probably used:

-The installation is done using the bin/install.sh script -found in the LiveSupport base directory. This script has to be run as root. -To see the possible options to the script, invoke it with the --help -parameter. A brief overview of the most frequently used parameters:
-
-
  -d, --directory     The installation directory, required.

-The installation directory, a required parameter. Supply the previously +
  --prefix=PREFIX         install architecture-independent files in PREFIX
                          [/usr/local]
+The installation directory. Supply the previously decided LiveSupport installation directory here, <ls-installdir> (as mentioned above). A sensible value to use here is /usr/local/livesupport.
-

  -g, --apache-group  The group the apache daemon runs as.
                      [default: apache]

+

  --with-apache-group     use apache running in the specified group (apache)

The user group the apache web server daemon runs at (see the section above on installing apache). Supply the <apache-group> value here, as mentioned above, which is usually either apache or www-data.

-
  -r, --www-root      The root directory for web documents served
                      by apache [default: /var/www]

+
  --with-www-docroot      deploy LiveSupport under the specified docroot
                          (/var/www)

The document root of your apache installation (see the section above on installing apache). Supply the <www-root> value here, as mentioned above, which is usually /var/www or /var/www/htdocs or /var/www/<yourhost>/htdocs. -

  -H, --host          The fully qualified host name of the system
                      [default: guess].

-The fully qualified domain name of your system. If the install script -cannot determine your host name correctly, please supply the FQDN via -this parameter.
+

-Thus a typical invocation of the install script is the following:
+Compilation will take quite a while, so go have a tea, watch a +movie, relax, +etc.

-
./bin/install.sh -d <ls-installdir> -g <apache-group> -r <www-root>
+If you want the installation script to create the database tables used +by LiveSupport, consider using the following configure options:

-The install script has more options, which enable you to customize your -installation of LiveSupport. Note that the defaults are usually quite -sensible values, which will create the following setup:
+
  --with-create-database  specify whether the LiveSupport database and database
                          user should be created (no)
  --with-create-odbc-data-source
                          specify whether the ODBC data source for LiveSupport
                          should be created (no)
  --with-init-database    specify whether the LiveSupport database tables
                          should be initialized (no)
  --with-configure-apache specify whether apache should be configured for
                          LiveSupport through its conf.d directory (no)


+For a full list of options, see ./configure --help
+

Installing LiveSupport
+

+After a successful compilation, to install LiveSupport, you can install +LiveSupport by typing:
+
+
make install
+
+This will install LiveSupport into the directory specified to the +configure script. It will also create necessary database tables, +depending on the invocation of the configure script. Most probably you +will have to run make install as root.

-
    -
  • a PostgreSQL database user named livesupport, with -password livesupport.
    • -
  • a PostgreSQL database named LiveSupport.
    • -
  • an ODBC data source named LiveSupport, connecting -to the database of the same name.
    • -
  • initialize the database with appropriate tables
    • -
  • create a symlink into your apache root to point to <ls-installdir>/var.
    -
    • -

Try it out

After a successful installation, the LiveSupport scheduler has to be started. The scheduler has a System V runlevel-style startup script, @@ -235,7 +225,7 @@ simply invoke:
The only thing left to do is to try out the LiveSupport web interface or the GUI application.

-For the web interface, point your browser to the following URL: http://<yourhost>/livesupport/htmlUI/var/html/ +For the web interface, point your browser to the following URL: http://<yourhost>/livesupport/ .

The GUI application can be started by issuing the following command:
diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 3bcb97497..e32665b1e 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.10 $ +# Version : $Revision: 1.11 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -49,6 +49,25 @@ COVERAGE_DIR = ${DOC_DIR}/coverage ETC_DIR = ${BASE_DIR}/etc TMP_DIR = ${BASE_DIR}/tmp +prefix = @prefix@ + +HOSTNAME = @HOSTNAME@ +APACHE_GROUP = @APACHE_GROUP@ +WWW_DOCROOT = @WWW_DOCROOT@ +WWW_PORT = @WWW_PORT@ +SCHEDULER_PORT = @SCHEDULER_PORT@ +DB_SERVER = @DB_SERVER@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ +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 PKG_CONFIG_PATH=${prefix}/lib/pkgconfig + DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config @@ -102,7 +121,11 @@ PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient WIDGETS_DIR = ${MODULES_DIR}/widgets +ALIB_DIR = ${MODULES_DIR}/alib ARCHIVE_SERVER_DIR = ${MODULES_DIR}/archiveServer +GETID3_DIR = ${MODULES_DIR}/getid3 +HTML_UI_DIR = ${MODULES_DIR}/htmlUI +STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer PRODUCTS_DIR = ${BASE_DIR}/products @@ -116,23 +139,25 @@ GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport .PHONY: all doc clean docclean depclean distclean doxygen testresults .PHONY: setup tools_setup doxytag_setup modules_setup products_setup -all: printusage +all: setup compile -printusage: +help: ${ECHO} "LiveSupport project main Makefile" ${ECHO} "http://livesupport.campware.org/" ${ECHO} "Copyright (c) 2004 Media Development Loan Fund under the GNU GPL" ${ECHO} "" ${ECHO} "Useful targets for this makefile:" - ${ECHO} " setup - set up the development environment" + ${ECHO} " all - set up and compile everthing" + ${ECHO} " install - install everything" ${ECHO} " doc - build autogenerated documentation" - ${ECHO} " doxygen - build autogenerated doxygen documentation only" - ${ECHO} "" - ${ECHO} "Some less frequently used targets:" - ${ECHO} " compile - compile all modules" - ${ECHO} " recompile - recompile all modules" ${ECHO} " clean - clean all modules" ${ECHO} " check - check all modules" + ${ECHO} "" + ${ECHO} "Some less frequently used targets:" + ${ECHO} " setup - set up the development environment" + ${ECHO} " doxygen - build autogenerated doxygen documentation only" + ${ECHO} " compile - compile all modules" + ${ECHO} " recompile - recompile all modules" doc: doxygen testresults flawfinder @@ -163,6 +188,8 @@ clean: ${RMDIR} ${DOXYGEN_DIR}/html ${RMDIR} ${COVERAGE_DIR}/* ${RM} ${TMP_DIR}/*.stamp + ${RM} ${TMP_DIR}/ac* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + ${RMDIR} ${TMP_DIR}/auto* setup: ${TMP_DIR}/setup.stamp ${TMP_DIR}/setup.stamp: tools_setup doxytag_setup modules_setup products_setup @@ -172,21 +199,85 @@ recompile: distclean modules_setup products_setup compile tools_setup: ${TMP_DIR}/tools_setup.stamp ${TMP_DIR}/tools_setup.stamp: - ${BOOST_DIR}/${BOOST_VERSION}/bin/install.sh - ${CXXUNIT_DIR}/${CXXUNIT_VERSION}/bin/install.sh - ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION}/bin/install.sh - ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION}/bin/install.sh - ${LCOV_DIR}/${LCOV_VERSION}/bin/install.sh - ${GTK_DIR}/${GTK_VERSION}/bin/install.sh - ${GTKMM_DIR}/${GTKMM_VERSION}/bin/install.sh - ${GSTREAMER_DIR}/${GSTREAMER_VERSION}/bin/install.sh - ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh - ${ICU_DIR}/${ICU_VERSION}/bin/install.sh - ${CURL_DIR}/${CURL_VERSION}/bin/install.sh - ${TAGLIB_DIR}/${TAGLIB_VERSION}/bin/install.sh -# ${PEAR_DIR}/bin/install.sh + cd ${CXXUNIT_DIR}/${CXXUNIT_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${CXXUNIT_DIR}/${CXXUNIT_VERSION} install + +ifeq ("@BOOST_DATE_TIME_LIB@","") + cd ${BOOST_DIR}/${BOOST_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${BOOST_DIR}/${BOOST_VERSION} install +endif + + cd ${CXXUNIT_DIR}/${CXXUNIT_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${CXXUNIT_DIR}/${CXXUNIT_VERSION} install + + cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && \ + bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install + + cd ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} install + + cd ${LCOV_DIR}/${LCOV_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${LCOV_DIR}/${LCOV_VERSION} install + +ifeq ("@GTK_CFLAGS@","") + cd ${GTK_DIR}/${GTK_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${GTK_DIR}/${GTK_VERSION} install +endif + +ifeq ("@GTKMM_CFLAGS@","") + cd ${GTKMM_DIR}/${GTKMM_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${GTKMM_DIR}/${GTKMM_VERSION} install +endif + + cd ${GSTREAMER_DIR}/${GSTREAMER_VERSION} && \ + bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${GSTREAMER_DIR}/${GSTREAMER_VERSION} install + +ifeq ("@LIBXMLPP_CFLAGS@","") + cd ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION} install +endif + +ifeq ("@ICU_CFLAGS@","") + cd ${ICU_DIR}/${ICU_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${ICU_DIR}/${ICU_VERSION} install +endif + + cd ${CURL_DIR}/${CURL_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${CURL_DIR}/${CURL_VERSION} install + + cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && bin/autogen.sh --prefix=${prefix} + ${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install + touch ${TMP_DIR}/tools_setup.stamp +tools_distclean: + -${MAKE} -C ${CXXUNIT_DIR}/${CXXUNIT_VERSION} distclean +ifeq ("@BOOST_DATE_TIME_LIB@","") + -${MAKE} -C ${BOOST_DIR}/${BOOST_VERSION} distclean +endif + -${MAKE} -C ${CXXUNIT_DIR}/${CXXUNIT_VERSION} distclean + -${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean + -${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean + -${MAKE} -C ${LCOV_DIR}/${LCOV_VERSION} distclean +ifeq ("@GTK_CFLAGS@","") + -${MAKE} -C ${GTK_DIR}/${GTK_VERSION} distclean +endif +ifeq ("@GTKMM_CFLAGS@","") + -${MAKE} -C ${GTKMM_DIR}/${GTKMM_VERSION} distclean +endif + -${MAKE} -C ${GSTREAMER_DIR}/${GSTREAMER_VERSION} distclean +ifeq ("@LIBXMLPP_CFLAGS@","") + -${MAKE} -C ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION} distclean +endif +ifeq ("@ICU_CFLAGS@","") + -${MAKE} -C ${ICU_DIR}/${ICU_VERSION} distclean +endif + -${MAKE} -C ${CURL_DIR}/${CURL_VERSION} distclean + -${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean + ${RM} ${TMP_DIR}/tools_setup.stamp + doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp ${TMP_DIR}/doxytag_setup.stamp: ${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES} @@ -194,26 +285,70 @@ ${TMP_DIR}/doxytag_setup.stamp: modules_setup: ${TMP_DIR}/modules_setup.stamp ${TMP_DIR}/modules_setup.stamp: - ${CORE_DIR}/bin/autogen.sh - ${AUTHENTICATION_DIR}/bin/autogen.sh - ${DB_DIR}/bin/autogen.sh - ${STORAGE_DIR}/bin/autogen.sh - ${GSTREAMER_ELEMENTS_DIR}/bin/autogen.sh - ${PLAYLIST_EXECUTOR_DIR}/bin/autogen.sh - ${EVENT_SCHEDULER_DIR}/bin/autogen.sh - ${SCHEDULER_CLIENT_DIR}/bin/autogen.sh - ${WIDGETS_DIR}/bin/autogen.sh -# -${MAKE} -C ${ARCHIVE_SERVER_DIR} all -# -${MAKE} -C ${STORAGE_SERVER_DIR} all + cd ${ALIB_DIR}/tmp && ./configure --prefix=${prefix} + cd ${ARCHIVE_SERVER_DIR}/tmp && \ + ./configure --prefix=${prefix} \ + --with-hostname=${HOSTNAME} \ + --with-www-port=${WWW_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} + cd ${GETID3_DIR}/tmp && ./configure --prefix=${prefix} + cd ${HTML_UI_DIR}/tmp && ./configure --prefix=${prefix} \ + --with-apache-group=${APACHE_GROUP} \ + --with-www-docroot=${WWW_DOCROOT} \ + --with-configure-apache=yes + cd ${STORAGE_ADMIN_DIR}/tmp && ./configure --prefix=${prefix} + cd ${STORAGE_SERVER_DIR}/tmp && \ + ./configure --prefix=${prefix} \ + --with-hostname=${HOSTNAME} \ + --with-www-port=${WWW_PORT} \ + --with-scheduler-port=${SCHEDULER_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} \ + --with-init-database=yes + cd ${CORE_DIR}/tmp && ./configure --prefix=${prefix} + cd ${AUTHENTICATION_DIR}/tmp && ./configure --prefix=${prefix} + cd ${DB_DIR}/tmp && ./configure --prefix=${prefix} + cd ${STORAGE_DIR}/tmp && ./configure --prefix=${prefix} + cd ${GSTREAMER_ELEMENTS_DIR}/tmp && ./configure --prefix=${prefix} + cd ${PLAYLIST_EXECUTOR_DIR}/tmp && ./configure --prefix=${prefix} + cd ${EVENT_SCHEDULER_DIR}/tmp && ./configure --prefix=${prefix} + cd ${SCHEDULER_CLIENT_DIR}/tmp && ./configure --prefix=${prefix} + cd ${WIDGETS_DIR}/tmp && ./configure --prefix=${prefix} touch ${TMP_DIR}/modules_setup.stamp products_setup: ${TMP_DIR}/products_setup.stamp ${TMP_DIR}/products_setup.stamp: - ${SCHEDULER_DIR}/bin/autogen.sh - ${GLIVESUPPORT_DIR}/bin/autogen.sh + cd ${SCHEDULER_DIR}/tmp && \ + ./configure --prefix=${prefix} \ + --with-hostname=${HOSTNAME} \ + --with-www-port=${WWW_PORT} \ + --with-scheduler-port=${SCHEDULER_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} \ + --with-audio-out=${STATION_AUDIO_OUT} \ + --with-create-odbc-data-source=yes \ + --with-init-database=yes + cd ${GLIVESUPPORT_DIR}/tmp && \ + ./configure --prefix=${prefix} \ + --with-hostname=${HOSTNAME} \ + --with-www-port=${WWW_PORT} \ + --with-scheduler-port=${SCHEDULER_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} \ + --with-audio-out=${STUDIO_AUDIO_OUT} \ + --with-audio-cue=${STUDIO_AUDIO_CUE} touch ${TMP_DIR}/products_setup.stamp -distclean: +distclean: clean tools_distclean ${MAKE} -C ${CORE_DIR} distclean ${MAKE} -C ${AUTHENTICATION_DIR} distclean ${MAKE} -C ${DB_DIR} distclean @@ -278,15 +413,37 @@ check: #------------------------------------------------------------------------------- # Installation related targets #------------------------------------------------------------------------------- -.PHONY: install +.PHONY: install create_database install_modules install_products -INSTALL_COPY_EXE = ${BIN_DIR}/copyInstall.sh -ifeq (${prefix},) - INSTALL_PREFIX = @prefix@ -else - INSTALL_PREFIX = ${prefix} +install: setup compile create_database install_modules install_products + +create_database: +ifeq (@CREATE_LS_DATABASE@,yes) + ${BIN_DIR}/createDatabase.sh --database=${DATABASE} \ + --dbserver=${DB_SERVER} \ + --dbuser=${DB_USER} \ + --dbpassword=${DB_PASSWORD} endif -install: setup compile - ${INSTALL_COPY_EXE} --directory ${INSTALL_PREFIX} +install_modules: + ${MAKE} -C ${ALIB_DIR} install + ${MAKE} -C ${ARCHIVE_SERVER_DIR} install + ${MAKE} -C ${GETID3_DIR} install + ${MAKE} -C ${HTML_UI_DIR} install + ${MAKE} -C ${STORAGE_ADMIN_DIR} install + ${MAKE} -C ${STORAGE_SERVER_DIR} install + ${MAKE} -C ${CORE_DIR} install + ${MAKE} -C ${AUTHENTICATION_DIR} install + ${MAKE} -C ${DB_DIR} install + ${MAKE} -C ${STORAGE_DIR} install + ${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} install + ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install + ${MAKE} -C ${EVENT_SCHEDULER_DIR} install + ${MAKE} -C ${SCHEDULER_CLIENT_DIR} install + ${MAKE} -C ${WIDGETS_DIR} install + +install_products: + ${MAKE} -C ${SCHEDULER_DIR} install + ${MAKE} -C ${GLIVESUPPORT_DIR} install + diff --git a/livesupport/etc/acinclude.m4 b/livesupport/etc/acinclude.m4 new file mode 100644 index 000000000..5ac7f9f45 --- /dev/null +++ b/livesupport/etc/acinclude.m4 @@ -0,0 +1,204 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + +dnl----------------------------------------------------------------------------- +dnl Macro to check for a specific version of the ICU library +dnl +dnl usage: +dnl AC_CHECK_ICU(3.0, action-if-found, action-if-not-found) +dnl +dnl defines ICU_CFLAGS, ICU_CXXFLAGS and ICU_LIBS, see icu-config man page +dnl----------------------------------------------------------------------------- +AC_DEFUN([AC_CHECK_ICU], +[ + AC_PATH_PROG(ICU_CONFIG, icu-config, no) + + AC_MSG_CHECKING(for ICU library >= $1) + + if test "$ICU_CONFIG" = "no" ; then + FAILED="true" + else + ICU_VERSION=`$ICU_CONFIG --version` + VERSION_CHECK=`expr $ICU_VERSION \\>\\= $1` + + if test "$VERSION_CHECK" = "1" ; then + AC_MSG_RESULT([ICU version ICU_VERSION >= $1 found]) + ICU_CFLAGS=`$ICU_CONFIG --cflags` + ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` + ICU_LDFLAGS=`$ICU_CONFIG --ldflags` + + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_CXXFLAGS) + AC_SUBST(ICU_LDFLAGS) + + dnl execute action-if-found + ifelse([$2], , :, [$2]) + else + FAILED="true" + fi + fi + + if test "$FAILED" = "true" ; then + dnl execute action-if-not-found + ifelse([$3], , AC_MSG_ERROR([only insufficient version $ICU_VERSION < $1 of ICU library found]), [$3]) + fi +]) + + +dnl----------------------------------------------------------------------------- +dnl Macro to check for C++ namespaces +dnl for more information on this macro, see +dnl http://autoconf-archive.cryp.to/ac_cxx_namespaces.html +dnl +dnl usage: +dnl If the compiler can prevent names clashes using namespaces, +dnl define HAVE_NAMESPACES. +dnl----------------------------------------------------------------------------- +AC_DEFUN([AC_CXX_NAMESPACES], +[AC_CACHE_CHECK(whether the compiler implements namespaces, +ac_cv_cxx_namespaces, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], + [using namespace Outer::Inner; return i;], + ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) + AC_LANG_RESTORE +]) +if test "$ac_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) +fi +]) + + +dnl----------------------------------------------------------------------------- +dnl Macro to check for the boost datetime library. +dnl for more information on boost, see http://www.boost.org/ +dnl for more information on this macro, see +dnl http://autoconf-archive.cryp.to/ax_boost_date-time.html +dnl +dnl usage: +dnl This macro checks to see if the Boost.DateTime library is installed. +dnl It also attempts to guess the currect library name using several attempts. +dnl It tries to build the library name using a user supplied name or suffix +dnl and then just the raw library. +dnl +dnl If the library is found, HAVE_BOOST_DATE_TIME is defined and +dnl BOOST_DATE_TIME_LIB is set to the name of the library. +dnl +dnl This macro calls AC_SUBST(BOOST_DATE_TIME_LIB). +dnl----------------------------------------------------------------------------- +AC_DEFUN([AX_BOOST_DATE_TIME], +[AC_REQUIRE([AC_CXX_NAMESPACES])dnl +AC_CACHE_CHECK(whether the Boost::DateTime library is available, +ax_cv_boost_date_time, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include ]], + [[using namespace boost::gregorian; date d(2002,Jan,10); return 0;]]), + ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_boost_date_time" = yes; then + AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::DateTime library is available]) + dnl Now determine the appropriate file names + AC_ARG_WITH([boost-date-time],AS_HELP_STRING([--with-boost-date-time], + [specify the boost date-time library or suffix to use]), + [if test "x$with_boost_date_time" != "xno"; then + ax_date_time_lib=$with_boost_date_time + ax_boost_date_time_lib=boost_date_time-$with_boost_date_time + fi]) + for ax_lib in $ax_date_time_lib $ax_boost_date_time_lib boost_date_time; do + AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB=$ax_lib break]) + done + AC_SUBST(BOOST_DATE_TIME_LIB) +fi +])dnl + diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac index 30eff8c86..2a81d9af0 100644 --- a/livesupport/etc/configure.ac +++ b/livesupport/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -32,15 +32,415 @@ 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 it is being run from. We clearly don't want these in our base directory. dnl----------------------------------------------------------------------------- -AC_INIT(LiveSupport, 0.9, bugs@campware.org) +AC_INIT(LiveSupport, 1.0, bugs@campware.org) AC_PREREQ(2.59) 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(../products/scheduler/src/main.cxx) +AC_PROG_CC() AC_PROG_CXX() + +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database and user should be created +dnl----------------------------------------------------------------------------- +AC_SUBST(CREATE_LS_DATABASE) + +AC_ARG_WITH([create-database], + AC_HELP_STRING([--with-create-database], + [specify wether the LiveSupport database and database user + should be created (no)]), + [CREATE_LS_DATABASE=${withval}], + [CREATE_LS_DATABASE=no]) + +AC_MSG_RESULT([creating LiveSupport database: ${CREATE_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether the ODBC data source should be created +dnl----------------------------------------------------------------------------- +AC_SUBST(CREATE_ODBC_DATA_SOURCE) + +AC_ARG_WITH([create-odbc-data-source], + AC_HELP_STRING([--with-create-odbc-data-source], + [specify wether the ODBC data source for LiveSupport should be + created (no)]), + [CREATE_ODBC_DATA_SOURCE=${withval}], + [CREATE_ODBC_DATA_SOURCE=no]) + +AC_MSG_RESULT([creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database tables should be initialized +dnl----------------------------------------------------------------------------- +AC_SUBST(INIT_LS_DATABASE) + +AC_ARG_WITH([init-database], + AC_HELP_STRING([--with-init-database], + [specify wether the LiveSupport database tables should be + initialized (no)]), + [INIT_LS_DATABASE=${withval}], + [INIT_LS_DATABASE=no]) + +AC_MSG_RESULT([initializing LiveSupport database: ${INIT_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether apache should be configured through it's conf.d directory +dnl----------------------------------------------------------------------------- +AC_SUBST(CONFIGURE_APACHE) + +AC_ARG_WITH([configure-apache], + AC_HELP_STRING([--with-configure-apache], + [specify wether apache should be configured for LiveSupport + through its conf.d directory (no)]), + [CONFIGURE_APACHE=${withval}], + [CONFIGURE_APACHE=no]) + +AC_MSG_RESULT([configure apache: ${CONFIGURE_APACHE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the FQDN +dnl----------------------------------------------------------------------------- +AC_SUBST(HOSTNAME) + +AC_ARG_WITH([hostname], + AC_HELP_STRING([--with-hostname], + [use the specified hostname (guess)]), + [HOSTNAME=${withval}], [HOSTNAME=`hostname -f`]) + +AC_MSG_RESULT([using hostname: ${HOSTNAME}]) + + +dnl----------------------------------------------------------------------------- +dnl specify group in which apache is running +dnl----------------------------------------------------------------------------- +AC_SUBST(APACHE_GROUP) + +AC_ARG_WITH([apache-group], + AC_HELP_STRING([--with-apache-group], + [use apache running in the specified group (apache)]), + [APACHE_GROUP=${withval}], [APACHE_GROUP=apache]) + +AC_MSG_RESULT([using apache group: ${APACHE_GROUP}]) + + +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----------------------------------------------------------------------------- +dnl specify the web server port +dnl----------------------------------------------------------------------------- +AC_SUBST(WWW_PORT) + +AC_ARG_WITH([www-port], + AC_HELP_STRING([--with-www-port], + [use the specified www port (80)]), + [WWW_PORT=${withval}], [WWW_PORT=80]) + +AC_MSG_RESULT([using www port: ${WWW_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the scheduler server port +dnl----------------------------------------------------------------------------- +AC_SUBST(SCHEDULER_PORT) + +AC_ARG_WITH([scheduler-port], + AC_HELP_STRING([--with-scheduler-port], + [use the specified scheduler port (3344)]), + [SCHEDULER_PORT=${withval}], [SCHEDULER_PORT=3344]) + +AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server name +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_SERVER) + +AC_ARG_WITH([database-server], + AC_HELP_STRING([--with-database-server], + [use the specified database server (localhost)]), + [DB_SERVER=${withval}], [DB_SERVER=localhost]) + +AC_MSG_RESULT([using database server: ${DB_SERVER}]) + + +dnl----------------------------------------------------------------------------- +dnl get the name of the LiveSupport database +dnl----------------------------------------------------------------------------- +AC_SUBST(DATABASE) + +AC_ARG_WITH([database], + AC_HELP_STRING([--with-database], + [the name of the postgresql database to use (LiveSupport)]), + [DATABASE=${withval}], [DATABASE=LiveSupport]) + +AC_MSG_RESULT([using database: ${DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_USER) + +AC_ARG_WITH([database-user], + AC_HELP_STRING([--with-database-user], + [use the specified database server user (livesupport)]), + [DB_USER=${withval}], [DB_USER=livesupport]) + +AC_MSG_RESULT([using database server user: ${DB_USER}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user password +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_PASSWORD) + +AC_ARG_WITH([database-password], + AC_HELP_STRING([--with-database-password], + [use the specified database server user password (livesupport)]), + [DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) + +AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio output device for the scheduler +dnl----------------------------------------------------------------------------- +AC_SUBST(STATION_AUDIO_OUT) + +AC_ARG_WITH([station-audio-out], + AC_HELP_STRING([--with-station-audio-out], + [use the specified audio output device for the station, + either ALSA or OSS (plughw:0)]), + [STATION_AUDIO_OUT=${withval}], [STATION_AUDIO_OUT=plughw:0]) + +AC_MSG_RESULT([using audio output device for the station: ${STAITON_AUDIO_OUT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio output device for the studio +dnl----------------------------------------------------------------------------- +AC_SUBST(STUDIO_AUDIO_OUT) + +AC_ARG_WITH([studio-audio-out], + AC_HELP_STRING([--with-studio-audio-out], + [use the specified audio output device for the studio, + either ALSA or OSS (plughw:0)]), + [STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=plughw:0]) + +AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio output device for the studio for cueing +dnl----------------------------------------------------------------------------- +AC_SUBST(STUDIO_AUDIO_CUE) + +AC_ARG_WITH([studio-audio-cue], + AC_HELP_STRING([--with-studio-audio-cue], + [use the specified audio cue device for the studio, + either ALSA or OSS (plughw:0)]), + [STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=plughw:0]) + +AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}]) + + + +dnl unfortunately for both AC_CONFIG_COMMANDS and AC_CONFIG_SUBDIRS, the +dnl directories have to be literally included, so we can't use any +dnl fancy variables to avoid duplication of hard-coded values :( + + +dnl check for the boost library +AX_BOOST_DATE_TIME() + +if test "$BOOST_DATE_TIME_LIB" = "" ; then + AC_MSG_RESULT([not found boost library of sufficient version, will compile from our own]) + COMPILE_BOOST="yes" +else + COMPILE_BOOST="no" +fi + + +dnl check for gtk+ 2.6.1 or more recent +PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.6.1], +[ + AC_MSG_RESULT([using gtk+ found on the system]) + COMPILE_GTK="no" +], +[ + AC_MSG_RESULT([not found gtk+ of sufficient version, will compile from our own]) + COMPILE_GTK="yes" +]) + + +dnl check for gtk-- 2.5.5 or more recent +PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.5.5], +[ + AC_MSG_RESULT([using gtk-- found on the system]) + COMPILE_GTKMM="no" +], +[ + AC_MSG_RESULT([not found gtk-- of sufficient version, will compile from our own]) + COMPILE_GTKMM="yes" +]) + + +dnl check for ICU 3.0 or more recent +AC_CHECK_ICU(3.0, +[ + AC_MSG_RESULT([using ICU found on the system]) + COMPILE_ICU="no" +], +[ + AC_MSG_RESULT([not found ICU of sufficient version, will compile from our own]) + COMPILE_ICU="yes" +]) + + +dnl check for libxml++ 2.8.1 or more recent +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1], +[ + AC_MSG_RESULT([using libxml++ found on the system]) + COMPILE_LIBXMLPP="no" +], +[ + AC_MSG_RESULT([not found libxml++ of sufficient version, will compile from our own]) + COMPILE_LIBXMLPP="yes" +]) + + +dnl set up the alib module +AC_CONFIG_COMMANDS([../modules/alib/tmp/configure], + [../modules/alib/bin/autogen.sh]) + +dnl set up the archive server module +AC_CONFIG_COMMANDS([../modules/archiveServer/tmp/configure], + [../modules/archiveServer/bin/autogen.sh]) + +dnl set up the getid3 module +AC_CONFIG_COMMANDS([../modules/getid3/tmp/configure], + [../modules/getid3/bin/autogen.sh]) + +dnl set up the htmlUI module +AC_CONFIG_COMMANDS([../modules/htmlUI/tmp/configure], + [../modules/htmlUI/bin/autogen.sh]) + +dnl set up the storage admin module +AC_CONFIG_COMMANDS([../modules/storageAdmin/tmp/configure], + [../modules/storageAdmin/bin/autogen.sh]) + +dnl set up the storage server module +AC_CONFIG_COMMANDS([../modules/storageServer/tmp/configure], + [../modules/storageServer/bin/autogen.sh]) + +dnl set up the core module +AC_CONFIG_COMMANDS([../modules/core/tmp/configure], + [../modules/core/bin/autogen.sh]) + +dnl set up the authentication module +AC_CONFIG_COMMANDS([../modules/authentication/tmp/configure], + [../modules/authentication/bin/autogen.sh]) + +dnl set up the db module +AC_CONFIG_COMMANDS([../modules/db/tmp/configure], + [../modules/db/bin/autogen.sh]) + +dnl set up the storage module +AC_CONFIG_COMMANDS([../modules/storage/tmp/configure], + [../modules/storage/bin/autogen.sh]) + +dnl set up the gstreamer elements module +AC_CONFIG_COMMANDS([../modules/gstreamerElements/tmp/configure], + [../modules/gstreamerElements/bin/autogen.sh]) + +dnl set up the playlist executor module +AC_CONFIG_COMMANDS([../modules/playlistExecutor/tmp/configure], + [../modules/playlistExecutor/bin/autogen.sh]) + +dnl set up the event scheduler module +AC_CONFIG_COMMANDS([../modules/eventScheduler/tmp/configure], + [../modules/eventScheduler/bin/autogen.sh]) + +dnl set up the scheduler client module +AC_CONFIG_COMMANDS([../modules/schedulerClient/tmp/configure], + [../modules/schedulerClient/bin/autogen.sh]) + +dnl set up the widgets module +AC_CONFIG_COMMANDS([../modules/widgets/tmp/configure], + [../modules/widgets/bin/autogen.sh]) + +dnl set up the scheduler product +AC_CONFIG_COMMANDS([../products/scheduler/tmp/configure], + [../products/scheduler/bin/autogen.sh]) + +dnl set up the gLiveSupport product +AC_CONFIG_COMMANDS([../products/gLiveSupport/tmp/configure], + [../products/gLiveSupport/bin/autogen.sh]) + + + +dnl display status info on what libraries will get compiled + +AC_MSG_NOTICE( +[compiling the following external libraries that are needed +by LiveSupport: + + boost 1.31 ${COMPILE_BOOST} + cppunit 1.10.2 yes + curl 7.12.3 yes + gstreamer 0.8.10 yes + gtk+ 2.6.1 ${COMPILE_GTK} + gtk-- 2.5.5 ${COMPILE_GTKMM} + icu 3.0 ${COMPILE_ICU} + lcov 1.3 yes + libodbc++ 0.2.3 yes + libxml++ 2.8.1 ${COMPILE_LIBXMLPP} + taglib 1.3.1 yes + xmlrpc++ 2004-07-13 yes + + +using the following configuration settings: + + hostname: ${HOSTNAME} + apache group: ${APACHE_GROUP} + www document root: ${WWW_DOCROOT} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + station audio output device: ${STATION_AUDIO_OUT} + studio audio output device: ${STUDIO_AUDIO_OUT} + studio audio cue device: ${STUDIO_AUDIO_CUE} + creating LiveSupport database: ${CREATE_LS_DATABASE} + creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} + initialize LiveSupport database: ${INIT_LS_DATABASE} + configuring apache: ${CONFIGURE_APACHE} + +]) + + AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + AC_OUTPUT() + diff --git a/livesupport/modules/alib/bin/autogen.sh b/livesupport/modules/alib/bin/autogen.sh new file mode 100755 index 000000000..2908f56b7 --- /dev/null +++ b/livesupport/modules/alib/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/alib/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="Alib" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/alib/configure b/livesupport/modules/alib/configure new file mode 100755 index 000000000..873195c04 --- /dev/null +++ b/livesupport/modules/alib/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/alib/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/alib/Makefile b/livesupport/modules/alib/etc/Makefile.in similarity index 88% rename from livesupport/modules/alib/Makefile rename to livesupport/modules/alib/etc/Makefile.in index 1dfbecf70..6d2572284 100644 --- a/livesupport/modules/alib/Makefile +++ b/livesupport/modules/alib/etc/Makefile.in @@ -19,9 +19,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ +# Author : $Author: maroy $ # Version : $Revision: 1.2 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/alib/Attic/Makefile,v $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/alib/etc/Makefile.in,v $ # # @configure_input@ #------------------------------------------------------------------------------- @@ -33,6 +33,8 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f + #------------------------------------------------------------------------------- # Misc @@ -55,14 +57,15 @@ INCLUDE_DIR = ${BASE_DIR}/include LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include -USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -PHP_DIR = ${BASE_DIR}/var +PHP_DIR = ${VAR_DIR} TEST_RUNNER = ${PHP_DIR}/tests/index.php #------------------------------------------------------------------------------- @@ -84,11 +87,11 @@ TEST_RUNNER = ${PHP_DIR}/tests/index.php #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean dist db_init db_clean +.PHONY: all dir_setup doc clean docclean depclean distclean dist install +.PHONY: db_init db_clean -all: dir_setup db_init +all: -#dir_setup: ${TMP_DIR} ${DOXYGEN_DIR} dir_setup: ${DOXYGEN_DIR} doc: @@ -112,11 +115,18 @@ distclean: clean docclean # ${TEST_RUNNER} check: all +install: all + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/alib/var +# ${MKDIR} ${USR_VAR_DIR}/LiveSupport/alib/var/xmlrpc + ${CP} ${VAR_DIR}/*.php ${USR_VAR_DIR}/LiveSupport/alib/var +# ${CP} ${VAR_DIR}/xmlrpc/*.php ${USR_VAR_DIR}/LiveSupport/alib/var/xmlrpc + + #------------------------------------------------------------------------------- # Specific targets #------------------------------------------------------------------------------- # IMPORTANT: db_init and db_clean are commented out only for Livesupport, -# where alib is installed through storage modules +# where alib is initialized through storageServer module db_init: # cd var/install; php -q install.php diff --git a/livesupport/modules/alib/etc/configure.ac b/livesupport/modules/alib/etc/configure.ac new file mode 100644 index 000000000..a443ad3a4 --- /dev/null +++ b/livesupport/modules/alib/etc/configure.ac @@ -0,0 +1,45 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/alib/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(Alib, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/alib.php) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() diff --git a/livesupport/modules/archiveServer/bin/autogen.sh b/livesupport/modules/archiveServer/bin/autogen.sh new file mode 100755 index 000000000..861606ea4 --- /dev/null +++ b/livesupport/modules/archiveServer/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="ArchiveServer" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/archiveServer/configure b/livesupport/modules/archiveServer/configure new file mode 100755 index 000000000..975b278b9 --- /dev/null +++ b/livesupport/modules/archiveServer/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/storageServer/Makefile b/livesupport/modules/archiveServer/etc/Makefile.in similarity index 70% rename from livesupport/modules/storageServer/Makefile rename to livesupport/modules/archiveServer/etc/Makefile.in index 9c7e0fb72..93c48fc2e 100644 --- a/livesupport/modules/storageServer/Makefile +++ b/livesupport/modules/archiveServer/etc/Makefile.in @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# StorageServer - file storage component +# ArchiveServer - central archive component # Copyright (c) 2004 Media Development Loan Fund # # This file is part of the LiveSupport project. @@ -19,9 +19,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ -# Version : $Revision: 1.14 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/Attic/Makefile,v $ +# Author : $Author: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/etc/Makefile.in,v $ # # @configure_input@ #------------------------------------------------------------------------------- @@ -33,12 +33,17 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f +SED = sed +ECHO = echo +CAT = cat + #------------------------------------------------------------------------------- # Misc #------------------------------------------------------------------------------- -MODULE_NAME = storageServer +MODULE_NAME = archiveServer TAR_C = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f DIST_EXT = .tgz DATE = `date +%y%m%d` @@ -55,14 +60,16 @@ INCLUDE_DIR = ${BASE_DIR}/include LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -PHP_DIR = ${BASE_DIR}/var +PHP_DIR = ${VAR_DIR} INSTALL_DIR = ${PHP_DIR}/install STOR_DIR = ${PHP_DIR}/stor ACCESS_DIR = ${PHP_DIR}/access @@ -70,8 +77,30 @@ TRANS_DIR = ${PHP_DIR}/trans BUFF_DIR = ${STOR_DIR}/buffer TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh -PEAR_INSTALLER = ${BASE_DIR}/../../tools/pear/bin/install.sh -ROOT_PATH = ${BASE_DIR}/../.. +DEST_DIR = ${USR_VAR_DIR}/LiveSupport/archiveServer/var + +HOSTNAME = @HOSTNAME@ +WWW_PORT = @WWW_PORT@ +DB_SERVER = @DB_SERVER@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ + +PHP_URL_PREFIX=livesupport + +USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") + +REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ + s/ls_dbuser/${DB_USER}/; \ + s/ls_dbpassword/${DB_PASSWORD}/; \ + s/ls_dbserver/${DB_SERVER}/; \ + s/ls_database/${DATABASE}/; \ + s/ls_storageUrlPath/\/${PHP_URL_PREFIX_S}\/storageServer\/var/; \ + s/ls_php_host/${HOSTNAME}/; \ + s/ls_php_port/${WWW_PORT}/; \ + s/ls_archiveUrlPath/\/${PHP_URL_PREFIX_S}\/archiveServer\/var/;" + #------------------------------------------------------------------------------- # Configuration parameters @@ -92,19 +121,10 @@ ROOT_PATH = ${BASE_DIR}/../.. #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean dist \ - db_init db_clean testonly transtest local reset pear_setup +.PHONY: all dir_setup doc clean docclean depclean distclean dist install +.PHONY: db_init db_clean testonly -all: local - $(MAKE) -C ../archiveServer all - -local: pear_setup dir_setup db_init - -dir_setup: ${DOXYGEN_DIR} - bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} - -pear_setup: - ${PEAR_INSTALLER} -d ${ROOT_PATH} +all: doc: ${DOXYGEN} ${DOXYGEN_CONFIG} @@ -118,7 +138,6 @@ docclean: ${RMDIR} ${DOXYGEN_DIR}/html depclean: clean - $(MAKE) -C ../archiveServer clean dist: ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * @@ -127,23 +146,32 @@ distclean: clean docclean testonly: ${TEST_RUNNER} ${TEST_RUNNER} -# $(MAKE) transtest -check: all testonly - -localcheck: local testonly +check: all +#testonly recheck: clean check -reset: - ./bin/resetStorage.sh +install: + ${MKDIR} ${DEST_DIR} + ${MKDIR} ${DEST_DIR}/access + ${MKDIR} ${DEST_DIR}/install + ${MKDIR} ${DEST_DIR}/stor + ${MKDIR} ${DEST_DIR}/stor/buffer + ${MKDIR} ${DEST_DIR}/trans + ${MKDIR} ${DEST_DIR}/xmlrpc + ${CP} ${VAR_DIR}/*.{php,template} ${DEST_DIR} + ${CP} ${VAR_DIR}/install/*.php ${DEST_DIR}/install + ${CP} ${VAR_DIR}/xmlrpc/*.php ${DEST_DIR}/xmlrpc + ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ + > ${DEST_DIR}/conf.php + #------------------------------------------------------------------------------- # Specific targets #------------------------------------------------------------------------------- -transtest: - ./var/tests/transTest.sh -# cd var/tests; php -q transTest.php +dir_setup: ${DOXYGEN_DIR} + bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: cd var/install; php -q install.php diff --git a/livesupport/modules/archiveServer/etc/configure.ac b/livesupport/modules/archiveServer/etc/configure.ac new file mode 100644 index 000000000..561164efb --- /dev/null +++ b/livesupport/modules/archiveServer/etc/configure.ac @@ -0,0 +1,138 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(ArchiveServer, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/Archive.php) + + +dnl----------------------------------------------------------------------------- +dnl specify the FQDN +dnl----------------------------------------------------------------------------- +AC_SUBST(HOSTNAME) + +AC_ARG_WITH([hostname], + AC_HELP_STRING([--with-hostname], + [use the specified hostname (guess)]), + [HOSTNAME=${withval}], [HOSTNAME=`hostname -f`]) + +AC_MSG_RESULT([using hostname: ${HOSTNAME}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the web server port +dnl----------------------------------------------------------------------------- +AC_SUBST(WWW_PORT) + +AC_ARG_WITH([www-port], + AC_HELP_STRING([--with-www-port], + [use the specified www port (80)]), + [WWW_PORT=${withval}], [WWW_PORT=80]) + +AC_MSG_RESULT([using www port: ${WWW_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server name +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_SERVER) + +AC_ARG_WITH([database-server], + AC_HELP_STRING([--with-database-server], + [use the specified database server (localhost)]), + [DB_SERVER=${withval}], [DB_SERVER=localhost]) + +AC_MSG_RESULT([using database server: ${DB_SERVER}]) + + +dnl----------------------------------------------------------------------------- +dnl get the name of the LiveSupport database +dnl----------------------------------------------------------------------------- +AC_SUBST(DATABASE) + +AC_ARG_WITH([database], + AC_HELP_STRING([--with-database], + [the name of the postgresql database to use (LiveSupport)]), + [DATABASE=${withval}], [DATABASE=LiveSupport]) + +AC_MSG_RESULT([using database: ${DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_USER) + +AC_ARG_WITH([database-user], + AC_HELP_STRING([--with-database-user], + [use the specified database server user (livesupport)]), + [DB_USER=${withval}], [DB_USER=livesupport]) + +AC_MSG_RESULT([using database server user: ${DB_USER}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user password +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_PASSWORD) + +AC_ARG_WITH([database-password], + AC_HELP_STRING([--with-database-password], + [use the specified database server user password (livesupport)]), + [DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) + +AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) + + +dnl display status info on what libraries will get compiled + +AC_MSG_NOTICE( +[using the following configuration settings: + + hostname: ${HOSTNAME} + www port: ${WWW_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + +]) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() diff --git a/livesupport/modules/archiveServer/var/conf.php.template b/livesupport/modules/archiveServer/var/conf.php.template index 0a545bdc0..1a4c189ae 100644 --- a/livesupport/modules/archiveServer/var/conf.php.template +++ b/livesupport/modules/archiveServer/var/conf.php.template @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: tomas $ - Version : $Revision: 1.5 $ + Author : $Author: maroy $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php.template,v $ ------------------------------------------------------------------------------*/ @@ -82,7 +82,7 @@ $config = array( 'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer', 'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans', 'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access', - 'pearPath' => 'ls_install_dir/usr/lib/php/php', + 'pearPath' => 'ls_lib_dir/pear', 'isArchive' => TRUE, 'validate' => TRUE, 'useTrash' => FALSE, diff --git a/livesupport/modules/authentication/configure b/livesupport/modules/authentication/configure new file mode 100755 index 000000000..7ad3d5884 --- /dev/null +++ b/livesupport/modules/authentication/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index 421d02cb0..aec412df9 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.9 $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -49,7 +50,7 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -119,7 +120,7 @@ TEST_RUNNER_LIBS = -l${AUTHENTICATION_LIB} -l${CORE_LIB} \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean check +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${AUTHENTICATION_LIB_FILE} @@ -147,6 +148,12 @@ check: all ${TEST_RUNNER} ${MAKE} -C ${STORAGE_SERVER_DIR} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Authentication + ${CP} ${INCLUDE_DIR}/LiveSupport/Authentication/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/Authentication + ${CP} ${AUTHENTICATION_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/authentication/etc/configure.ac b/livesupport/modules/authentication/etc/configure.ac index d7e569d82..bcb119c33 100644 --- a/livesupport/modules/authentication/etc/configure.ac +++ b/livesupport/modules/authentication/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.3 $ +dnl Version : $Revision: 1.4 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Authentication, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.3 $) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR(../src/AuthenticationClientFactory.cxx) @@ -44,10 +44,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/core/configure b/livesupport/modules/core/configure new file mode 100755 index 000000000..d90876161 --- /dev/null +++ b/livesupport/modules/core/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 1a5f10941..0303846bc 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.31 $ +# Version : $Revision: 1.32 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -52,7 +53,7 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib @@ -160,7 +161,7 @@ TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${CORE_LIB_FILE} @@ -187,6 +188,12 @@ distclean: clean docclean check: ${TEST_RUNNER} ${TEST_RUNNER_RES} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Core + ${CP} ${INCLUDE_DIR}/LiveSupport/Core/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/Core + ${CP} ${CORE_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/core/etc/configure.ac b/livesupport/modules/core/etc/configure.ac index f1f5d2c00..b282b627f 100644 --- a/livesupport/modules/core/etc/configure.ac +++ b/livesupport/modules/core/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.11 $ +dnl Version : $Revision: 1.12 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Core, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.11 $) +AC_REVISION($Revision: 1.12 $) AC_CONFIG_SRCDIR(../src/UniqueId.cxx) @@ -50,7 +50,21 @@ fi AC_CHECK_HEADERS(getopt.h sys/time.h time.h sys/types.h pwd.h errno.h stdint.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/bin/splayTest.sh b/livesupport/modules/db/configure similarity index 76% rename from livesupport/bin/splayTest.sh rename to livesupport/modules/db/configure index 9bf16b7c2..2914009a4 100755 --- a/livesupport/bin/splayTest.sh +++ b/livesupport/modules/db/configure @@ -21,26 +21,32 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fberckel $ +# Author : $Author: maroy $ # Version : $Revision: 1.2 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/splayTest.sh,v $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/configure,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script runs the Helix Simple player using test.mp3. +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script #------------------------------------------------------------------------------- -reldir=`dirname $0`/.. +# assume we're in $basedir +reldir=`dirname $0` basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + bindir=$basedir/bin -docdir=$basedir/doc tmpdir=$basedir/tmp -usrbindir=$basedir/usr/bin -modules_dir=$basedir/modules -usrlibdir=$basedir/usr/lib -echo ""; -echo "Now playing test.mp3 with the Helix Simple Player"; -echo ""; -$usrbindir/splay $modules_dir/playlistExecutor/var/test.mp3 -l $usrlibdir/helix +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/db/etc/Makefile.in b/livesupport/modules/db/etc/Makefile.in index 7a52b87a1..ed2ebbe70 100644 --- a/livesupport/modules/db/etc/Makefile.in +++ b/livesupport/modules/db/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.10 $ +# Version : $Revision: 1.11 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -50,7 +51,7 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -118,7 +119,7 @@ TEST_RUNNER_LIBS = -l${DB_LIB} -l${CORE_LIB} -lcppunit -ldl #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${DB_LIB_FILE} @@ -145,6 +146,12 @@ distclean: clean docclean check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Db + ${CP} ${INCLUDE_DIR}/LiveSupport/Db/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/Db + ${CP} ${DB_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/db/etc/configure.ac b/livesupport/modules/db/etc/configure.ac index 170f4d852..6f95f463a 100644 --- a/livesupport/modules/db/etc/configure.ac +++ b/livesupport/modules/db/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.6 $ +dnl Version : $Revision: 1.7 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Db, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.6 $) +AC_REVISION($Revision: 1.7 $) AC_CONFIG_SRCDIR(../include/LiveSupport/Db/ConnectionManagerInterface.h) @@ -44,11 +44,27 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) -PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) +PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) + + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/configure b/livesupport/modules/eventScheduler/configure new file mode 100755 index 000000000..9119d3e62 --- /dev/null +++ b/livesupport/modules/eventScheduler/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 64146b771..a3f8c44fc 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.7 $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -49,7 +50,7 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -116,7 +117,7 @@ TEST_RUNNER_LIBS = -l${EVENT_SCHEDULER_LIB} -l${CORE_LIB} \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${EVENT_SCHEDULER_LIB_FILE} @@ -143,6 +144,12 @@ distclean: clean docclean check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/EventScheduler + ${CP} ${INCLUDE_DIR}/LiveSupport/EventScheduler/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/EventScheduler + ${CP} ${EVENT_SCHEDULER_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/eventScheduler/etc/configure.ac b/livesupport/modules/eventScheduler/etc/configure.ac index 171b0d63e..861e2367d 100644 --- a/livesupport/modules/eventScheduler/etc/configure.ac +++ b/livesupport/modules/eventScheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.3 $ +dnl Version : $Revision: 1.4 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(EventScheduler, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.3 $) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR(../src/SchedulerThread.cxx) @@ -44,10 +44,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h unistd.h sys/time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/getid3/bin/autogen.sh b/livesupport/modules/getid3/bin/autogen.sh new file mode 100755 index 000000000..c93b036d7 --- /dev/null +++ b/livesupport/modules/getid3/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/getid3/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="GetId3" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/getid3/configure b/livesupport/modules/getid3/configure new file mode 100755 index 000000000..fdbc26def --- /dev/null +++ b/livesupport/modules/getid3/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/getid3/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/getid3/Makefile b/livesupport/modules/getid3/etc/Makefile.in similarity index 91% rename from livesupport/modules/getid3/Makefile rename to livesupport/modules/getid3/etc/Makefile.in index 5937ae7d4..3b7e1ed04 100644 --- a/livesupport/modules/getid3/Makefile +++ b/livesupport/modules/getid3/etc/Makefile.in @@ -20,9 +20,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : Author: James Heinrich -# Version : $Revision: 1.1 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/getid3/Attic/Makefile,v $ +# Author : $Author: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/getid3/etc/Makefile.in,v $ # # @configure_input@ #------------------------------------------------------------------------------- @@ -34,6 +34,8 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f + #------------------------------------------------------------------------------- # Misc @@ -56,14 +58,15 @@ INCLUDE_DIR = ${BASE_DIR}/include LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include -USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -PHP_DIR = ${BASE_DIR}/var +PHP_DIR = ${VAR_DIR} #TEST_RUNNER = ${PHP_DIR}/tests/index.php #------------------------------------------------------------------------------- @@ -85,7 +88,7 @@ PHP_DIR = ${BASE_DIR}/var #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean dist +.PHONY: all dir_setup doc clean docclean depclean distclean dist install all: dir_setup @@ -113,6 +116,11 @@ distclean: clean docclean # ${TEST_RUNNER} check: all +install: + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/getid3/var + ${CP} ${VAR_DIR}/*.{php,txt} ${USR_VAR_DIR}/LiveSupport/getid3/var + + #------------------------------------------------------------------------------- # Specific targets #------------------------------------------------------------------------------- diff --git a/livesupport/modules/getid3/etc/configure.ac b/livesupport/modules/getid3/etc/configure.ac new file mode 100644 index 000000000..df94f6088 --- /dev/null +++ b/livesupport/modules/getid3/etc/configure.ac @@ -0,0 +1,45 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/getid3/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(GetId3, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/getid3.check.php) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() diff --git a/livesupport/modules/gstreamerElements/configure b/livesupport/modules/gstreamerElements/configure new file mode 100755 index 000000000..4dd6b75bd --- /dev/null +++ b/livesupport/modules/gstreamerElements/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/gstreamerElements/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/gstreamerElements/etc/Makefile.in b/livesupport/modules/gstreamerElements/etc/Makefile.in index 8a967dfc3..5f7d5d1ac 100644 --- a/livesupport/modules/gstreamerElements/etc/Makefile.in +++ b/livesupport/modules/gstreamerElements/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.9 $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/gstreamerElements/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -55,7 +56,7 @@ VAR_DIR = ${BASE_DIR}/var REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib @@ -163,7 +164,7 @@ PLAY_LIBS = -l${GSTREAMER_ELEMENTS_LIB} -l${CORE_LIB} #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${GSTREAMER_ELEMENTS_LIB_FILE} \ ${ONESHOT_READER_LIB_FILE} \ @@ -205,6 +206,18 @@ distclean: clean docclean check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/GstreamerElements + ${CP} ${INCLUDE_DIR}/LiveSupport/GstreamerElements/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/GstreamerElements + ${CP} ${GSTREAMER_ELEMENTS_LIB_FILE} \ + ${ONESHOT_READER_LIB_FILE} \ + ${MINIMAL_AUDIO_SMIL_LIB_FILE} \ + ${PARTIAL_PLAY_LIB_FILE} \ + ${SWITCHER_LIB_FILE} \ + ${USR_LIB_DIR} + -GST_PLUGIN_PATH=${USR_LIB_DIR} ${GST_REGISTER} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/gstreamerElements/etc/configure.ac b/livesupport/modules/gstreamerElements/etc/configure.ac index d1c062adc..84169046a 100644 --- a/livesupport/modules/gstreamerElements/etc/configure.ac +++ b/livesupport/modules/gstreamerElements/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.1 $ +dnl Version : $Revision: 1.2 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/gstreamerElements/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(GstreamerElements, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.1 $) +AC_REVISION($Revision: 1.2 $) AC_CONFIG_SRCDIR(../src/oneshot-reader.c) @@ -45,10 +45,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(string.h getopt.h) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/htmlUI/.htaccess b/livesupport/modules/htmlUI/.htaccess deleted file mode 100644 index ba3404cb8..000000000 --- a/livesupport/modules/htmlUI/.htaccess +++ /dev/null @@ -1,12 +0,0 @@ -DirectoryIndex index.php -Options +FollowSymLinks -Indexes - - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc On - php_flag register_globals Off - - - diff --git a/livesupport/modules/htmlUI/bin/autogen.sh b/livesupport/modules/htmlUI/bin/autogen.sh new file mode 100755 index 000000000..01e9ae960 --- /dev/null +++ b/livesupport/modules/htmlUI/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="Alib" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/htmlUI/bin/configureApache.sh b/livesupport/modules/htmlUI/bin/configureApache.sh new file mode 100755 index 000000000..0aafa5279 --- /dev/null +++ b/livesupport/modules/htmlUI/bin/configureApache.sh @@ -0,0 +1,150 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/bin/configureApache.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# This script configures apache for the htmlUI +# +# Invoke as: +# ./bin/configureApache.sh +# +# To get usage help, try the -h option +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Determine directories, files +#------------------------------------------------------------------------------- +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +bindir=$basedir/bin +etcdir=$basedir/etc +docdir=$basedir/doc +tmpdir=$basedir/tmp +usrdir=$basedir/usr + + +#------------------------------------------------------------------------------- +# Print the usage information for this script. +#------------------------------------------------------------------------------- +printUsage() +{ + echo "LiveSupport apache configuration script."; + echo "parameters"; + echo ""; + echo " -h, --help Print this message and exit."; + echo ""; +} + + +#------------------------------------------------------------------------------- +# Process command line parameters +#------------------------------------------------------------------------------- +CMD=${0##*/} + +opts=$(getopt -o h -l help -n $CMD -- "$@") || exit 1 +eval set -- "$opts" +while true; do + case "$1" in + -h|--help) + printUsage; + exit 0;; + --) + shift; + break;; + *) + echo "Unrecognized option $1."; + printUsage; + exit 1; + esac +done + + +echo "Configuring apache for LiveSupport HTML interface."; +echo "" + + +#------------------------------------------------------------------------------- +# Check to see if this script is being run as root +#------------------------------------------------------------------------------- +if [ `whoami` != "root" ]; then + echo "Please run this script as root."; + exit ; +fi + + +#------------------------------------------------------------------------------- +# Configuring Apache +#------------------------------------------------------------------------------- +echo "Configuring apache ..." +CONFFILE=90_php_livesupport.conf +AP_DDIR_FOUND=no +for APACHE_DDIR in \ + /etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d +do + echo -n "$APACHE_DDIR " + if [ -d $APACHE_DDIR ]; then + echo "Y" + AP_DDIR_FOUND=yes + cp $etcdir/$CONFFILE $APACHE_DDIR + else + echo "N" + fi +done +if [ "$AP_DDIR_FOUND" != "yes" ]; then + echo "###############################" + echo " Could not configure Apache" + echo " include following file into apache config manually:" + echo " $etcdir/$CONFFILE" + echo "###############################" +fi +echo "done" + +echo "Restarting apache..."; +AP_SCR_FOUND=no +for APACHE_SCRIPT in apache apache2 httpd ; do + echo -n "$APACHE_SCRIPT " + if [ -x /etc/init.d/$APACHE_SCRIPT ]; then + echo "Y" + AP_SCR_FOUND=yes + /etc/init.d/$APACHE_SCRIPT restart + else + echo "N" + fi +done +if [ "$AP_SCR_FOUND" != "yes" ]; then + echo "###############################" + echo " Could not reload Apache" + echo " please reload apache manually" + echo "###############################" +fi +echo "done" + + +#------------------------------------------------------------------------------- +# Say goodbye +#------------------------------------------------------------------------------- +echo "Done." + diff --git a/livesupport/modules/htmlUI/configure b/livesupport/modules/htmlUI/configure new file mode 100755 index 000000000..6cf83f0a6 --- /dev/null +++ b/livesupport/modules/htmlUI/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/htmlUI/etc/90_php_livesupport.conf b/livesupport/modules/htmlUI/etc/90_php_livesupport.conf new file mode 100644 index 000000000..b8e44f9d0 --- /dev/null +++ b/livesupport/modules/htmlUI/etc/90_php_livesupport.conf @@ -0,0 +1,2 @@ + +php_value upload_max_filesize 32M diff --git a/livesupport/modules/htmlUI/etc/Makefile.in b/livesupport/modules/htmlUI/etc/Makefile.in new file mode 100644 index 000000000..3c137f5b7 --- /dev/null +++ b/livesupport/modules/htmlUI/etc/Makefile.in @@ -0,0 +1,228 @@ +#------------------------------------------------------------------------------- +# htmlUI - remote access user interface +# Copyright (c) 2004 Media Development Loan Fund +# +# This file is part of the LiveSupport project. +# Copyright (c) 2004 Media Development Loan Fund +# +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/etc/Makefile.in,v $ +# +# @configure_input@ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +CP = cp -f + + +#------------------------------------------------------------------------------- +# Misc +#------------------------------------------------------------------------------- + +MODULE_NAME = htmlUI +TAR_C = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f +DIST_EXT = .tgz +DATE = `date +%y%m%d` + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +#BASE_DIR = @builddir@ +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +ETC_DIR = ${BASE_DIR}/etc +INCLUDE_DIR = ${BASE_DIR}/include +LIB_DIR = ${BASE_DIR}/lib +SRC_DIR = ${BASE_DIR}/src +TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var + +USR_DIR = @prefix@ +USR_INCLUDE_DIR = ${USR_DIR}/include +USR_VAR_DIR = ${USR_DIR}/var + +DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config + +PHP_DIR = ${VAR_DIR} +#TEST_RUNNER = ${PHP_DIR}/tests/index.php + +APACHE_GROUP = @APACHE_GROUP@ +WWW_DOCROOT = @WWW_DOCROOT@ + + +#------------------------------------------------------------------------------- +# Configuration parameters +#------------------------------------------------------------------------------- +#CPPFLAGS = @CPPFLAGS@ +#CXXFLAGS = @CXXFLAGS@ @DEFS@ -I${USR_INCLUDE_DIR} -I${INCLUDE_DIR} -I${TMP_DIR}\ +# -pedantic -Wall +#LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${LIB_DIR} + + +#------------------------------------------------------------------------------- +# Dependencies +#------------------------------------------------------------------------------- +#HELLO_LIB_OBJS = ${TMP_DIR}/Hello.o +#TEST_RUNNER_OBJS = ${TMP_DIR}/HelloTest.o ${TMP_DIR}/TestRunner.o + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +.PHONY: all dir_setup doc clean docclean depclean distclean dist install + +all: dir_setup + +#dir_setup: ${TMP_DIR} ${DOXYGEN_DIR} +dir_setup: ${DOXYGEN_DIR} + +doc: + ${DOXYGEN} ${DOXYGEN_CONFIG} + +clean: +# ${RM} ... + +docclean: + ${RMDIR} ${DOXYGEN_DIR}/html + +depclean: clean + +dist: all + ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * + +distclean: clean docclean +# ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* + +#check: all ${TEST_RUNNER} +# ${TEST_RUNNER} +check: all + +install: configure_apache + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/img + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/css_img + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs/plugins + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs/internals + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/formmask + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates_c + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/localizer + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/localizer/.icons + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/sub + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/file + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/popup + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/library + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/scheduler + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/scratchpad + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/loader + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/script + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/system + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/playlist + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/subjects + + ${CP} ${VAR_DIR}/*.xml ${VAR_DIR}/*.php \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var + ${CP} ${VAR_DIR}/html/*.php ${VAR_DIR}/html/*.css \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html + ${CP} ${VAR_DIR}/html/img/*.png ${VAR_DIR}/html/img/*.gif \ + ${VAR_DIR}/html/img/*.swf ${VAR_DIR}/html/img/*.image \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/img + ${CP} ${VAR_DIR}/html/css_img/*.png \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/css_img + ${CP} ${VAR_DIR}/formmask/*.php \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/formmask + ${CP} ${VAR_DIR}/localizer/*.php ${VAR_DIR}/localizer/*.xml\ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/localizer + ${CP} ${VAR_DIR}/localizer/.icons/*.jpg ${VAR_DIR}/localizer/.icons/*.gif \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/localizer/.icons + ${CP} ${VAR_DIR}/Smarty/libs/*.php \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs/ + ${CP} ${VAR_DIR}/Smarty/libs/internals/*.php \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs/internals/ + ${CP} ${VAR_DIR}/Smarty/libs/plugins/*.php \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/Smarty/libs/plugins/ + ${CP} ${VAR_DIR}/templates/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates + ${CP} ${VAR_DIR}/templates/sub/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/sub + ${CP} ${VAR_DIR}/templates/file/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/file + ${CP} ${VAR_DIR}/templates/popup/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/popup + ${CP} ${VAR_DIR}/templates/library/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/library + ${CP} ${VAR_DIR}/templates/scheduler/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/scheduler + ${CP} ${VAR_DIR}/templates/scratchpad/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/scratchpad + ${CP} ${VAR_DIR}/templates/loader/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/loader + ${CP} ${VAR_DIR}/templates/script/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/script + ${CP} ${VAR_DIR}/templates/system/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/system + ${CP} ${VAR_DIR}/templates/playlist/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/playlist + ${CP} ${VAR_DIR}/templates/subjects/*.tpl \ + ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates/subjects + + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates_c + + chgrp ${APACHE_GROUP} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates_c + chgrp ${APACHE_GROUP} ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/img + + chmod g+sw ${USR_VAR_DIR}/LiveSupport/htmlUI/var/templates_c + chmod g+sw ${USR_VAR_DIR}/LiveSupport/htmlUI/var/html/img + + ${RM} ${WWW_DOCROOT}/livesupport + ln -sf ${USR_VAR_DIR}/LiveSupport ${WWW_DOCROOT}/livesupport + ${CP} ${VAR_DIR}/redirect.php ${USR_VAR_DIR}/LiveSupport/index.php + +configure_apache: +ifeq (@CONFIGURE_APACHE@,yes) + ${BIN_DIR}/configureApache.sh +endif + + +#------------------------------------------------------------------------------- +# Specific targets +#------------------------------------------------------------------------------- +${DOXYGEN_DIR}: + ${MKDIR} ${DOXYGEN_DIR} + +#${TEST_RUNNER}: + +#------------------------------------------------------------------------------- +# Pattern rules +#------------------------------------------------------------------------------- +#${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx +# ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $< + diff --git a/livesupport/modules/htmlUI/etc/configure.ac b/livesupport/modules/htmlUI/etc/configure.ac new file mode 100644 index 000000000..c3bde2d74 --- /dev/null +++ b/livesupport/modules/htmlUI/etc/configure.ac @@ -0,0 +1,96 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(HtmlUI, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/ui_conf.php) + +dnl----------------------------------------------------------------------------- +dnl specify wether apache should be configured through it's conf.d directory +dnl----------------------------------------------------------------------------- +AC_SUBST(CONFIGURE_APACHE) + +AC_ARG_WITH([configure-apache], + AC_HELP_STRING([--with-configure-apache], + [specify wether apache should be configured for LiveSupport + through its conf.d directory (no)]), + [CONFIGURE_APACHE=${withval}], + [CONFIGURE_APACHE=no]) + +AC_MSG_RESULT([configure apache: ${CONFIGURE_APACHE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify group in which apache is running +dnl----------------------------------------------------------------------------- +AC_SUBST(APACHE_GROUP) + +AC_ARG_WITH([apache-group], + AC_HELP_STRING([--with-apache-group], + [use apache running in the specified group (apache)]), + [APACHE_GROUP=${withval}], [APACHE_GROUP=apache]) + +AC_MSG_RESULT([using apache group: ${APACHE_GROUP}]) + + +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}]) + + +AC_MSG_NOTICE( +[using the following configuration settings: + + apache group: ${APACHE_GROUP} + www document root: ${WWW_DOCROOT} + configuring apache: ${CONFIGURE_APACHE} + +]) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/modules/htmlUI/var/Smarty/ChangeLog b/livesupport/modules/htmlUI/var/Smarty/ChangeLog index 28e9578d6..887ccdd83 100644 --- a/livesupport/modules/htmlUI/var/Smarty/ChangeLog +++ b/livesupport/modules/htmlUI/var/Smarty/ChangeLog @@ -2979,7 +2979,7 @@ * libs/Smarty.class.php libs/Smarty_Compiler.class.php: - added CVS $Id: ChangeLog,v 1.5 2005/02/25 16:58:26 sebastian Exp $ + added CVS $Id: ChangeLog,v 1.6 2005/08/01 19:25:59 maroy Exp $ 2003-03-31 Messju Mohr diff --git a/livesupport/modules/htmlUI/var/Smarty/libs/Config_File.class.php b/livesupport/modules/htmlUI/var/Smarty/libs/Config_File.class.php index 87e7d5df3..6a756c157 100644 --- a/livesupport/modules/htmlUI/var/Smarty/libs/Config_File.class.php +++ b/livesupport/modules/htmlUI/var/Smarty/libs/Config_File.class.php @@ -25,7 +25,7 @@ * @package Smarty */ -/* $Id: Config_File.class.php,v 1.5 2005/02/25 16:58:26 sebastian Exp $ */ +/* $Id: Config_File.class.php,v 1.6 2005/08/01 19:25:59 maroy Exp $ */ /** * Config file reading class diff --git a/livesupport/modules/htmlUI/var/Smarty/libs/Smarty.class.php b/livesupport/modules/htmlUI/var/Smarty/libs/Smarty.class.php index b42f598a2..cc54513ef 100755 --- a/livesupport/modules/htmlUI/var/Smarty/libs/Smarty.class.php +++ b/livesupport/modules/htmlUI/var/Smarty/libs/Smarty.class.php @@ -30,7 +30,7 @@ * @version 2.6.6 */ -/* $Id: Smarty.class.php,v 1.5 2005/02/25 16:58:26 sebastian Exp $ */ +/* $Id: Smarty.class.php,v 1.6 2005/08/01 19:25:59 maroy Exp $ */ /** * DIR_SEP isn't used anymore, but third party apps might diff --git a/livesupport/modules/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php b/livesupport/modules/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php index 961522444..7b4c4da59 100644 --- a/livesupport/modules/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php +++ b/livesupport/modules/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php @@ -26,7 +26,7 @@ * @package Smarty */ -/* $Id: Smarty_Compiler.class.php,v 1.5 2005/02/25 16:58:26 sebastian Exp $ */ +/* $Id: Smarty_Compiler.class.php,v 1.6 2005/08/01 19:25:59 maroy Exp $ */ /** * Template compiling class diff --git a/livesupport/modules/htmlUI/var/redirect.php b/livesupport/modules/htmlUI/var/redirect.php new file mode 100644 index 000000000..426113990 --- /dev/null +++ b/livesupport/modules/htmlUI/var/redirect.php @@ -0,0 +1,3 @@ + diff --git a/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php b/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php index 5e12d7edf..d94bac659 100644 --- a/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php +++ b/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: sebastian $ - Version : $Revision: 1.1 $ + Author : $Author: maroy $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php,v $ ------------------------------------------------------------------------------*/ diff --git a/livesupport/modules/playlistExecutor/configure b/livesupport/modules/playlistExecutor/configure new file mode 100755 index 000000000..0197a6907 --- /dev/null +++ b/livesupport/modules/playlistExecutor/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index 6c124e14f..6a2eebd56 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.18 $ +# Version : $Revision: 1.19 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -52,7 +53,7 @@ TMP_DIR = ${BASE_DIR}/tmp REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -145,7 +146,7 @@ TWOTEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${PLAYLIST_EXECUTOR_LIB_FILE} @@ -175,6 +176,12 @@ check: all ${TEST_RUNNER} check_two: all ${TWOTEST_RUNNER} ${TWOTEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/PlaylistExecutor + ${CP} ${INCLUDE_DIR}/LiveSupport/PlaylistExecutor/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/PlaylistExecutor + ${CP} ${PLAYLIST_EXECUTOR_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/playlistExecutor/etc/configure.ac b/livesupport/modules/playlistExecutor/etc/configure.ac index 536d31b2c..a5ad78e76 100644 --- a/livesupport/modules/playlistExecutor/etc/configure.ac +++ b/livesupport/modules/playlistExecutor/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.9 $ +dnl Version : $Revision: 1.10 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(PlaylistExecutor, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.9 $) +AC_REVISION($Revision: 1.10 $) AC_CONFIG_SRCDIR(../src/AudioPlayerFactory.cxx) @@ -44,7 +44,21 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) @@ -52,6 +66,7 @@ PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/schedulerClient/configure b/livesupport/modules/schedulerClient/configure new file mode 100755 index 000000000..2021682a1 --- /dev/null +++ b/livesupport/modules/schedulerClient/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index 5dd477492..8ac4e0bf7 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -49,7 +50,7 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -140,7 +141,7 @@ TEST_RUNNER_LIBS = -l${SCHEDULER_CLIENT_LIB} \ # Targets #------------------------------------------------------------------------------- .PHONY: all dir_setup doc clean docclean depclean distclean -.PHONY: install start run_tests stop uninstall +.PHONY: check install init start run_tests stop deinit all: dir_setup ${SCHEDULER_CLIENT_LIB_FILE} @@ -166,13 +167,13 @@ depclean: clean distclean: clean docclean ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4 -check: all ${TEST_RUNNER} install start run_tests stop uninstall +check: all ${TEST_RUNNER} init start run_tests stop deinit run_tests: ${TEST_RUNNER} -${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} -install: ${SCHEDULER_EXE} storage_server_init - ${MAKE} -C ${SCHEDULER_DIR} install +init: ${SCHEDULER_EXE} storage_server_init + ${MAKE} -C ${SCHEDULER_DIR} init start: ${SCHEDULER_EXE} ${MAKE} -C ${SCHEDULER_DIR} start @@ -180,8 +181,14 @@ start: ${SCHEDULER_EXE} stop: ${SCHEDULER_EXE} ${MAKE} -C ${SCHEDULER_DIR} stop -uninstall: ${SCHEDULER_EXE} - ${MAKE} -C ${SCHEDULER_DIR} uninstall +deinit: ${SCHEDULER_EXE} + ${MAKE} -C ${SCHEDULER_DIR} deinit + +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/SchedulerClient + ${CP} ${INCLUDE_DIR}/LiveSupport/SchedulerClient/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/SchedulerClient + ${CP} ${SCHEDULER_CLIENT_LIB_FILE} ${USR_LIB_DIR} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/schedulerClient/etc/configure.ac b/livesupport/modules/schedulerClient/etc/configure.ac index c538b6608..a510a7a79 100644 --- a/livesupport/modules/schedulerClient/etc/configure.ac +++ b/livesupport/modules/schedulerClient/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.3 $ +dnl Version : $Revision: 1.4 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(StorageClient, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.3 $) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR(../include/LiveSupport/SchedulerClient/SchedulerClientFactory.h) @@ -44,10 +44,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/storage/configure b/livesupport/modules/storage/configure new file mode 100755 index 000000000..9744b1f0c --- /dev/null +++ b/livesupport/modules/storage/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 15bf26d62..74288cf1a 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.23 $ +# Version : $Revision: 1.24 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -49,7 +50,7 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 @@ -135,7 +136,7 @@ TEST_RUNNER_LIBS = -l${STORAGE_LIB} -l${CORE_LIB} -l${AUTHENTICATION_LIB} \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean check +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${STORAGE_LIB_FILE} @@ -162,6 +163,12 @@ distclean: clean docclean check: all ${TEST_RUNNER} storage_server_init ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Storage + ${CP} ${INCLUDE_DIR}/LiveSupport/Storage/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/Storage + ${CP} ${STORAGE_LIB_FILE} ${USR_LIB_DIR} + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/storage/etc/configure.ac b/livesupport/modules/storage/etc/configure.ac index 098241638..ae95f2c63 100644 --- a/livesupport/modules/storage/etc/configure.ac +++ b/livesupport/modules/storage/etc/configure.ac @@ -20,8 +20,8 @@ dnl along with LiveSupport; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl -dnl Author : $Author: fgerlits $ -dnl Version : $Revision: 1.5 $ +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.6 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Storage, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.5 $) +AC_REVISION($Revision: 1.6 $) AC_CONFIG_SRCDIR(../src/StorageClientFactory.cxx) @@ -44,10 +44,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/storageAdmin/bin/autogen.sh b/livesupport/modules/storageAdmin/bin/autogen.sh new file mode 100755 index 000000000..b7238795c --- /dev/null +++ b/livesupport/modules/storageAdmin/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="StorageAdmin" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/storageAdmin/configure b/livesupport/modules/storageAdmin/configure new file mode 100755 index 000000000..bf7ccc309 --- /dev/null +++ b/livesupport/modules/storageAdmin/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/archiveServer/Makefile b/livesupport/modules/storageAdmin/etc/Makefile.in similarity index 75% rename from livesupport/modules/archiveServer/Makefile rename to livesupport/modules/storageAdmin/etc/Makefile.in index 3be1745ee..d5be07fcc 100644 --- a/livesupport/modules/archiveServer/Makefile +++ b/livesupport/modules/storageAdmin/etc/Makefile.in @@ -1,8 +1,9 @@ #------------------------------------------------------------------------------- -# ArchiveServer - central archive component -# Copyright (c) 2004 Media Development Loan Fund +# getID3 - read and writes tags in media files - see getid3.readme.txt +# getID3 by James Heinrich # # This file is part of the LiveSupport project. +# Copyright (c) 2004 Media Development Loan Fund # # LiveSupport is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +20,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ -# Version : $Revision: 1.4 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/Attic/Makefile,v $ +# Author : Author$ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/etc/Makefile.in,v $ # # @configure_input@ #------------------------------------------------------------------------------- @@ -33,12 +34,17 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f +SED = sed +ECHO = echo +CAT = cat + #------------------------------------------------------------------------------- # Misc #------------------------------------------------------------------------------- -MODULE_NAME = archiveServer +MODULE_NAME = getid3 TAR_C = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f DIST_EXT = .tgz DATE = `date +%y%m%d` @@ -55,23 +61,27 @@ INCLUDE_DIR = ${BASE_DIR}/include LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var +BIN_DIR = ${BASE_DIR}/bin -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include -USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -PHP_DIR = ${BASE_DIR}/var -INSTALL_DIR = ${PHP_DIR}/install -STOR_DIR = ${PHP_DIR}/stor -ACCESS_DIR = ${PHP_DIR}/access -TRANS_DIR = ${PHP_DIR}/trans -BUFF_DIR = ${STOR_DIR}/buffer -TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh +PHP_DIR = ${VAR_DIR} +#TEST_RUNNER = ${PHP_DIR}/tests/index.php + +DEST_DIR = ${USR_VAR_DIR}/LiveSupport/storageAdmin/var + +USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") + +REPLACE_SED_STRING="s/ls_var_dir/${USR_VAR_DIR_S}/;" + #------------------------------------------------------------------------------- -# Configuration parameters +# Configuration parameters #------------------------------------------------------------------------------- #CPPFLAGS = @CPPFLAGS@ #CXXFLAGS = @CXXFLAGS@ @DEFS@ -I${USR_INCLUDE_DIR} -I${INCLUDE_DIR} -I${TMP_DIR}\ @@ -80,7 +90,7 @@ TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh #------------------------------------------------------------------------------- -# Dependencies +# Dependencies #------------------------------------------------------------------------------- #HELLO_LIB_OBJS = ${TMP_DIR}/Hello.o #TEST_RUNNER_OBJS = ${TMP_DIR}/HelloTest.o ${TMP_DIR}/TestRunner.o @@ -89,56 +99,50 @@ TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean dist \ - db_init db_clean testonly +.PHONY: all dir_setup doc clean docclean depclean distclean dist install -all: dir_setup db_init +all: dir_setup +#dir_setup: ${TMP_DIR} ${DOXYGEN_DIR} dir_setup: ${DOXYGEN_DIR} - bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} doc: ${DOXYGEN} ${DOXYGEN_CONFIG} -clean: db_clean - ${RMDIR} ${STOR_DIR} - ${RMDIR} ${ACCESS_DIR} - ${RMDIR} ${TRANS_DIR} +clean: +# ${RM} ... docclean: ${RMDIR} ${DOXYGEN_DIR}/html depclean: clean -dist: +dist: all ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * distclean: clean docclean +# ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* -testonly: ${TEST_RUNNER} - ${TEST_RUNNER} - +#check: all ${TEST_RUNNER} +# ${TEST_RUNNER} check: all -#testonly -recheck: clean check - +install: + ${CP} ${BIN_DIR}/*.sh ${USR_DIR}/bin + ${RM} ${USR_DIR}/bin/autogen.sh + ${MKDIR} ${DEST_DIR} + ${CP} ${VAR_DIR}/*.php ${DEST_DIR} + ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ + > ${DEST_DIR}/conf.php + + #------------------------------------------------------------------------------- # Specific targets #------------------------------------------------------------------------------- -db_init: - cd var/install; php -q install.php - -db_clean: - cd var/install; php -q uninstall.php - -${TMP_DIR}: - ${MKDIR} ${TMP_DIR} - ${DOXYGEN_DIR}: ${MKDIR} ${DOXYGEN_DIR} -${TEST_RUNNER}: +#${TEST_RUNNER}: #------------------------------------------------------------------------------- # Pattern rules diff --git a/livesupport/modules/storageAdmin/etc/configure.ac b/livesupport/modules/storageAdmin/etc/configure.ac new file mode 100644 index 000000000..3076c09ec --- /dev/null +++ b/livesupport/modules/storageAdmin/etc/configure.ac @@ -0,0 +1,45 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(StorageAdmin, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/getStorPath.php) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() diff --git a/livesupport/modules/storageAdmin/var/conf.php.template b/livesupport/modules/storageAdmin/var/conf.php.template index 5765d6c5d..fc37fae38 100644 --- a/livesupport/modules/storageAdmin/var/conf.php.template +++ b/livesupport/modules/storageAdmin/var/conf.php.template @@ -22,11 +22,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: tomas $ - Version : $Revision: 1.1 $ + Author : $Author: maroy $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/var/conf.php.template,v $ ------------------------------------------------------------------------------*/ -$storageServerPath = 'ls_install_dir/var/storageServer'; +$storageServerPath = 'ls_var_dir/LiveSupport/storageServer'; ?> diff --git a/livesupport/modules/storageServer/bin/autogen.sh b/livesupport/modules/storageServer/bin/autogen.sh new file mode 100755 index 000000000..29c7ac80d --- /dev/null +++ b/livesupport/modules/storageServer/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="StorageServer" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/modules/storageServer/bin/createDatabase.sh b/livesupport/modules/storageServer/bin/createDatabase.sh new file mode 100755 index 000000000..354cf3b6b --- /dev/null +++ b/livesupport/modules/storageServer/bin/createDatabase.sh @@ -0,0 +1,216 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/bin/createDatabase.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# This script reates the database used by LiveSupport +# +# Invoke as: +# ./bin/createDatabase.sh +# +# To get usage help, try the -h option +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Determine directories, files +#------------------------------------------------------------------------------- +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +bindir=$basedir/bin +etcdir=$basedir/etc +docdir=$basedir/doc +tmpdir=$basedir/tmp +usrdir=$basedir/usr + + +#------------------------------------------------------------------------------- +# Print the usage information for this script. +#------------------------------------------------------------------------------- +printUsage() +{ + echo "LiveSupport scheduler database creation script."; + echo "parameters"; + echo ""; + echo " -D, --database The name of the LiveSupport database."; + echo " [default: LiveSupport]"; + echo " -s, --dbserver The name of the database server host."; + echo " [default: localhost]"; + echo " -u, --dbuser The name of the database user to access the" + echo " database. [default: livesupport]"; + echo " -w, --dbpassword The database user password."; + echo " [default: livesupport]"; + echo " -h, --help Print this message and exit."; + echo ""; +} + + +#------------------------------------------------------------------------------- +# Process command line parameters +#------------------------------------------------------------------------------- +CMD=${0##*/} + +opts=$(getopt -o D:hs:u:w: -l database:,dbserver:,dbuser:,dbpassword:,help, -n $CMD -- "$@") || exit 1 +eval set -- "$opts" +while true; do + case "$1" in + -D|--database) + database=$2; + shift; shift;; + -h|--help) + printUsage; + exit 0;; + -s|--dbserver) + dbserver=$2; + shift; shift;; + -u|--dbuser) + dbuser=$2; + shift; shift;; + -w|--dbpassword) + dbpassword=$2; + shift; shift;; + --) + shift; + break;; + *) + echo "Unrecognized option $1."; + printUsage; + exit 1; + esac +done + +if [ "x$dbserver" == "x" ]; then + dbserver=localhost; +fi + +if [ "x$database" == "x" ]; then + database=LiveSupport; +fi + +if [ "x$dbuser" == "x" ]; then + dbuser=livesupport; +fi + +if [ "x$dbpassword" == "x" ]; then + dbpassword=livesupport; +fi + +echo "Creating database for LiveSupport scheduler."; +echo ""; +echo "Using the following parameters:"; +echo ""; +echo " database server: $dbserver"; +echo " database: $database"; +echo " database user: $dbuser"; +echo " database user password: $dbpassword"; +echo "" + +#------------------------------------------------------------------------------- +# The details of installation +#------------------------------------------------------------------------------- +ls_dbserver=$dbserver +ls_dbuser=$dbuser +ls_dbpassword=$dbpassword +ls_database=$database + + +postgres_user=postgres + +#------------------------------------------------------------------------------- +# Function to check for the existence of an executable on the PATH +# +# @param $1 the name of the exectuable +# @return 0 if the executable exists on the PATH, non-0 otherwise +#------------------------------------------------------------------------------- +check_exe() { + if [ -x "`which $1 2> /dev/null`" ]; then + echo "Executable $1 found..."; + return 0; + else + echo "Executable $1 not found..."; + return 1; + fi +} + + +#------------------------------------------------------------------------------- +# Check to see if this script is being run as root +#------------------------------------------------------------------------------- +if [ `whoami` != "root" ]; then + echo "Please run this script as root."; + exit ; +fi + + +#------------------------------------------------------------------------------- +# Check for required tools +#------------------------------------------------------------------------------- +echo "Checking for required tools..." + +check_exe "su" || exit 1; +check_exe "psql" || exit 1; + + +#------------------------------------------------------------------------------- +# Create the necessary database user and database itself +#------------------------------------------------------------------------------- +echo "Creating database and database user..."; + +# FIXME: the below might not work for remote databases + +if [ "x$ls_dbserver" == "xlocalhost" ]; then + su - $postgres_user -c "echo \"CREATE USER $ls_dbuser \ + ENCRYPTED PASSWORD '$ls_dbpassword' \ + CREATEDB NOCREATEUSER;\" \ + | psql template1" \ + || echo "Couldn't create database user $ls_dbuser."; + + su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \ + OWNER $ls_dbuser ENCODING 'utf-8';\" \ + | psql template1" \ + || echo "Couldn't create database $ls_database."; +else + echo "Unable to automatically create database user and table for"; + echo "remote database $ls_dbserver."; + echo "Make sure to create database user $ls_dbuser with password"; + echo "$ls_dbpassword on database server at $ls_dbserver."; + echo "Also create a database called $ld_database, owned by this user."; + echo ""; + echo "The easiest way to achieve this is by issuing the following SQL"; + echo "commands to PostgreSQL:"; + echo "CREATE USER $ls_dbuser"; + echo " ENCRYPTED PASSWORD '$ls_dbpassword'"; + echo " CREATEDB NOCREATEUSER;"; + echo "CREATE DATABASE \"$ls_database\""; + echo " OWNER $ls_dbuser ENCODING 'utf-8';"; +fi + + +# TODO: check for the success of these operations somehow +#------------------------------------------------------------------------------- +# Say goodbye +#------------------------------------------------------------------------------- +echo "Done." + diff --git a/livesupport/modules/storageServer/configure b/livesupport/modules/storageServer/configure new file mode 100755 index 000000000..e39e4dd6e --- /dev/null +++ b/livesupport/modules/storageServer/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/storageServer/etc/Makefile.in b/livesupport/modules/storageServer/etc/Makefile.in new file mode 100644 index 000000000..02e30731b --- /dev/null +++ b/livesupport/modules/storageServer/etc/Makefile.in @@ -0,0 +1,258 @@ +#------------------------------------------------------------------------------- +# StorageServer - file storage component +# Copyright (c) 2004 Media Development Loan Fund +# +# This file is part of the LiveSupport project. +# +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/Makefile.in,v $ +# +# @configure_input@ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +CP = cp -r +SED = sed +ECHO = echo +CAT = cat +PHP = php + + +#------------------------------------------------------------------------------- +# Misc +#------------------------------------------------------------------------------- + +MODULE_NAME = storageServer +TAR_C = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f +DIST_EXT = .tgz +DATE = `date +%y%m%d` + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +#BASE_DIR = @builddir@ +BASE_DIR = . +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +ETC_DIR = ${BASE_DIR}/etc +INCLUDE_DIR = ${BASE_DIR}/include +LIB_DIR = ${BASE_DIR}/lib +SRC_DIR = ${BASE_DIR}/src +TMP_DIR = ${BASE_DIR}/tmp +VAR_DIR = ${BASE_DIR}/var + +USR_DIR = @prefix@ +USR_INCLUDE_DIR = ${USR_DIR}/include +USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var + +DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config + +PHP_DIR = ${VAR_DIR} +INSTALL_DIR = ${PHP_DIR}/install +STOR_DIR = ${PHP_DIR}/stor +ACCESS_DIR = ${PHP_DIR}/access +TRANS_DIR = ${PHP_DIR}/trans +BUFF_DIR = ${STOR_DIR}/buffer +TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh + +PEAR_TOOL_DIR = ${BASE_DIR}/../../tools/pear +PEAR_INSTALLER = ${PEAR_TOOL_DIR}/bin/install.sh + +DEST_DIR = ${USR_VAR_DIR}/LiveSupport/storageServer/var + +HOSTNAME = @HOSTNAME@ +WWW_PORT = @WWW_PORT@ +DB_SERVER = @DB_SERVER@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ +SCHEDULER_PORT = @SCHEDULER_PORT@ + +PHP_URL_PREFIX=livesupport +SCHEDULER_URL_PREFIX = +SCHEDULER_XML_RPC_PREFIX = RC2 + +USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") + +REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ + s/ls_dbuser/${DB_USER}/; \ + s/ls_dbpassword/${DB_PASSWORD}/; \ + s/ls_dbserver/${DB_SERVER}/; \ + s/ls_database/${DATABASE}/; \ + s/ls_storageUrlPath/\/${PHP_URL_PREFIX_S}\/storageServer\/var/; \ + s/ls_php_host/${HOSTNAME}/; \ + s/ls_php_port/${WWW_PORT}/; \ + s/ls_archiveUrlPath/\/${PHP_URL_PREFIX_S}\/archiveServer\/var/; \ + s/ls_scheduler_urlPrefix/${SCHEDULER_URL_PREFIX}/; \ + s/ls_scheduler_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \ + s/ls_scheduler_host/${HOSTNAME}/; \ + s/ls_scheduler_port/${SCHEDULER_PORT}/;" + + +#------------------------------------------------------------------------------- +# Configuration parameters +#------------------------------------------------------------------------------- +#CPPFLAGS = @CPPFLAGS@ +#CXXFLAGS = @CXXFLAGS@ @DEFS@ -I${USR_INCLUDE_DIR} -I${INCLUDE_DIR} -I${TMP_DIR}\ +# -pedantic -Wall +#LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${LIB_DIR} + + +#------------------------------------------------------------------------------- +# Dependencies +#------------------------------------------------------------------------------- +#HELLO_LIB_OBJS = ${TMP_DIR}/Hello.o +#TEST_RUNNER_OBJS = ${TMP_DIR}/HelloTest.o ${TMP_DIR}/TestRunner.o + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +.PHONY: all dir_setup doc clean docclean depclean distclean dist install +.PHONY: db_init db_clean testonly transtest storage reset pear_setup_devel +.PHONY: copy_files create_database init_database + +all: + +doc: + ${DOXYGEN} ${DOXYGEN_CONFIG} + +clean: db_clean + ${RMDIR} ${STOR_DIR} + ${RMDIR} ${ACCESS_DIR} + ${RMDIR} ${TRANS_DIR} + +docclean: + ${RMDIR} ${DOXYGEN_DIR}/html + +depclean: clean + +dist: + ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * + +distclean: clean docclean + +testonly: ${TEST_RUNNER} + ${TEST_RUNNER} + +check: all testonly + +install: copy_files create_database init_database + +copy_files: + ${MKDIR} ${DEST_DIR} + ${MKDIR} ${DEST_DIR}/access + ${MKDIR} ${DEST_DIR}/cron + ${MKDIR} ${DEST_DIR}/install + ${MKDIR} ${DEST_DIR}/stor + ${MKDIR} ${DEST_DIR}/stor/buffer + ${MKDIR} ${DEST_DIR}/trans + ${MKDIR} ${DEST_DIR}/xmlrpc + ${MKDIR} ${DEST_DIR}/xmlrpc/XML + ${MKDIR} ${DEST_DIR}/xmlrpc/XML/RPC + ${CP} ${VAR_DIR}/*.{php,xml} ${DEST_DIR} + ${CP} ${VAR_DIR}/cron/*.php ${DEST_DIR}/cron + ${CP} ${VAR_DIR}/install/*.php \ + ${DEST_DIR}/install + ${CP} ${VAR_DIR}/xmlrpc/*.php \ + ${DEST_DIR}/xmlrpc + ${CP} ${VAR_DIR}/xmlrpc/XML/*.php \ + ${DEST_DIR}/xmlrpc/XML + ${CP} ${VAR_DIR}/xmlrpc/XML/RPC/*.php \ + ${DEST_DIR}/xmlrpc/XML/RPC + ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ + > ${DEST_DIR}/conf.php + + ${RM} ${WWW_DOCROOT}/livesupport + ln -sf ${USR_VAR_DIR}/LiveSupport ${WWW_DOCROOT}/livesupport + +create_database: +ifeq (@CREATE_LS_DATABASE@,yes) + ${BIN_DIR}/createDatabase.sh --database=${DATABASE} \ + --dbserver=${DB_SERVER} \ + --dbuser=${DB_USER} \ + --dbpassword=${DB_PASSWORD} +endif + +init_database: +ifeq (@INIT_LS_DATABASE@,yes) + cd ${DEST_DIR}/install && ${PHP} -q install.php +endif + + +recheck: clean check + + +#------------------------------------------------------------------------------- +# Specific targets +#------------------------------------------------------------------------------- +storage: pear_setup_devel dir_setup db_init + +storagecheck: storage testonly + +pear_setup_devel: + ${PEAR_INSTALLER} -d ${PEAR_TOOL_DIR}/tmp + +pear_install: + ${PEAR_INSTALLER} -d ${USR_DIR} + +dir_setup: ${DOXYGEN_DIR} + bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} + +db_init: + cd var/install; php -q install.php + +db_clean: + cd var/install; php -q uninstall.php + +reset: + ./bin/resetStorage.sh + +archive: + $(MAKE) -C ../archiveServer all + +archiveclean: + $(MAKE) -C ../archiveServer clean + +transtest: + ./var/tests/transTest.sh +# cd var/tests; php -q transTest.php + +${TMP_DIR}: + ${MKDIR} ${TMP_DIR} + +${DOXYGEN_DIR}: + ${MKDIR} ${DOXYGEN_DIR} + +${TEST_RUNNER}: + +#------------------------------------------------------------------------------- +# Pattern rules +#------------------------------------------------------------------------------- +#${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx +# ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $< + diff --git a/livesupport/modules/storageServer/etc/configure.ac b/livesupport/modules/storageServer/etc/configure.ac new file mode 100644 index 000000000..701a4347f --- /dev/null +++ b/livesupport/modules/storageServer/etc/configure.ac @@ -0,0 +1,184 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(StorageServer, 1.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../var/BasicStor.php) + +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database and user should be created +dnl----------------------------------------------------------------------------- +AC_SUBST(CREATE_LS_DATABASE) + +AC_ARG_WITH([create-database], + AC_HELP_STRING([--with-create-database], + [specify wether the LiveSupport database and database user + should be created (no)]), + [CREATE_LS_DATABASE=${withval}], + [CREATE_LS_DATABASE=no]) + +AC_MSG_RESULT([creating LiveSupport database: ${CREATE_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database tables should be initialized +dnl----------------------------------------------------------------------------- +AC_SUBST(INIT_LS_DATABASE) + +AC_ARG_WITH([init-database], + AC_HELP_STRING([--with-init-database], + [specify wether the LiveSupport database tables should be + initialized (no)]), + [INIT_LS_DATABASE=${withval}], + [INIT_LS_DATABASE=no]) + +AC_MSG_RESULT([initializing LiveSupport database: ${INIT_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the FQDN +dnl----------------------------------------------------------------------------- +AC_SUBST(HOSTNAME) + +AC_ARG_WITH([hostname], + AC_HELP_STRING([--with-hostname], + [use the specified hostname (guess)]), + [HOSTNAME=${withval}], [HOSTNAME=`hostname -f`]) + +AC_MSG_RESULT([using hostname: ${HOSTNAME}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the web server port +dnl----------------------------------------------------------------------------- +AC_SUBST(WWW_PORT) + +AC_ARG_WITH([www-port], + AC_HELP_STRING([--with-www-port], + [use the specified www port (80)]), + [WWW_PORT=${withval}], [WWW_PORT=80]) + +AC_MSG_RESULT([using www port: ${WWW_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the scheduler server port +dnl----------------------------------------------------------------------------- +AC_SUBST(SCHEDULER_PORT) + +AC_ARG_WITH([scheduler-port], + AC_HELP_STRING([--with-scheduler-port], + [use the specified scheduler port (3344)]), + [SCHEDULER_PORT=${withval}], [SCHEDULER_PORT=3344]) + +AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server name +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_SERVER) + +AC_ARG_WITH([database-server], + AC_HELP_STRING([--with-database-server], + [use the specified database server (localhost)]), + [DB_SERVER=${withval}], [DB_SERVER=localhost]) + +AC_MSG_RESULT([using database server: ${DB_SERVER}]) + + +dnl----------------------------------------------------------------------------- +dnl get the name of the LiveSupport database +dnl----------------------------------------------------------------------------- +AC_SUBST(DATABASE) + +AC_ARG_WITH([database], + AC_HELP_STRING([--with-database], + [the name of the postgresql database to use (LiveSupport)]), + [DATABASE=${withval}], [DATABASE=LiveSupport]) + +AC_MSG_RESULT([using database: ${DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_USER) + +AC_ARG_WITH([database-user], + AC_HELP_STRING([--with-database-user], + [use the specified database server user (livesupport)]), + [DB_USER=${withval}], [DB_USER=livesupport]) + +AC_MSG_RESULT([using database server user: ${DB_USER}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user password +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_PASSWORD) + +AC_ARG_WITH([database-password], + AC_HELP_STRING([--with-database-password], + [use the specified database server user password (livesupport)]), + [DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) + +AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) + + +dnl display status info on what libraries will get compiled + +AC_MSG_NOTICE( +[using the following configuration settings: + + hostname: ${HOSTNAME} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + creating LiveSupport database: ${CREATE_LS_DATABASE} + initialize LiveSupport database: ${INIT_LS_DATABASE} + +]) + + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() diff --git a/livesupport/modules/storageServer/var/conf.php b/livesupport/modules/storageServer/var/conf.php index 10ecf03fe..76c7780b7 100644 --- a/livesupport/modules/storageServer/var/conf.php +++ b/livesupport/modules/storageServer/var/conf.php @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: tomas $ - Version : $Revision: 1.22 $ + Author : $Author: maroy $ + Version : $Revision: 1.23 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $ ------------------------------------------------------------------------------*/ @@ -88,7 +88,7 @@ $config = array( 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', - 'pearPath' => dirname(__FILE__).'/../../../usr/lib/php/php', + 'pearPath' => dirname(__FILE__).'/../../../tools/pear/tmp/lib/pear', 'isArchive' => FALSE, 'validate' => TRUE, 'useTrash' => TRUE, diff --git a/livesupport/modules/storageServer/var/conf.php.template b/livesupport/modules/storageServer/var/conf.php.template index 656f07cd2..7eac8714e 100644 --- a/livesupport/modules/storageServer/var/conf.php.template +++ b/livesupport/modules/storageServer/var/conf.php.template @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: tomas $ - Version : $Revision: 1.6 $ + Author : $Author: maroy $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $ ------------------------------------------------------------------------------*/ @@ -88,7 +88,7 @@ $config = array( 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', - 'pearPath' => 'ls_install_dir/usr/lib/php/php', + 'pearPath' => 'ls_lib_dir/pear', 'isArchive' => FALSE, 'validate' => TRUE, 'useTrash' => TRUE, diff --git a/livesupport/modules/widgets/configure b/livesupport/modules/widgets/configure new file mode 100755 index 000000000..af00072ea --- /dev/null +++ b/livesupport/modules/widgets/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index 19e59ee9f..aac3a1592 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.20 $ +# Version : $Revision: 1.21 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $ # # @configure_input@ @@ -34,6 +34,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +CP = cp -f #------------------------------------------------------------------------------- @@ -52,10 +53,12 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var + BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 MODULES_DIR = ${BASE_DIR}/.. @@ -155,7 +158,7 @@ TEST_EXE_LIBS = -l${WIDGETS_LIB} -l${CORE_LIB} ${ICU_LIBS} \ #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean +.PHONY: all dir_setup doc clean docclean depclean distclean check install all: dir_setup ${WIDGETS_LIB_FILE} @@ -184,6 +187,42 @@ run: all ${TEST_EXE} ${TEST_RUNNER_RES} check: all +install: all + ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Widgets + ${CP} ${INCLUDE_DIR}/LiveSupport/Widgets/*.h \ + ${USR_INCLUDE_DIR}/LiveSupport/Widgets + ${CP} ${WIDGETS_LIB_FILE} ${USR_LIB_DIR} + ${MKDIR} ${USR_VAR_DIR}/LiveSupport/Widgets/blueBin \ + ${USR_VAR_DIR}/LiveSupport/Widgets/button \ + ${USR_VAR_DIR}/LiveSupport/Widgets/combo \ + ${USR_VAR_DIR}/LiveSupport/Widgets/darkBlueBin \ + ${USR_VAR_DIR}/LiveSupport/Widgets/entryBin \ + ${USR_VAR_DIR}/LiveSupport/Widgets/icons \ + ${USR_VAR_DIR}/LiveSupport/Widgets/imageButton \ + ${USR_VAR_DIR}/LiveSupport/Widgets/tabButton \ + ${USR_VAR_DIR}/LiveSupport/Widgets/titleImages \ + ${USR_VAR_DIR}/LiveSupport/Widgets/whiteWindow + ${CP} ${VAR_DIR}/blueBin/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/blueBin + ${CP} ${VAR_DIR}/button/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/button + ${CP} ${VAR_DIR}/combo/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/combo + ${CP} ${VAR_DIR}/darkBlueBin/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/darkBlueBin + ${CP} ${VAR_DIR}/entryBin/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/entryBin + ${CP} ${VAR_DIR}/icons/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/icons + ${CP} ${VAR_DIR}/imageButton/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/imageButton + ${CP} ${VAR_DIR}/tabButton/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/tabButton + ${CP} ${VAR_DIR}/titleImages/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/titleImages + ${CP} ${VAR_DIR}/whiteWindow/*.png \ + ${USR_VAR_DIR}/LiveSupport/Widgets/whiteWindow + #------------------------------------------------------------------------------- # Specific targets diff --git a/livesupport/modules/widgets/etc/configure.ac b/livesupport/modules/widgets/etc/configure.ac index e7f109c1b..1d5195e0a 100644 --- a/livesupport/modules/widgets/etc/configure.ac +++ b/livesupport/modules/widgets/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.1 $ +dnl Version : $Revision: 1.2 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Widgets, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.1 $) +AC_REVISION($Revision: 1.2 $) AC_CONFIG_SRCDIR(../include/LiveSupport/Widgets/ImageButton.h) @@ -44,14 +44,29 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) -PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.4.0]) +PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.5.5]) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/widgets/var/imageButton/masterPause.png b/livesupport/modules/widgets/var/imageButton/masterPause.png new file mode 100644 index 0000000000000000000000000000000000000000..910a2a8b9dbd929039d8d9646fca9232e1e9039e GIT binary patch literal 1079 zcmV-71jze|P)5?eF#c{QdX%`rza4)Y#|D(c}F6{_pYj(bnbo`1{%1>g49|naux9 zh{1J)lun4hb%d3Pyzfqkz-oq|aD|$5gq3lHnRJAfXojP2g`0APm~(`dZH1j{g`aYT zmu`idZH1gsh`dsY!Doh~YlWWm_W9%G@8RU`ZHS}Q+2`2Y>1l?dbA*>_hM~>U0b^85V#+1=`Fg`Q7{zQD)aQ;51*hqO|NyV~9AWQM0sh{0lqsq^&s?(p@( z$lX?lwp5D0$IRdR`~CR&`%j3y$=<4kARfo6f>+|&W`Q_;F_V@bt`1?|b zy2i`j)7R$u`uyDB>`;ik`TG3h=I{CW{Az}u%+cakhqcSl;_~zO-Qn!t;_c<<@bU8Z z{{H^#?(}YjoK%RpPKds1h^F4*?CkFK&eP-D-s``{+h&HQ#me5t&ERB*sLs>m{r>)D zhNax!>rjZiYKEfb>G9FkDmmi%><@+v~%x5+)_L*dsIhACg_+(XL zs@C&Rv$3&;U#ruoM-|DFNn^#A$xO+LM;wE+IY%IK3LwtBByI~%hFYGAA>z1oS$=UN?DdK+kgz-xuk%lh+US zB0x`f|Ne)b{(Rx{%JZeX-^%;V2>b2tzYkm`_+EPq^mf2r7kNiOZ=eL;51^+z{|w;i z&QlK01NL<1DW?~?NB=Yb^#6#{>jiqsJRJagoj}iB0X4t{&I51OC)UEnNyoSF;JB~R=gHu5S%%T*{8bVR2omF21DgL${xzZD8@IC#5`RcF^Fg}Xh! x%!k9_4y9JL=AYI7DM_oo!uciieDy|v0RYLzd!4q&&3^y@002ovPDHLkV1n38aOnU5 literal 0 HcmV?d00001 diff --git a/livesupport/modules/widgets/var/imageButton/masterPauseRoll.png b/livesupport/modules/widgets/var/imageButton/masterPauseRoll.png new file mode 100644 index 0000000000000000000000000000000000000000..8e8d9bccf9fd68897c26961165ccecce15d886c4 GIT binary patch literal 1080 zcmV-81jqY{P)5g_~=IpK^tl zZH1h|(dlZ2p}5E6X@;U}g`U68=iKS}XNIJ0h@;Bb?#tQlbA*@A-tx@b@K1=obl9~Q;53Z@BPi(@U+9>P>8+5((2mh_~7mQ(%|#m>-*d2`PJn0uD;#f>iXX7 z`@qlWPl&y{%H`4D^HGSqPKd$9)a+GRN5kt`6LkMT#@G`A44tA?vURG8dQc_-qGTY z%NmfF)C1vuY5vnfg+ubXU|uYGfb?9k=nT|rYrk0q?=#rT z0=@g>ZGpXcpm&?RUtlj_V(%MyyFl+cd52){0PM|}+`9(!CcxecuoofkC(!F9uNUa` zncN#7Z%pr*)^h*cXf^UCb-k9;$~Vf_ExMkcyn8@z6zq+YHw5&8SMYt2-Y|I+U@rpn z4EOIP^o-|=m{*%Gwf$DxZ)VtU|Nnj9ufq3QBhY&e_QuHj0Q8!w;N1XvhV#z^p5Z(d z@Pc5^aGnZ!kt_5+bD{r7g5D(1= zkMY)DzCM1;y*`BZrWjvp-hR}5# ${USR_ETC_DIR}/gLiveSupport.xml + run_tests: ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} run: all ${G_LIVESUPPORT_SH} -install: ${SCHEDULER_EXE} +init: ${SCHEDULER_EXE} -${MAKE} -C ${STORAGE_SERVER_DIR} db_init - -${MAKE} -C ${SCHEDULER_DIR} install + -${MAKE} -C ${SCHEDULER_DIR} init start: ${SCHEDULER_EXE} ${MAKE} -C ${SCHEDULER_DIR} start @@ -294,8 +361,8 @@ stop: ${SCHEDULER_EXE} status: ${SCHEDULER_EXE} ${MAKE} -C ${SCHEDULER_DIR} status -uninstall: ${SCHEDULER_EXE} - -${MAKE} -C ${SCHEDULER_DIR} uninstall +deinit: ${SCHEDULER_EXE} + -${MAKE} -C ${SCHEDULER_DIR} deinit -${MAKE} -C ${STORAGE_SERVER_DIR} db_clean storage_server_init: diff --git a/livesupport/products/gLiveSupport/etc/configure.ac b/livesupport/products/gLiveSupport/etc/configure.ac index cf179e0a1..bb85609bc 100644 --- a/livesupport/products/gLiveSupport/etc/configure.ac +++ b/livesupport/products/gLiveSupport/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.8 $ +dnl Version : $Revision: 1.9 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(gLiveSupport, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.8 $) +AC_REVISION($Revision: 1.9 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -45,11 +45,25 @@ AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) -PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.4.0]) +PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.5.5]) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) @@ -57,6 +71,7 @@ PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- @@ -74,6 +89,144 @@ else fi +dnl----------------------------------------------------------------------------- +dnl specify the FQDN +dnl----------------------------------------------------------------------------- +AC_SUBST(HOSTNAME) + +AC_ARG_WITH([hostname], + AC_HELP_STRING([--with-hostname], + [use the specified hostname (guess)]), + [HOSTNAME=${withval}], [HOSTNAME=`hostname -f`]) + +AC_MSG_RESULT([using hostname: ${HOSTNAME}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the web server port +dnl----------------------------------------------------------------------------- +AC_SUBST(WWW_PORT) + +AC_ARG_WITH([www-port], + AC_HELP_STRING([--with-www-port], + [use the specified www port (80)]), + [WWW_PORT=${withval}], [WWW_PORT=80]) + +AC_MSG_RESULT([using www port: ${WWW_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the scheduler server port +dnl----------------------------------------------------------------------------- +AC_SUBST(SCHEDULER_PORT) + +AC_ARG_WITH([scheduler-port], + AC_HELP_STRING([--with-scheduler-port], + [use the specified scheduler port (3344)]), + [SCHEDULER_PORT=${withval}], [SCHEDULER_PORT=3344]) + +AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server name +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_SERVER) + +AC_ARG_WITH([database-server], + AC_HELP_STRING([--with-database-server], + [use the specified database server (localhost)]), + [DB_SERVER=${withval}], [DB_SERVER=localhost]) + +AC_MSG_RESULT([using database server: ${DB_SERVER}]) + + +dnl----------------------------------------------------------------------------- +dnl get the name of the LiveSupport database +dnl----------------------------------------------------------------------------- +AC_SUBST(DATABASE) + +AC_ARG_WITH([database], + AC_HELP_STRING([--with-database], + [the name of the postgresql database to use (LiveSupport)]), + [DATABASE=${withval}], [DATABASE=LiveSupport]) + +AC_MSG_RESULT([using database: ${DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_USER) + +AC_ARG_WITH([database-user], + AC_HELP_STRING([--with-database-user], + [use the specified database server user (livesupport)]), + [DB_USER=${withval}], [DB_USER=livesupport]) + +AC_MSG_RESULT([using database server user: ${DB_USER}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user password +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_PASSWORD) + +AC_ARG_WITH([database-password], + AC_HELP_STRING([--with-database-password], + [use the specified database server user password (livesupport)]), + [DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) + +AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio output device +dnl----------------------------------------------------------------------------- +AC_SUBST(AUDIO_OUT) + +AC_ARG_WITH([audio-out], + AC_HELP_STRING([--with-audio-out], + [use the specified audio output device, either ALSA or OSS + (plughw:0)]), + [AUDIO_OUT=${withval}], [AUDIO_OUT=plughw:0]) + +AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio cue device +dnl----------------------------------------------------------------------------- +AC_SUBST(AUDIO_CUE) + +AC_ARG_WITH([audio-cue], + AC_HELP_STRING([--with-audio-cue], + [use the specified audio cue device, either ALSA or OSS + (plughw:0)]), + [AUDIO_CUE=${withval}], [AUDIO_CUE=plughw:0]) + +AC_MSG_RESULT([using audio cue device: ${AUDIO_CUE}]) + + +dnl display status info on what libraries will get compiled + +AC_MSG_NOTICE( +[using the following configuration settings: + + hostname: ${HOSTNAME} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + audio output device: ${AUDIO_OUT} + audio cue device: ${AUDIO_CUE} + +]) + + + AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) AC_OUTPUT() diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template index 37d5a34ee..9f1f86265 100644 --- a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template +++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template @@ -95,7 +95,7 @@ ]> - @@ -108,7 +108,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -133,17 +133,17 @@ - + - + - + /dev/null`" ]; then + echo "Executable $1 found..."; + return 0; + else + echo "Executable $1 not found..."; + return 1; + fi +} + + +#------------------------------------------------------------------------------- +# Check to see if this script is being run as root +#------------------------------------------------------------------------------- +if [ `whoami` != "root" ]; then + echo "Please run this script as root."; + exit ; +fi + + +#------------------------------------------------------------------------------- +# Check for required tools +#------------------------------------------------------------------------------- +echo "Checking for required tools..." + +check_exe "su" || exit 1; +check_exe "psql" || exit 1; + + +#------------------------------------------------------------------------------- +# Create the necessary database user and database itself +#------------------------------------------------------------------------------- +echo "Creating database and database user..."; + +# FIXME: the below might not work for remote databases + +if [ "x$ls_dbserver" == "xlocalhost" ]; then + su - $postgres_user -c "echo \"CREATE USER $ls_dbuser \ + ENCRYPTED PASSWORD '$ls_dbpassword' \ + CREATEDB NOCREATEUSER;\" \ + | psql template1" \ + || echo "Couldn't create database user $ls_dbuser."; + + su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \ + OWNER $ls_dbuser ENCODING 'utf-8';\" \ + | psql template1" \ + || echo "Couldn't create database $ls_database."; +else + echo "Unable to automatically create database user and table for"; + echo "remote database $ls_dbserver."; + echo "Make sure to create database user $ls_dbuser with password"; + echo "$ls_dbpassword on database server at $ls_dbserver."; + echo "Also create a database called $ld_database, owned by this user."; + echo ""; + echo "The easiest way to achieve this is by issuing the following SQL"; + echo "commands to PostgreSQL:"; + echo "CREATE USER $ls_dbuser"; + echo " ENCRYPTED PASSWORD '$ls_dbpassword'"; + echo " CREATEDB NOCREATEUSER;"; + echo "CREATE DATABASE \"$ls_database\""; + echo " OWNER $ls_dbuser ENCODING 'utf-8';"; +fi + + +# TODO: check for the success of these operations somehow +#------------------------------------------------------------------------------- +# Say goodbye +#------------------------------------------------------------------------------- +echo "Done." + diff --git a/livesupport/products/scheduler/bin/createOdbcDataSource.sh b/livesupport/products/scheduler/bin/createOdbcDataSource.sh new file mode 100755 index 000000000..b30d28657 --- /dev/null +++ b/livesupport/products/scheduler/bin/createOdbcDataSource.sh @@ -0,0 +1,190 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/bin/createOdbcDataSource.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# This script creates the ODBC data source needed for LiveSupport scheduler +# +# Invoke as: +# ./bin/createOdbcDataSource.sh +# +# To get usage help, try the -h option +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Determine directories, files +#------------------------------------------------------------------------------- +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +bindir=$basedir/bin +etcdir=$basedir/etc +docdir=$basedir/doc +tmpdir=$basedir/tmp +usrdir=$basedir/usr + + +#------------------------------------------------------------------------------- +# Print the usage information for this script. +#------------------------------------------------------------------------------- +printUsage() +{ + echo "LiveSupport scheduler ODBC DataSource creating script."; + echo "parameters"; + echo ""; + echo " -D, --database The name of the LiveSupport database."; + echo " [default: LiveSupport]"; + echo " -s, --dbserver The name of the database server host."; + echo " [default: localhost]"; + echo " -h, --help Print this message and exit."; + echo ""; +} + + +#------------------------------------------------------------------------------- +# Process command line parameters +#------------------------------------------------------------------------------- +CMD=${0##*/} + +opts=$(getopt -o D:hs: -l database:,dbserver:,help -n $CMD -- "$@") || exit 1 +eval set -- "$opts" +while true; do + case "$1" in + -D|--database) + database=$2; + shift; shift;; + -s|--dbserver) + dbserver=$2; + shift; shift;; + --) + shift; + break;; + *) + echo "Unrecognized option $1."; + printUsage; + exit 1; + esac +done + +if [ "x$dbserver" == "x" ]; then + dbserver=localhost; +fi + +if [ "x$database" == "x" ]; then + database=LiveSupport; +fi + + +echo "Creating ODBC data source for LiveSupport scheduler."; +echo ""; +echo "Using the following installation parameters:"; +echo ""; +echo " database server: $dbserver"; +echo " database: $database"; +echo "" + +#------------------------------------------------------------------------------- +# The details of installation +#------------------------------------------------------------------------------- +ls_dbserver=$dbserver +ls_database=$database + + +replace_sed_string="s/ls_dbserver/$ls_dbserver/; \ + s/ls_database/$ls_database/;" + + +#------------------------------------------------------------------------------- +# Function to check for the existence of an executable on the PATH +# +# @param $1 the name of the exectuable +# @return 0 if the executable exists on the PATH, non-0 otherwise +#------------------------------------------------------------------------------- +check_exe() { + if [ -x "`which $1 2> /dev/null`" ]; then + echo "Executable $1 found..."; + return 0; + else + echo "Executable $1 not found..."; + return 1; + fi +} + + +#------------------------------------------------------------------------------- +# Check to see if this script is being run as root +#------------------------------------------------------------------------------- +if [ `whoami` != "root" ]; then + echo "Please run this script as root."; + exit ; +fi + + +#------------------------------------------------------------------------------- +# Check for required tools +#------------------------------------------------------------------------------- +echo "Checking for required tools..." + +check_exe "sed" || exit 1; +check_exe "grep" || exit 1; +check_exe "odbcinst" || exit 1; + + +#------------------------------------------------------------------------------- +# Create the ODBC data source and driver +#------------------------------------------------------------------------------- +echo "Creating ODBC data source and driver..."; + +# check where the odbc dirvers are for PostgreSQL +if [ -f /usr/lib/libodbcpsql.so ]; then + odbcinst_template=$etcdir/odbcinst_template +elif [ -f /usr/lib/odbc/psqlodbc.so ]; then + odbcinst_template=$etcdir/odbcinst_debian_template +else + echo "can't find ODBC driver for PostgreSQL neither at /usr/lib"; + echo "nor at /usr/lib/odbc. please install proper ODBC drivers"; + exit 1; +fi +odbc_template=$etcdir/odbc_template +odbc_template_tmp=/tmp/odbc_template.$$ + +# check for an existing PostgreSQL ODBC driver, and only install if necessary +odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"` +if [ "x$odbcinst_res" == "x" ]; then + echo "Registering ODBC PostgreSQL driver..."; + odbcinst -i -d -v -f $odbcinst_template || exit 1; +fi + +echo "Registering LiveSupport ODBC data source..."; +cat $odbc_template | sed -e "$replace_sed_string" > $odbc_template_tmp +odbcinst -i -s -l -f $odbc_template_tmp || exit 1; +rm -f $odbc_template_tmp + + +#------------------------------------------------------------------------------- +# Say goodbye +#------------------------------------------------------------------------------- +echo "Done." + diff --git a/livesupport/products/scheduler/bin/scheduler.sh b/livesupport/products/scheduler/bin/scheduler.sh index a06769c93..b20cabe9a 100755 --- a/livesupport/products/scheduler/bin/scheduler.sh +++ b/livesupport/products/scheduler/bin/scheduler.sh @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.3 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.4 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/bin/scheduler.sh,v $ #------------------------------------------------------------------------------- @@ -46,8 +46,6 @@ libdir=$basedir/lib gstreamer_dir=`find $libdir -type d -name "gstreamer-*"` export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH -export GST_REGISTRY=$etcdir/gst-registry.xml -export GST_PLUGIN_PATH=$gstreamer_dir scheduler_exe=$bindir/scheduler config_file=$etcdir/scheduler.xml diff --git a/livesupport/products/scheduler/configure b/livesupport/products/scheduler/configure new file mode 100755 index 000000000..86a922993 --- /dev/null +++ b/livesupport/products/scheduler/configure @@ -0,0 +1,52 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/configure,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this script to configure the environment. +# +# This script in effect calls the real automake / autoconf configure script +#------------------------------------------------------------------------------- + +# assume we're in $basedir +reldir=`dirname $0` +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. + +bindir=$basedir/bin +tmpdir=$basedir/tmp + + +autogen=$bindir/autogen.sh +configure=$tmpdir/configure + +if [ -x $configure ]; then + (cd $tmpdir && $configure "$@") +else + (cd $basedir && $autogen "$@") +fi + diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index 928d4c6ce..e2ebe95a9 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.63 $ +# Version : $Revision: 1.64 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -35,6 +35,11 @@ RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen KILLALL = killall +CP = cp -f +SED = sed +ECHO = echo +CAT = cat + #------------------------------------------------------------------------------- # Basic directory and file definitions @@ -51,11 +56,47 @@ TMP_DIR = ${BASE_DIR}/tmp REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = ${BASE_DIR}/../../usr +USR_DIR = @prefix@ +USR_BIN_DIR = ${USR_DIR}/bin +USR_ETC_DIR = ${USR_DIR}/etc USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib +USR_TMP_DIR = ${USR_DIR}/tmp BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 +HOSTNAME = @HOSTNAME@ +WWW_PORT = @WWW_PORT@ +SCHEDULER_PORT = @SCHEDULER_PORT@ +DB_SERVER = @DB_SERVER@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ +AUDIO_OUT = "@AUDIO_OUT@" + +PHP_URL_PREFIX=livesupport +ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php +POSTGRES_USER=postgres + +USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +USR_TMP_DIR_S=$(shell ${ECHO} ${USR_TMP_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") +ALIB_XML_RPC_PREFIX_S=$(shell ${ECHO} ${ALIB_XML_RPC_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") +AUDIO_OUT_S=$(shell ${ECHO} ${AUDIO_OUT} | ${SED} -e "s/\//\\\\\\\\\//g") + + +REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ + s/ls_dbuser/${DB_USER}/; \ + s/ls_dbpassword/${DB_PASSWORD}/; \ + s/ls_dbserver/${DB_SERVER}/; \ + s/ls_database/${DATABASE}/; \ + s/ls_php_urlPrefix/\/${PHP_URL_PREFIX_S}/; \ + s/ls_php_host/${HOSTNAME}/; \ + s/ls_php_port/${WWW_PORT}/; \ + s/ls_alib_xmlRpcPrefix/${ALIB_XML_RPC_PREFIX_S}/; \ + s/ls_tmp_dir/${USR_TMP_DIR_S}/; \ + s/ls_audio_output_device/${AUDIO_OUT_S}/; \ + s/ls_scheduler_host/${HOSTNAME}/; \ + s/ls_scheduler_port/${SCHEDULER_PORT}/;" VPATH = ${SRC_DIR} @@ -274,10 +315,11 @@ TEST_RUNNER_LIBS = ${SCHEDULER_EXE_LIBS} -lcppunit -ldl #------------------------------------------------------------------------------- # Targets #------------------------------------------------------------------------------- -.PHONY: all dir_setup doc clean docclean depclean distclean -.PHONY: install start status run_tests stop uninstall -.PHONY: install_local start_local status_local run_local stop_local -.PHONY: uninstall_local check check_local +.PHONY: all dir_setup doc clean docclean depclean distclean check install +.PHONY: init start status run_tests stop deinit +.PHONY: init_local start_local status_local run_local stop_local +.PHONY: deinit_local check check_local +.PHONY: copy_files create_database create_odbc_datasource init_database all: dir_setup ${SCHEDULER_EXE} @@ -309,12 +351,48 @@ distclean: clean docclean check: all ${TEST_RUNNER} storage_server_init start run_tests stop +install: all copy_files create_database create_odbc_datasource init_database + +copy_files: + ${MAKE} -C ${CORE_DIR} install + ${MAKE} -C ${AUTHENTICATION_DIR} install + ${MAKE} -C ${DB_DIR} install + ${MAKE} -C ${STORAGE_DIR} install + ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install + ${MAKE} -C ${EVENT_SCHEDULER_DIR} install + ${MKDIR} ${USR_BIN_DIR} + ${MKDIR} ${USR_ETC_DIR} + ${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR} + ${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR} + ${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \ + > ${USR_ETC_DIR}/scheduler.xml + +create_database: +ifeq (@CREATE_LS_DATABASE@,yes) + ${BIN_DIR}/createDatabase.sh --database=${DATABASE} \ + --dbserver=${DB_SERVER} \ + --dbuser=${DB_USER} \ + --dbpassword=${DB_PASSWORD} +endif + +create_odbc_datasource: +ifeq (@CREATE_ODBC_DATA_SOURCE@,yes) + ${BIN_DIR}/createOdbcDataSource.sh --database=${DATABASE} \ + --dbserver=${DB_SERVER} +endif + +init_database: +ifeq (@INIT_LS_DATABASE@,yes) + ${USR_BIN_DIR}/scheduler.sh install +endif + + check_local: all ${TEST_RUNNER} start_local run_tests stop_local run_tests: ${TEST_RUNNER} ${TEST_RUNNER_SH} -o ${TEST_RESULTS} -s ${TEST_XSLT} -install: ${SCHEDULER_EXE} +init: ${SCHEDULER_EXE} ${SCHEDULER_SH} install start: ${SCHEDULER_EXE} @@ -331,10 +409,10 @@ stop: ${SCHEDULER_EXE} status: ${SCHEDULER_EXE} ${SCHEDULER_SH} status -uninstall: ${SCHEDULER_EXE} +deinit: ${SCHEDULER_EXE} ${SCHEDULER_SH} uninstall -install_local: ${SCHEDULER_EXE} +init_local: ${SCHEDULER_EXE} ${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} install start_local: ${SCHEDULER_EXE} @@ -352,7 +430,7 @@ run_local: ${SCHEDULER_EXE} ${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} --debug start sleep 2 -uninstall_local: ${SCHEDULER_EXE} +deinit_local: ${SCHEDULER_EXE} ${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} uninstall storage_server_init: diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index d7a3f6884..b175b3405 100644 --- a/livesupport/products/scheduler/etc/configure.ac +++ b/livesupport/products/scheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.10 $ +dnl Version : $Revision: 1.11 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Scheduler, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.10 $) +AC_REVISION($Revision: 1.11 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -45,11 +45,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) -PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) -PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) +dnl----------------------------------------------------------------------------- +dnl specify the pkg-config path +dnl----------------------------------------------------------------------------- +AC_ARG_WITH([pkg-config-path], + AC_HELP_STRING([--with-pkg-config-path], + [use the pkg-config path (prefix/lib/pkgconfig)]), + [PKG_CONFIG_PATH=${withval}], + [PKG_CONFIG_PATH=${prefix}/lib/pkgconfig]) + +AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) + +export PKG_CONFIG_PATH + + +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) +PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) + PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) @@ -71,6 +86,176 @@ else fi +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database and user should be created +dnl----------------------------------------------------------------------------- +AC_SUBST(CREATE_LS_DATABASE) + +AC_ARG_WITH([create-database], + AC_HELP_STRING([--with-create-database], + [specify wether the LiveSupport database and database user + should be created (no)]), + [CREATE_LS_DATABASE=${withval}], + [CREATE_LS_DATABASE=no]) + +AC_MSG_RESULT([creating LiveSupport database: ${CREATE_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether the ODBC data source should be created +dnl----------------------------------------------------------------------------- +AC_SUBST(CREATE_ODBC_DATA_SOURCE) + +AC_ARG_WITH([create-odbc-data-source], + AC_HELP_STRING([--with-create-odbc-data-source], + [specify wether the ODBC data source for LiveSupport should be + created (no)]), + [CREATE_ODBC_DATA_SOURCE=${withval}], + [CREATE_ODBC_DATA_SOURCE=no]) + +AC_MSG_RESULT([creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify wether the LiveSupport database tables should be initialized +dnl----------------------------------------------------------------------------- +AC_SUBST(INIT_LS_DATABASE) + +AC_ARG_WITH([init-database], + AC_HELP_STRING([--with-init-database], + [specify wether the LiveSupport database tables should be + initialized (no)]), + [INIT_LS_DATABASE=${withval}], + [INIT_LS_DATABASE=no]) + +AC_MSG_RESULT([initializing LiveSupport database: ${INIT_LS_DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the FQDN +dnl----------------------------------------------------------------------------- +AC_SUBST(HOSTNAME) + +AC_ARG_WITH([hostname], + AC_HELP_STRING([--with-hostname], + [use the specified hostname (guess)]), + [HOSTNAME=${withval}], [HOSTNAME=`hostname -f`]) + +AC_MSG_RESULT([using hostname: ${HOSTNAME}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the web server port +dnl----------------------------------------------------------------------------- +AC_SUBST(WWW_PORT) + +AC_ARG_WITH([www-port], + AC_HELP_STRING([--with-www-port], + [use the specified www port (80)]), + [WWW_PORT=${withval}], [WWW_PORT=80]) + +AC_MSG_RESULT([using www port: ${WWW_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the scheduler server port +dnl----------------------------------------------------------------------------- +AC_SUBST(SCHEDULER_PORT) + +AC_ARG_WITH([scheduler-port], + AC_HELP_STRING([--with-scheduler-port], + [use the specified scheduler port (3344)]), + [SCHEDULER_PORT=${withval}], [SCHEDULER_PORT=3344]) + +AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server name +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_SERVER) + +AC_ARG_WITH([database-server], + AC_HELP_STRING([--with-database-server], + [use the specified database server (localhost)]), + [DB_SERVER=${withval}], [DB_SERVER=localhost]) + +AC_MSG_RESULT([using database server: ${DB_SERVER}]) + + +dnl----------------------------------------------------------------------------- +dnl get the name of the LiveSupport database +dnl----------------------------------------------------------------------------- +AC_SUBST(DATABASE) + +AC_ARG_WITH([database], + AC_HELP_STRING([--with-database], + [the name of the postgresql database to use (LiveSupport)]), + [DATABASE=${withval}], [DATABASE=LiveSupport]) + +AC_MSG_RESULT([using database: ${DATABASE}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_USER) + +AC_ARG_WITH([database-user], + AC_HELP_STRING([--with-database-user], + [use the specified database server user (livesupport)]), + [DB_USER=${withval}], [DB_USER=livesupport]) + +AC_MSG_RESULT([using database server user: ${DB_USER}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the database server user password +dnl----------------------------------------------------------------------------- +AC_SUBST(DB_PASSWORD) + +AC_ARG_WITH([database-password], + AC_HELP_STRING([--with-database-password], + [use the specified database server user password (livesupport)]), + [DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) + +AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) + + +dnl----------------------------------------------------------------------------- +dnl specify the audio output device +dnl----------------------------------------------------------------------------- +AC_SUBST(AUDIO_OUT) + +AC_ARG_WITH([audio-out], + AC_HELP_STRING([--with-audio-out], + [use the specified audio output device, either ALSA or OSS + (plughw:0)]), + [AUDIO_OUT=${withval}], [AUDIO_OUT=plughw:0]) + +AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}]) + + +dnl display status info on what libraries will get compiled + +AC_MSG_NOTICE( +[using the following configuration settings: + + hostname: ${HOSTNAME} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + audio output device: ${AUDIO_OUT} + creating LiveSupport database: ${CREATE_LS_DATABASE} + creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} + initialize LiveSupport database: ${INIT_LS_DATABASE} + +]) + + AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) AC_OUTPUT() diff --git a/livesupport/products/scheduler/etc/scheduler.xml.template b/livesupport/products/scheduler/etc/scheduler.xml.template index 9bd688776..424c48e0e 100644 --- a/livesupport/products/scheduler/etc/scheduler.xml.template +++ b/livesupport/products/scheduler/etc/scheduler.xml.template @@ -96,7 +96,7 @@ - + @@ -111,12 +111,12 @@ - + diff --git a/livesupport/tools/boost/boost-1.31/bin/autogen.sh b/livesupport/tools/boost/boost-1.31/bin/autogen.sh new file mode 100755 index 000000000..41fea2611 --- /dev/null +++ b/livesupport/tools/boost/boost-1.31/bin/autogen.sh @@ -0,0 +1,87 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/boost/boost-1.31/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="boost" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/boost/boost-1.31/bin/install-sh b/livesupport/tools/boost/boost-1.31/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/boost/boost-1.31/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/boost/boost-1.31/bin/install.sh b/livesupport/tools/boost/boost-1.31/bin/prepare.sh similarity index 79% rename from livesupport/tools/boost/boost-1.31/bin/install.sh rename to livesupport/tools/boost/boost-1.31/bin/prepare.sh index 895aba409..2d106bcbb 100755 --- a/livesupport/tools/boost/boost-1.31/bin/install.sh +++ b/livesupport/tools/boost/boost-1.31/bin/prepare.sh @@ -22,12 +22,11 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.3 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/boost/boost-1.31/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/boost/boost-1.31/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install C++ Boost into the development system usr -# environment. +# Run this script to prepare C++ Boost to be configured and compiled # For more information on Boost, see http://www.boost.org/ #------------------------------------------------------------------------------- product=boost_1_31_0 @@ -35,8 +34,9 @@ product=boost_1_31_0 reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp +bindir=$basedir/bin etcdir=$basedir/etc +tmpdir=$basedir/tmp tar=$basedir/src/$product.tar.bz2 echo "installing $product from $basedir to $installdir" @@ -45,17 +45,13 @@ echo "installing $product from $basedir to $installdir" mkdir -p $tmpdir cd $tmpdir -tar xfj $tar -cd $product +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -# build BoostJam, their make enviornment -cd tools/build/jam_src/ -sh build.sh gcc -cd ../../.. - -# now build and install the who thing -./tools/build/jam_src/bin.linuxx86/bjam "-sTOOLS=gcc" --prefix=$installdir install - -cd $basedir -rm -rf tmp +# untar and patch the sources +if [ ! -d $product ]; then + tar xfj $tar + cd $product + # patch here +fi diff --git a/livesupport/tools/boost/boost-1.31/etc/Makefile.in b/livesupport/tools/boost/boost-1.31/etc/Makefile.in new file mode 100644 index 000000000..02024fbf4 --- /dev/null +++ b/livesupport/tools/boost/boost-1.31/etc/Makefile.in @@ -0,0 +1,85 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/boost/boost-1.31/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +BOOST_VERSION = boost_1_31_0 +BOOST_DIR = ${TMP_DIR}/${BOOST_VERSION} + +INSTALL_DIR = @prefix@ + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: + # build BoostJam, their make enviornment + cd ${BOOST_DIR} && \ + cd tools/build/jam_src/ && \ + sh build.sh gcc + # now build and install the who thing + cd ${BOOST_DIR} && \ + ./tools/build/jam_src/bin.linuxx86/bjam "-sTOOLS=gcc" \ + --prefix=${INSTALL_DIR} + +install: all + cd ${BOOST_DIR} && \ + ./tools/build/jam_src/bin.linuxx86/bjam "-sTOOLS=gcc" \ + --prefix=${INSTALL_DIR} install + +clean: + cd ${BOOST_DIR} && \ + ./tools/build/jam_src/bin.linuxx86/bjam "-sTOOLS=gcc" \ + --prefix=${installdir} clean + +distclean: + ${RMDIR} ${BOOST_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/boost/boost-1.31/etc/configure.ac b/livesupport/tools/boost/boost-1.31/etc/configure.ac new file mode 100644 index 000000000..ce74cdcc7 --- /dev/null +++ b/livesupport/tools/boost/boost-1.31/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/boost/boost-1.31/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(boost, 1.31, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/boost_1_31_0.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/boost/boost-1.31/tmp/.keepme b/livesupport/tools/boost/boost-1.31/tmp/.keepme new file mode 100644 index 000000000..e0808fa16 --- /dev/null +++ b/livesupport/tools/boost/boost-1.31/tmp/.keepme @@ -0,0 +1 @@ +keep me diff --git a/livesupport/tools/cppunit/cppunit-1.10.2/bin/autogen.sh b/livesupport/tools/cppunit/cppunit-1.10.2/bin/autogen.sh new file mode 100755 index 000000000..ec5b8a18e --- /dev/null +++ b/livesupport/tools/cppunit/cppunit-1.10.2/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/cppunit/cppunit-1.10.2/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="cppunit" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/cppunit/cppunit-1.10.2/bin/install-sh b/livesupport/tools/cppunit/cppunit-1.10.2/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/cppunit/cppunit-1.10.2/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/cppunit/cppunit-1.10.2/bin/install.sh b/livesupport/tools/cppunit/cppunit-1.10.2/bin/prepare.sh similarity index 77% rename from livesupport/tools/cppunit/cppunit-1.10.2/bin/install.sh rename to livesupport/tools/cppunit/cppunit-1.10.2/bin/prepare.sh index 7c27cf43d..e10ff0767 100755 --- a/livesupport/tools/cppunit/cppunit-1.10.2/bin/install.sh +++ b/livesupport/tools/cppunit/cppunit-1.10.2/bin/prepare.sh @@ -22,35 +22,35 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.3 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/cppunit/cppunit-1.10.2/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/cppunit/cppunit-1.10.2/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. +# Run this script to prepare cppunit to be configured and compiled. # For more information on CppUnit, see http://cppunit.sourceforge.net/ #------------------------------------------------------------------------------- product=cppunit-1.10.2 reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp +bindir=$basedir/bin etcdir=$basedir/etc +tmpdir=$basedir/tmp tar=$basedir/src/$product.tar.gz -echo "installing $product from $basedir to $installdir" +echo "preparing $product from $basedir to $tmpdir" mkdir -p $tmpdir cd $tmpdir -tar xfz $tar -cd $product -patch -p1 < $etcdir/cppunit-1.10.2-nostandalone.patch -./configure --prefix=$installdir -make install +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -cd $basedir -rm -rf tmp +# untar and patch the sources +if [ ! -d $product ]; then + tar xfz $tar + cd $product + patch -p1 < $etcdir/cppunit-1.10.2-nostandalone.patch +fi diff --git a/livesupport/tools/cppunit/cppunit-1.10.2/etc/Makefile.in b/livesupport/tools/cppunit/cppunit-1.10.2/etc/Makefile.in new file mode 100644 index 000000000..22c4803c0 --- /dev/null +++ b/livesupport/tools/cppunit/cppunit-1.10.2/etc/Makefile.in @@ -0,0 +1,72 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/cppunit/cppunit-1.10.2/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +CXXUNIT_VERSION = cppunit-1.10.2 +CXXUNIT_DIR = ${TMP_DIR}/${CXXUNIT_VERSION} + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: + ${MAKE} -C ${CXXUNIT_DIR} + +install: + ${MAKE} -C ${CXXUNIT_DIR} install + +clean: + ${MAKE} -C ${CXXUNIT_DIR} clean + +distclean: + ${RMDIR} ${CXXUNIT_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/cppunit/cppunit-1.10.2/etc/configure.ac b/livesupport/tools/cppunit/cppunit-1.10.2/etc/configure.ac new file mode 100644 index 000000000..657ab5250 --- /dev/null +++ b/livesupport/tools/cppunit/cppunit-1.10.2/etc/configure.ac @@ -0,0 +1,53 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/cppunit/cppunit-1.10.2/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(cppunit, 1.10.2, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/cppunit-1.10.2.tar.gz) + + +dnl untar the cppunit sources before anything happens +../bin/prepare.sh + +dnl configure cppunit with the same parameters as we have +AC_CONFIG_SUBDIRS(../tmp/cppunit-1.10.2) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/curl/curl-7.12.3/bin/autogen.sh b/livesupport/tools/curl/curl-7.12.3/bin/autogen.sh new file mode 100755 index 000000000..36b60e963 --- /dev/null +++ b/livesupport/tools/curl/curl-7.12.3/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="curl" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/curl/curl-7.12.3/bin/install-sh b/livesupport/tools/curl/curl-7.12.3/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/curl/curl-7.12.3/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/curl/curl-7.12.3/bin/install.sh b/livesupport/tools/curl/curl-7.12.3/bin/prepare.sh similarity index 77% rename from livesupport/tools/curl/curl-7.12.3/bin/install.sh rename to livesupport/tools/curl/curl-7.12.3/bin/prepare.sh index 723fea51e..ef2bdbe99 100755 --- a/livesupport/tools/curl/curl-7.12.3/bin/install.sh +++ b/livesupport/tools/curl/curl-7.12.3/bin/prepare.sh @@ -22,23 +22,20 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.5 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. -# For more information on libxml++, see http://libxmlplusplus.sourceforge.net/ -# -# WARNING: This install script does NOT install related dependencies, like Glib. -# To have these dependencies installed, please install GTK-- first, which -# in fact installs all needed dependencies +# Run this script to prepare curl to be configured and compiled. +# For more information on curl, see http://curl.haxx.se/ #------------------------------------------------------------------------------- product=curl-7.12.3 reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` usrdir=`cd $basedir/../../../usr; pwd;` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp tar=$basedir/src/$product.tar.bz2 installdir=$usrdir @@ -55,11 +52,13 @@ echo "installing $product from $basedir to $installdir" mkdir -p $tmpdir cd $tmpdir -tar xfj $tar -cd $product -./configure --prefix=$installdir -make install +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -cd $basedir -rm -rf tmp +# untar and patch the sources +if [ ! -d $product ]; then + tar xfj $tar + cd $product + # patch here +fi diff --git a/livesupport/tools/curl/curl-7.12.3/etc/Makefile.in b/livesupport/tools/curl/curl-7.12.3/etc/Makefile.in new file mode 100644 index 000000000..cb3c79ee8 --- /dev/null +++ b/livesupport/tools/curl/curl-7.12.3/etc/Makefile.in @@ -0,0 +1,72 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +CURL_VERSION = curl-7.12.3 +CURL_DIR = ${TMP_DIR}/${CURL_VERSION} + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: + ${MAKE} -C ${CURL_DIR} + +install: + ${MAKE} -C ${CURL_DIR} install + +clean: + ${MAKE} -C ${CURL_DIR} clean + +distclean: + ${RMDIR} ${CURL_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/curl/curl-7.12.3/etc/configure.ac b/livesupport/tools/curl/curl-7.12.3/etc/configure.ac new file mode 100644 index 000000000..4d027aabd --- /dev/null +++ b/livesupport/tools/curl/curl-7.12.3/etc/configure.ac @@ -0,0 +1,53 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(curl, 7.12.3, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/curl-7.12.3.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + +dnl configure with the same parameters as we have +AC_CONFIG_SUBDIRS(../tmp/curl-7.12.3) + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/autogen.sh b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/autogen.sh new file mode 100755 index 000000000..54bfbb24b --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="gstreamer" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install-sh b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh similarity index 53% rename from livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh rename to livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh index 28343b6c1..150133802 100755 --- a/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh @@ -22,12 +22,11 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.12 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install gstreamer into the development system usr -# environment. +# Run this script to prepare gstreamer to be configured and compiled. # To read more about gstreamer, see http://gstreamer.freedesktop.org/ #------------------------------------------------------------------------------- product=gstreamer-0.8.10 @@ -36,8 +35,9 @@ plugins=gst-plugins-0.8.9 reldir=`dirname $0`/.. basedir=`cd ${reldir}; pwd;` installdir=`cd ${basedir}/../../../usr; pwd;` -tmpdir=${basedir}/tmp +bindir=${basedir}/bin etcdir=${basedir}/etc +tmpdir=${basedir}/tmp gstreamer_tar=${basedir}/src/${product}.tar.bz2 plugins_tar=${basedir}/src/${plugins}.tar.bz2 pkg_config_path=${installdir}/lib/pkgconfig @@ -51,49 +51,34 @@ export CPPFLAGS="-I${installdir}/install" mkdir -p ${tmpdir} -echo "installing ${product} from ${basedir} to ${installdir}" +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir cd ${tmpdir} -tar xfj ${gstreamer_tar} -cd ${product} -./configure --prefix=${installdir} \ - --with-pkg-config-path=${pkg_config_path} -make install || exit 1 - - -echo "installing ${plugins} from ${basedir} to ${installdir}" +if [ ! -d $product ]; then + tar xfj ${gstreamer_tar} + cd ${product} + # patch here +fi cd ${tmpdir} -tar xfj ${plugins_tar} -cd ${plugins} -# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=305658 -# for details on the following patch -patch -p1 < ${etcdir}/adder-fix.patch -# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=309218 -# for details on the following patch -patch -p1 < ${etcdir}/adder-duration-fix.patch -# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308167 -# for details on the following patch -patch -p1 < ${etcdir}/switch-fix.patch -# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308619 -# for details on the following patch -patch -p1 < ${etcdir}/id3demuxbin-pad-free-fix.patch -# see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308663 -# for details on the following patch -patch -p1 < ${etcdir}/typefind-smil.patch -# --disable-spc is a workaround for gst-plugins-0.8.9, as some APU.c file -# is missing from there. remove this when later versions come around -# --disable-gconf --disable-gconftool is here because libgconf will refer -# to the system libgobject, which might conflict with our version, -# resulting in missing linking symbols -./configure --disable-spc \ - --disable-gconf --disable-gconftool \ - --disable-opengl \ - --prefix=${installdir} \ - --with-pkg-config-path=${pkg_config_path} -make install || exit 1 - - -cd ${basedir} -rm -rf tmp +if [ ! -d $plugins ]; then + tar xfj ${plugins_tar} + cd ${plugins} + # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=305658 + # for details on the following patch + patch -p1 < ${etcdir}/adder-fix.patch + # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=309218 + # for details on the following patch + patch -p1 < ${etcdir}/adder-duration-fix.patch + # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308167 + # for details on the following patch + patch -p1 < ${etcdir}/switch-fix.patch + # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308619 + # for details on the following patch + patch -p1 < ${etcdir}/id3demuxbin-pad-free-fix.patch + # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=308663 + # for details on the following patch + patch -p1 < ${etcdir}/typefind-smil.patch +fi diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in new file mode 100644 index 000000000..fa2bdf99a --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in @@ -0,0 +1,106 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +GSTREAMER_VERSION = gstreamer-0.8.10 +GSTREAMER_DIR = ${TMP_DIR}/${GSTREAMER_VERSION} +GST_PLUGINS_VERSION = gst-plugins-0.8.9 +GST_PLUGINS_DIR = ${TMP_DIR}/${GST_PLUGINS_VERSION} + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +# libdir will look literally like ${exec_prefix}/lib +# thus we need exec_prefix defined as well above +libdir=@libdir@ +pkg_config_path=${libdir}/pkgconfig + + +USR_DIR=${prefix} +USR_BIN_DIR=${USR_DIR}/bin +USR_LIB_DIR=${libdir} + +export PATH:=${USR_BIN_DIR}:${PATH} +export CPPFLAGS=-I${USR_DIR}/include +export LDFLAGS=-L${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} +export PKG_CONFIG_PATH=${USR_LIB_DIR}/pkgconfig + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + cd ${GSTREAMER_DIR} && \ + ./configure --prefix=${prefix} --with-pkg-config-path=${pkg_config_path} + ${MAKE} -C ${GSTREAMER_DIR} + ${MAKE} -C ${GSTREAMER_DIR} install + cd ${GST_PLUGINS_DIR} && \ + ./configure --prefix=${prefix} \ + --with-pkg-config-path=${pkg_config_path} \ + --disable-spc \ + --disable-gconf --disable-gconftool \ + --disable-opengl + ${MAKE} -C ${GST_PLUGINS_DIR} + ${MAKE} -C ${GST_PLUGINS_DIR} install + +install: all + +clean: + ${MAKE} -C ${GSTREAMER_DIR} clean + ${MAKE} -C ${GST_PLUGINS_DIR} clean + rm ${TMP_DIR}/all.stamp + +distclean: + ${RMDIR} ${GSTREAMER_DIR} + ${RMDIR} ${GST_PLUGINS_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/configure.ac b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/configure.ac new file mode 100644 index 000000000..b2fc820cc --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(gstreamer, 0.8.10, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/gstreamer-0.8.10.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh b/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh new file mode 100755 index 000000000..f91d769c7 --- /dev/null +++ b/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="gtk+" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/bin/install-sh b/livesupport/tools/gtk+/gtk+-2.6.1/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/gtk+/gtk+-2.6.1/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh b/livesupport/tools/gtk+/gtk+-2.6.1/bin/prepare.sh similarity index 62% rename from livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh rename to livesupport/tools/gtk+/gtk+-2.6.1/bin/prepare.sh index 1f87af8ff..25dfe171a 100755 --- a/livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh +++ b/livesupport/tools/gtk+/gtk+-2.6.1/bin/prepare.sh @@ -21,13 +21,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ +# Author : $Author: maroy $ # Version : $Revision: 1.2 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/bin/Attic/install.sh,v $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install GTK+ 2.6 into the development system usr -# environment. +# Run this script to prepare GTK+ 2.6 to be configured and compiled. # For more information on GTK+, see http://www.gtk.org/ # This script will install GTK+, and its intermediate dependencies as well #------------------------------------------------------------------------------- @@ -38,11 +37,11 @@ atk_product=atk-1.9.0 gtk_product=gtk+-2.6.1 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -etcdir=$basedir/etc -usrdir=$installdir +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp glib_tar=$basedir/src/$glib_product.tar.bz2 tiff_tar=$basedir/src/$tiff_product.tar.gz @@ -55,50 +54,44 @@ export LDFLAGS="-L$installdir/lib" export PKG_CONFIG_PATH="$installdir/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" export PATH="$PATH:$usrdir/bin" -mkdir -p $tmpdir -# compile & install tiff -echo "installing $tiff_product from $basedir to $installdir" -cd $tmpdir -tar xfz $tiff_tar -cd $tiff_product -./configure --prefix=$installdir -make && make install +mkdir -p ${tmpdir} -# compile & install glib -echo "installing $glib_product from $basedir to $installdir" -cd $tmpdir -tar xfj $glib_tar -cd $glib_product -./configure --prefix=$installdir -make && make install +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -# compile & install pango -echo "installing $pango_product from $basedir to $installdir" -cd $tmpdir -tar xfj $pango_tar -cd $pango_product -./configure --prefix=$installdir -make && make install +cd ${tmpdir} +if [ ! -d $tiff_product ]; then + tar xfz ${tiff_tar} + cd ${tiff_product} + # patch here +fi -# compile & install atk -echo "installing $atk_product from $basedir to $installdir" -cd $tmpdir -tar xfj $atk_tar -cd $atk_product -./configure --prefix=$installdir -make && make install +cd ${tmpdir} +if [ ! -d $glib_product ]; then + tar xfj ${glib_tar} + cd ${glib_product} + # patch here +fi -# compile & install gtk+ -echo "installing $gtk_product from $basedir to $installdir" -cd $tmpdir -tar xfj $gtk_tar -cd $gtk_product -./configure --prefix=$installdir -make && make install +cd ${tmpdir} +if [ ! -d $pango_product ]; then + tar xfj ${pango_tar} + cd ${pango_product} + # patch here +fi +cd ${tmpdir} +if [ ! -d $atk_product ]; then + tar xfj ${atk_tar} + cd ${atk_product} + # patch here +fi -# clean up -cd $basedir -rm -rf $tmpdir +cd ${tmpdir} +if [ ! -d $gtk_product ]; then + tar xfj ${gtk_tar} + cd ${gtk_product} + # patch here +fi diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/etc/Makefile.in b/livesupport/tools/gtk+/gtk+-2.6.1/etc/Makefile.in new file mode 100644 index 000000000..3dc050be3 --- /dev/null +++ b/livesupport/tools/gtk+/gtk+-2.6.1/etc/Makefile.in @@ -0,0 +1,121 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +TIFF_VERSION = tiff-3.7.1 +TIFF_DIR = ${TMP_DIR}/${TIFF_VERSION} + +GLIB_VERSION = glib-2.6.1 +GLIB_DIR = ${TMP_DIR}/${GLIB_VERSION} + +PANGO_VERSION = pango-1.8.0 +PANGO_DIR = ${TMP_DIR}/${PANGO_VERSION} + +ATK_VERSION = atk-1.9.0 +ATK_DIR = ${TMP_DIR}/${ATK_VERSION} + +GTK_VERSION = gtk+-2.6.1 +GTK_DIR = ${TMP_DIR}/${GTK_VERSION} + +prefix=@prefix@ + +USR_DIR=${prefix} +USR_BIN_DIR=${USR_DIR}/bin +USR_LIB_DIR=${USR_DIR}/lib + +export PATH:=${USR_BIN_DIR}:${PATH} +export CPPFLAGS=-I${USR_DIR}/include +export LDFLAGS=-L${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} +export PKG_CONFIG_PATH=${USR_LIB_DIR}/pkgconfig + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + cd ${TIFF_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${TIFF_DIR} + ${MAKE} -C ${TIFF_DIR} install + cd ${GLIB_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${GLIB_DIR} + ${MAKE} -C ${GLIB_DIR} install + cd ${PANGO_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${PANGO_DIR} + ${MAKE} -C ${PANGO_DIR} install + cd ${ATK_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${ATK_DIR} + ${MAKE} -C ${ATK_DIR} install + cd ${GTK_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${GTK_DIR} + ${MAKE} -C ${GTK_DIR} install + touch ${TMP_DIR}/all.stamp + +install: all + +clean: + ${MAKE} -C ${TIFF_DIR} clean + ${MAKE} -C ${GLIB_DIR} clean + ${MAKE} -C ${PANGO_DIR} clean + ${MAKE} -C ${ATK_DIR} clean + ${MAKE} -C ${GTK_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${TIFF_DIR} + ${RMDIR} ${GLIB_DIR} + ${RMDIR} ${PANGO_DIR} + ${RMDIR} ${ATK_DIR} + ${RMDIR} ${GTK_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/etc/configure.ac b/livesupport/tools/gtk+/gtk+-2.6.1/etc/configure.ac new file mode 100644 index 000000000..193e975fb --- /dev/null +++ b/livesupport/tools/gtk+/gtk+-2.6.1/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(gtk+, 2.6.1, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/gtk+-2.6.1.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/tmp/.keepme b/livesupport/tools/gtk+/gtk+-2.6.1/tmp/.keepme new file mode 100644 index 000000000..e0808fa16 --- /dev/null +++ b/livesupport/tools/gtk+/gtk+-2.6.1/tmp/.keepme @@ -0,0 +1 @@ +keep me diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh new file mode 100755 index 000000000..7542a3f65 --- /dev/null +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="gtk--" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install-sh b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/prepare.sh similarity index 68% rename from livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh rename to livesupport/tools/gtkmm/gtkmm-2.5.5/bin/prepare.sh index 2775f7c3a..f600d1060 100755 --- a/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/prepare.sh @@ -21,13 +21,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ +# Author : $Author: maroy $ # Version : $Revision: 1.2 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/Attic/install.sh,v $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install GTK-- 2.5 into the development system usr -# environment. +# Run this script to prepare GTK-- 2.6 to be configured and compiled. # For more information on GTK--, see http://gtkmm.sourceforge.net/ # This script will install GTK--, and its intermediate dependencies as well #------------------------------------------------------------------------------- @@ -36,11 +35,11 @@ glibmm_product=glibmm-2.5.4 gtkmm_product=gtkmm-2.5.5 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -etcdir=$basedir/etc -usrdir=$installdir +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp sigc_tar=$basedir/src/$sigc_product.tar.bz2 glibmm_tar=$basedir/src/$glibmm_product.tar.bz2 @@ -52,34 +51,29 @@ export PKG_CONFIG_PATH="$installdir/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" export PATH="$PATH:$usrdir/bin" -mkdir -p $tmpdir +mkdir -p ${tmpdir} -# compile & install sigc first -echo "installing $sigc_product from $basedir to $installdir" -cd $tmpdir -tar xfj $sigc_tar -cd $sigc_product -./configure --prefix=$installdir -make && make install +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -# compile & install glibmm -echo "installing $glibmm_product from $basedir to $installdir" -cd $tmpdir -tar xfj $glibmm_tar -cd $glibmm_product -./configure --prefix=$installdir -make && make install +cd ${tmpdir} +if [ ! -d $sigc_product ]; then + tar xfj ${sigc_tar} + cd ${sigc_product} + # patch here +fi -# compile & install gtkmm -echo "installing $gtkmm_product from $basedir to $installdir" -cd $tmpdir -tar xfj $gtkmm_tar -cd $gtkmm_product -./configure --prefix=$installdir -make && make install +cd ${tmpdir} +if [ ! -d $glibmm_product ]; then + tar xfj ${glibmm_tar} + cd ${glibmm_product} + # patch here +fi - -# clean up -cd $basedir -rm -rf $tmpdir +cd ${tmpdir} +if [ ! -d $gtkmm_product ]; then + tar xfj ${gtkmm_tar} + cd ${gtkmm_product} + # patch here +fi diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in b/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in new file mode 100644 index 000000000..ac1e9698a --- /dev/null +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in @@ -0,0 +1,95 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +SIGC_VERSION = libsigc++-2.0.6 +SIGC_DIR = ${TMP_DIR}/${SIGC_VERSION} + +GLIBMM_VERSION = glibmm-2.5.4 +GLIBMM_DIR = ${TMP_DIR}/${GLIBMM_VERSION} + +GTKMM_VERSION = gtkmm-2.5.5 +GTKMM_DIR = ${TMP_DIR}/${GTKMM_VERSION} + +prefix=@prefix@ + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + cd ${SIGC_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${SIGC_DIR} + ${MAKE} -C ${SIGC_DIR} install + cd ${GLIBMM_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${GLIBMM_DIR} + ${MAKE} -C ${GLIBMM_DIR} install + cd ${GTKMM_DIR} && ./configure --prefix=${prefix} --disable-examples + ${MAKE} -C ${GTKMM_DIR} + ${MAKE} -C ${GTKMM_DIR} install + touch ${TMP_DIR}/all.stamp + +install: all + +clean: + ${MAKE} -C ${SIGC_DIR} clean + ${MAKE} -C ${GLIBMM_DIR} clean + ${MAKE} -C ${GTKMM_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${SIGC_DIR} + ${RMDIR} ${GLIBMM_DIR} + ${RMDIR} ${GTKMM_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/configure.ac b/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/configure.ac new file mode 100644 index 000000000..254f79b36 --- /dev/null +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(gtk--, 2.5.5, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/gtkmm-2.5.5.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/tmp/.keepme b/livesupport/tools/gtkmm/gtkmm-2.5.5/tmp/.keepme new file mode 100644 index 000000000..e0808fa16 --- /dev/null +++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/tmp/.keepme @@ -0,0 +1 @@ +keep me diff --git a/livesupport/tools/icu/icu-3.0/bin/autogen.sh b/livesupport/tools/icu/icu-3.0/bin/autogen.sh new file mode 100755 index 000000000..d1367bd24 --- /dev/null +++ b/livesupport/tools/icu/icu-3.0/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/icu/icu-3.0/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="icu" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/icu/icu-3.0/bin/install-sh b/livesupport/tools/icu/icu-3.0/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/icu/icu-3.0/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/icu/icu-3.0/bin/install.sh b/livesupport/tools/icu/icu-3.0/bin/prepare.sh similarity index 72% rename from livesupport/tools/icu/icu-3.0/bin/install.sh rename to livesupport/tools/icu/icu-3.0/bin/prepare.sh index b3773522b..bacaa9743 100755 --- a/livesupport/tools/icu/icu-3.0/bin/install.sh +++ b/livesupport/tools/icu/icu-3.0/bin/prepare.sh @@ -3,6 +3,8 @@ # 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 @@ -20,45 +22,35 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.3 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/icu/icu-3.0/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/icu/icu-3.0/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install ICU into the development system usr -# environment. +# Run this script to prepare ICU 3.0 to be configured and compiled. # For more information on ICU, see http://ibm.com/software/globalization/icu #------------------------------------------------------------------------------- product=icu-3.0 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + tar=$basedir/src/$product.tgz docdir=$installdir/share/doc/icu/3.0 doczip=$basedir/src/$product-docs.zip -echo "installing $product from $basedir to $installdir" +mkdir -p ${tmpdir} +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -mkdir -p $tmpdir -cd $tmpdir - -# compile and install the library - -tar xfz $tar -cd icu/source -./runConfigureICU LinuxRedHat --prefix=$installdir -make install - -# install the documentation as well - -cd $tmpdir -mkdir -p $docdir -unzip $doczip -d $docdir - -# clean up - -cd $basedir -rm -rf tmp +cd ${tmpdir} +if [ ! -d icu ]; then + tar xfz ${tar} + cd icu + # patch here +fi diff --git a/livesupport/tools/icu/icu-3.0/etc/Makefile.in b/livesupport/tools/icu/icu-3.0/etc/Makefile.in new file mode 100644 index 000000000..7e6ff903c --- /dev/null +++ b/livesupport/tools/icu/icu-3.0/etc/Makefile.in @@ -0,0 +1,79 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/icu/icu-3.0/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +ICU_VERSION = icu-3.0 +ICU_DIR = ${TMP_DIR}/icu/source + +prefix=@prefix@ + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + ${MAKE} -C ${ICU_DIR} + ${MAKE} -C ${ICU_DIR} install + touch ${TMP_DIR}/all.stamp + +install: all + +clean: + ${MAKE} -C ${ICU_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${ICU_DIR} + ${RMDIR} ${TMP_DIR}/icu + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/icu/icu-3.0/etc/configure.ac b/livesupport/tools/icu/icu-3.0/etc/configure.ac new file mode 100644 index 000000000..fe59342bf --- /dev/null +++ b/livesupport/tools/icu/icu-3.0/etc/configure.ac @@ -0,0 +1,54 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/icu/icu-3.0/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(icu, 3.0, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/icu-3.0.tgz) + + +dnl untar the sources before anything happens +../bin/prepare.sh + +cd ../tmp/icu/source +./runConfigureICU LinuxRedHat --prefix=$prefix +cd - + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/lcov/lcov-1.3/bin/autogen.sh b/livesupport/tools/lcov/lcov-1.3/bin/autogen.sh new file mode 100755 index 000000000..613b80c39 --- /dev/null +++ b/livesupport/tools/lcov/lcov-1.3/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/lcov/lcov-1.3/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="lcov" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/lcov/lcov-1.3/bin/install-sh b/livesupport/tools/lcov/lcov-1.3/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/lcov/lcov-1.3/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/lcov/lcov-1.3/bin/install.sh b/livesupport/tools/lcov/lcov-1.3/bin/prepare.sh similarity index 73% rename from livesupport/tools/lcov/lcov-1.3/bin/install.sh rename to livesupport/tools/lcov/lcov-1.3/bin/prepare.sh index d51dac8ef..e3e12dd80 100755 --- a/livesupport/tools/lcov/lcov-1.3/bin/install.sh +++ b/livesupport/tools/lcov/lcov-1.3/bin/prepare.sh @@ -23,35 +23,33 @@ # # Author : $Author: maroy $ # Version : $Revision: 1.2 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/lcov/lcov-1.3/bin/Attic/install.sh,v $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/lcov/lcov-1.3/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. +# Run this script to prepare lcov 1.3 to be configured and compiled. # For more information on lcov, see http://ltp.sourceforge.net/coverage/lcov.php #------------------------------------------------------------------------------- product=lcov-1.3 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -etcdir=$basedir/etc +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + tar=$basedir/src/$product.tar.gz -echo "installing $product from $basedir to $installdir" +mkdir -p ${tmpdir} +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -mkdir -p $tmpdir -cd $tmpdir - -tar xfz $tar -cd $product -patch -p1 < $etcdir/lcov-1.3-geninfo-regexp.patch -# lcov installs itself into PREFIX/usr/bin, so our normal installdir won't work -lcov_installdir=`cd $installdir/..; pwd;` -PREFIX=$lcov_installdir make install - -cd $basedir -rm -rf tmp +cd ${tmpdir} +if [ ! -d $product ]; then + tar xfz ${tar} + cd $product + patch -p1 < $etcdir/lcov-1.3-geninfo-regexp.patch + patch -p1 < $etcdir/lcov-1.3-install-to-prefix.patch +fi diff --git a/livesupport/tools/lcov/lcov-1.3/etc/Makefile.in b/livesupport/tools/lcov/lcov-1.3/etc/Makefile.in new file mode 100644 index 000000000..3fb403746 --- /dev/null +++ b/livesupport/tools/lcov/lcov-1.3/etc/Makefile.in @@ -0,0 +1,81 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/lcov/lcov-1.3/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +LCOV_VERSION = lcov-1.3 +LCOV_DIR = ${TMP_DIR}/${LCOV_VERSION} + +# this environment variable is used by the lcov Makefile to determine +# the installation directory +PREFIX=@prefix@ +export PREFIX + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + ${MAKE} -C ${LCOV_DIR} + ${MAKE} -C ${LCOV_DIR} install + touch ${TMP_DIR}/all.stamp + +install: all + +clean: + ${MAKE} -C ${LCOV_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${LCOV_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/lcov/lcov-1.3/etc/configure.ac b/livesupport/tools/lcov/lcov-1.3/etc/configure.ac new file mode 100644 index 000000000..17ddf0c3d --- /dev/null +++ b/livesupport/tools/lcov/lcov-1.3/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/lcov/lcov-1.3/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(lcov, 1.3, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/lcov-1.3.tar.gz) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/lcov/lcov-1.3/etc/lcov-1.3-install-to-prefix.patch b/livesupport/tools/lcov/lcov-1.3/etc/lcov-1.3-install-to-prefix.patch new file mode 100644 index 000000000..8dd12c87b --- /dev/null +++ b/livesupport/tools/lcov/lcov-1.3/etc/lcov-1.3-install-to-prefix.patch @@ -0,0 +1,13 @@ +--- lcov-1.3/Makefile 2004-04-28 19:57:09.000000000 +0200 ++++ lcov-1.3-livesupport/Makefile 2005-07-22 12:12:18.000000000 +0200 +@@ -15,8 +15,8 @@ + RELEASE := 1 + DATE := $(shell date +%Y-%m-%d) + +-BIN_DIR := $(PREFIX)/usr/bin +-MAN_DIR := $(PREFIX)/usr/share/man ++BIN_DIR := $(PREFIX)/bin ++MAN_DIR := $(PREFIX)/share/man + TMP_DIR := /tmp/lcov-tmp.$(shell echo $$$$) + FILES := $(wildcard bin/*) $(wildcard man/*) README CHANGES Makefile \ + $(wildcard rpm/*) diff --git a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/autogen.sh b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/autogen.sh new file mode 100755 index 000000000..9d4a15f5b --- /dev/null +++ b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="libodbc++" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install-sh b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install.sh b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/prepare.sh similarity index 68% rename from livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install.sh rename to livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/prepare.sh index b8347fc64..9c619335a 100755 --- a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install.sh +++ b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/prepare.sh @@ -22,37 +22,35 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install libodbc++ into the development system usr -# environment. +# Run this script to prepare libodbc++ 2.3 to be configured and compiled. # To read more about libodbc++, see http://libodbcxx.sourceforge.net/ #------------------------------------------------------------------------------- product=libodbc++-0.2.3-20050404 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -etcdir=$basedir/etc +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + tar=$basedir/src/$product.tar.bz2 -echo "installing $product from $basedir to $installdir" +mkdir -p ${tmpdir} +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -mkdir -p $tmpdir -cd $tmpdir - -tar xfj $tar -cd $product -patch -p1 < $etcdir/libodbc++-no-namespace-closing-colon.patch -patch -p1 < $etcdir/libodbc++-no-thread-dmaccess-mutex-fix.patch -patch -p1 < $etcdir/libodbc++-dont-install-some-docs.patch -./configure --enable-threads --prefix=$installdir -make install - -cd $basedir -rm -rf tmp +cd ${tmpdir} +if [ ! -d $product ]; then + tar xfj ${tar} + cd $product + patch -p1 < $etcdir/libodbc++-no-namespace-closing-colon.patch + patch -p1 < $etcdir/libodbc++-no-thread-dmaccess-mutex-fix.patch + patch -p1 < $etcdir/libodbc++-dont-install-some-docs.patch +fi diff --git a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/Makefile.in b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/Makefile.in new file mode 100644 index 000000000..3838bae05 --- /dev/null +++ b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/Makefile.in @@ -0,0 +1,78 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +LIBODBCXX_VERSION = libodbc++-0.2.3-20050404 +LIBODBCXX_DIR = ${TMP_DIR}/${LIBODBCXX_VERSION} + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + ${MAKE} -C ${LIBODBCXX_DIR} + touch ${TMP_DIR}/all.stamp + +install: all ${TMP_DIR}/install.stamp +${TMP_DIR}/install.stamp: + ${MAKE} -C ${LIBODBCXX_DIR} install + touch ${TMP_DIR}/install.stamp + +clean: + ${MAKE} -C ${LIBODBCXX_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${LIBODBCXX_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/configure.ac b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/configure.ac new file mode 100644 index 000000000..564ccc016 --- /dev/null +++ b/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/configure.ac @@ -0,0 +1,54 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(libodbc++, 0.2.3, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/libodbc++-0.2.3-20050404.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + +cd ../tmp/libodbc++-0.2.3-20050404 +./configure --enable-threads --prefix=$prefix +cd - + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/bin/autogen.sh b/livesupport/tools/libxml++/libxml++-2.8.1/bin/autogen.sh new file mode 100755 index 000000000..3025ffaec --- /dev/null +++ b/livesupport/tools/libxml++/libxml++-2.8.1/bin/autogen.sh @@ -0,0 +1,96 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libxml++/libxml++-2.8.1/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="libxml++" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +${configure} "$@" && echo diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/bin/install-sh b/livesupport/tools/libxml++/libxml++-2.8.1/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/libxml++/libxml++-2.8.1/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/bin/install.sh b/livesupport/tools/libxml++/libxml++-2.8.1/bin/prepare.sh similarity index 66% rename from livesupport/tools/libxml++/libxml++-2.8.1/bin/install.sh rename to livesupport/tools/libxml++/libxml++-2.8.1/bin/prepare.sh index 81c873b22..64e7ae655 100755 --- a/livesupport/tools/libxml++/libxml++-2.8.1/bin/install.sh +++ b/livesupport/tools/libxml++/libxml++-2.8.1/bin/prepare.sh @@ -22,12 +22,11 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libxml++/libxml++-2.8.1/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libxml++/libxml++-2.8.1/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. +# Run this script to prepare libxml++ 2.8.1 to be configured and compiled. # For more information on libxml++, see http://libxmlplusplus.sourceforge.net/ # # WARNING: This install script does NOT install related dependencies, like Glib. @@ -37,37 +36,23 @@ product=libxml++-2.8.1 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -usrdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -sharedir=$usrdir/share -docdir=$sharedir/doc/libxml++ +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + tar=$basedir/src/$product.tar.bz2 -installdir=$usrdir -export CPPFLAGS="-I$usrdir/include" -export LDFLAGS="-L$usrdir/lib" -export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" -export PATH="$PATH:$usrdir/bin" +mkdir -p ${tmpdir} -echo "installing $product from $basedir to $installdir" +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir - -mkdir -p $tmpdir -cd $tmpdir - -tar xfj $tar -cd $product -./configure --prefix=$installdir -make install - -# make the reference documentation and install that as well, as the -# autoconf thing doesn't :( -make -C docs/reference -mkdir -p $docdir -cp -pPR docs/reference/2.8 $docdir - -cd $basedir -rm -rf tmp +cd ${tmpdir} +if [ ! -d $product ]; then + tar xfj ${tar} + cd $product + # patch here +fi diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/etc/Makefile.in b/livesupport/tools/libxml++/libxml++-2.8.1/etc/Makefile.in new file mode 100644 index 000000000..fcf4e585e --- /dev/null +++ b/livesupport/tools/libxml++/libxml++-2.8.1/etc/Makefile.in @@ -0,0 +1,102 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libxml++/libxml++-2.8.1/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +LIBXMLXX_VERSION = libxml++-2.8.1 +LIBXMLXX_DIR = ${TMP_DIR}/${LIBXMLXX_VERSION} + +prefix = @prefix@ +# datadir will be defiend as ${prefix}/share, so we need to define ${prefix} +# above +docdir = @datadir@/doc/${LIBXMLXX_VERSION} + +USR_DIR=${prefix} +USR_BIN_DIR=${USR_DIR}/bin +USR_LIB_DIR=${USR_DIR}/lib + +export PATH:=${USR_BIN_DIR}:${PATH} +export CPPFLAGS=-I${USR_DIR}/include +export LDFLAGS=-L${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} +export PKG_CONFIG_PATH=${USR_LIB_DIR}/pkgconfig + + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + cd ${LIBXMLXX_DIR} && ./configure --prefix=${prefix} + ${MAKE} -C ${LIBXMLXX_DIR} + # make the reference documentation and install that as well, as the + # autoconf thing doesn't :( + ${MAKE} -C ${LIBXMLXX_DIR}/docs/reference + touch ${TMP_DIR}/all.stamp + +install: all ${TMP_DIR}/install.stamp +${TMP_DIR}/install.stamp: + ${MAKE} -C ${LIBXMLXX_DIR} install + # make the reference documentation and install that as well, as the + # autoconf thing doesn't :( + ${MKDIR} ${docdir} + cp -pPR ${LIBXMLXX_DIR}/docs/reference/2.8 ${docdir} + touch ${TMP_DIR}/install.stamp + +clean: + ${MAKE} -C ${LIBXMLXX_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${LIBXMLXX_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/etc/configure.ac b/livesupport/tools/libxml++/libxml++-2.8.1/etc/configure.ac new file mode 100644 index 000000000..a83850bd0 --- /dev/null +++ b/livesupport/tools/libxml++/libxml++-2.8.1/etc/configure.ac @@ -0,0 +1,50 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libxml++/libxml++-2.8.1/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(libxml++, 2.8.1, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/libxml++-2.8.1.tar.bz2) + + +dnl untar the sources before anything happens +../bin/prepare.sh + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/libxml++/libxml++-2.8.1/tmp/.keepme b/livesupport/tools/libxml++/libxml++-2.8.1/tmp/.keepme new file mode 100644 index 000000000..e0808fa16 --- /dev/null +++ b/livesupport/tools/libxml++/libxml++-2.8.1/tmp/.keepme @@ -0,0 +1 @@ +keep me diff --git a/livesupport/tools/taglib/taglib-1.3.1/bin/install.sh b/livesupport/tools/pear/bin/autogen.sh similarity index 53% rename from livesupport/tools/taglib/taglib-1.3.1/bin/install.sh rename to livesupport/tools/pear/bin/autogen.sh index 208c1a919..09fdfbcf7 100755 --- a/livesupport/tools/taglib/taglib-1.3.1/bin/install.sh +++ b/livesupport/tools/pear/bin/autogen.sh @@ -21,57 +21,67 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.3 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/bin/Attic/install.sh,v $ -#------------------------------------------------------------------------------- +# Author : $Author: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/autogen.sh,v $ #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. -# For more information on libxml++, see http://libxmlplusplus.sourceforge.net/ -# -# WARNING: This install script does NOT install related dependencies, like Glib. -# To have these dependencies installed, please install GTK-- first, which -# in fact installs all needed dependencies -#------------------------------------------------------------------------------- -product=taglib-1.3.1 +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="pear" + +# assume we're in $basedir/bin reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. usrdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp + +bindir=$basedir/bin etcdir=$basedir/etc -sharedir=$usrdir/share -docdir=$sharedir/doc/taglib-1.3.1 -tar=$basedir/src/$product.tar.gz -installdir=$usrdir +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} export CPPFLAGS="-I$usrdir/include" export LDFLAGS="-L$usrdir/lib" export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" - -echo "installing $product from $basedir to $installdir" - - -mkdir -p $tmpdir -cd $tmpdir - -tar xfz $tar -cd $product -patch -p1 < $etcdir/taglib-1.3.1-length-in-microseconds.patch -./configure --prefix=$installdir -make install - -# make the reference documentation and install that as well, as the -# autoconf thing doesn't :( -cd taglib-api -doxygen taglib.doxygen -cd .. -mkdir -p $docdir -cp -pPRf taglib-api/* $docdir - -cd $basedir -rm -rf tmp - +${configure} "$@" && echo diff --git a/livesupport/tools/pear/bin/install.sh b/livesupport/tools/pear/bin/install.sh index cb99c3b8e..262e07959 100755 --- a/livesupport/tools/pear/bin/install.sh +++ b/livesupport/tools/pear/bin/install.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ -# Version : $Revision: 1.7 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -41,7 +41,7 @@ etcdir=$basedir/etc srcdir=$basedir/src installdir=$basedir/../../.. -description="PEAR packages needed by LiveSupport" +package="PEAR packages needed by LiveSupport" packages4install=" Archive_Tar-1.3.1 @@ -60,18 +60,36 @@ XML_Beautifier-1.1 XML_Serializer-0.15.0 " +VERSION_Archive_Tar=Archive_Tar-1.3.1 +VERSION_Console_Getopt=Console_Getopt-1.2 +VERSION_XML_RPC=XML_RPC-1.3.0RC1 +VERSION_PEAR=PEAR-1.3.5 +VERSION_Calendar=Calendar-0.5.2 +VERSION_DB=DB-1.7.6 +VERSION_File=File-1.2.0 +VERSION_File_Find=File_Find-0.3.1 +VERSION_HTML_Common=HTML_Common-1.2.1 +VERSION_HTML_QuickForm=HTML_QuickForm-3.2.4pl1 +VERSION_XML_Util=XML_Util-1.1.1 +VERSION_XML_Parser=XML_Parser-1.2.6 +VERSION_XML_Beautifier=XML_Beautifier-1.1 +VERSION_XML_Serializer=XML_Serializer-0.15.0 + packages_required=" -DB +Archive_Tar +Console_Getopt +XML_RPC +PEAR Calendar +DB File File_Find HTML_Common HTML_QuickForm -XML_Beautifier -XML_Parser -XML_RPC -XML_Serializer XML_Util +XML_Parser +XML_Beautifier +XML_Serializer " #------------------------------------------------------------------------------- @@ -116,40 +134,29 @@ done #------------------------------------------------------------------------------- # Customize the configuration file with the appropriate values #------------------------------------------------------------------------------- -rootdir=`cd $installdir; pwd;` -destdir=$rootdir/usr/lib/php +destdir=`cd $installdir; pwd;` +peardir=$destdir/lib/pear configtemplate=$etcdir/pear.conf.template configfile=$destdir/etc/pear.conf -pearcmd="pear -c $configtemplate" +pearcmd="pear -c $configfile" -echo "Configuring $description" +echo "Configuring $package" echo " (with destdir: $destdir)" mkdir -p $destdir mkdir -p $destdir/etc -cp $configtemplate $configfile +cp -pP $configtemplate $configfile -$pearcmd config-set php_dir $destdir/php || exit 1 +$pearcmd config-set php_dir $peardir || exit 1 $pearcmd config-set bin_dir $destdir/bin || exit 1 -$pearcmd config-set doc_dir $destdir/php/docs || exit 1 -$pearcmd config-set data_dir $destdir/php/data || exit 1 -$pearcmd config-set cache_dir $destdir/php/cache || exit 1 -$pearcmd config-set test_dir $destdir/php/tests || exit 1 +$pearcmd config-set doc_dir $peardir/docs || exit 1 +$pearcmd config-set data_dir $peardir/data || exit 1 +$pearcmd config-set cache_dir $peardir/cache || exit 1 +$pearcmd config-set test_dir $peardir/tests || exit 1 #$pearcmd config-show; exit -#------------------------------------------------------------------------------- -# Install the packages -#------------------------------------------------------------------------------- -echo "Installing $description to directory:" -echo " $destdir" -cd $srcdir -for i in $packages4install -do echo -n " " - $pearcmd install $i.tgz -done - #------------------------------------------------------------------------------- # Function to check for a PEAR module # @@ -158,18 +165,41 @@ done #------------------------------------------------------------------------------- check_pear_module() { test_result=`$pearcmd info $1` -# test_result=`pear info $1` if [ $? = 0 ]; then -# echo "PEAR module $1 found..."; echo "OK" return 0; else -# echo "PEAR module $1 not found..."; echo "NOT found ..."; return 1; fi } +#------------------------------------------------------------------------------- +# Install the packages +#------------------------------------------------------------------------------- +echo "Installing $package to directory:" +echo " $destdir" +cd $srcdir + +for pkg in $packages_required +do echo -n " " + echo -n "$pkg " + eval "pkgv=\$VERSION_$pkg" + echo -n "($pkgv) " + check_pear_module $pkg || \ + { + echo -n "installing: $pkgv " + $pearcmd install $pkgv.tgz + check_pear_module $pkg || exit 1; + } +done +exit + +for i in $packages4install +do echo -n " " + $pearcmd install $i.tgz +done + #------------------------------------------------------------------------------- # Check PEAR packages # (because pear install returns exicode 1 even if package already exists) @@ -183,5 +213,5 @@ done #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- -echo "Install of $description finished OK." +echo "Install of $package finished OK." exit 0 diff --git a/livesupport/tools/pear/etc/Makefile.in b/livesupport/tools/pear/etc/Makefile.in new file mode 100644 index 000000000..9bf968fb1 --- /dev/null +++ b/livesupport/tools/pear/etc/Makefile.in @@ -0,0 +1,65 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +INSTALL_DIR = @prefix@ + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: + +install: + ./bin/install.sh -d ${INSTALL_DIR} + +clean: + +distclean: + + diff --git a/livesupport/tools/pear/etc/configure.ac b/livesupport/tools/pear/etc/configure.ac new file mode 100644 index 000000000..591a0e7f7 --- /dev/null +++ b/livesupport/tools/pear/etc/configure.ac @@ -0,0 +1,43 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(pear, 1.3.5, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/taglib/taglib-1.3.1/bin/autogen.sh b/livesupport/tools/taglib/taglib-1.3.1/bin/autogen.sh new file mode 100755 index 000000000..e26f803d4 --- /dev/null +++ b/livesupport/tools/taglib/taglib-1.3.1/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="taglib" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/taglib/taglib-1.3.1/bin/install-sh b/livesupport/tools/taglib/taglib-1.3.1/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/taglib/taglib-1.3.1/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/taglib/taglib-1.3.1/bin/prepare.sh b/livesupport/tools/taglib/taglib-1.3.1/bin/prepare.sh new file mode 100755 index 000000000..9eb315760 --- /dev/null +++ b/livesupport/tools/taglib/taglib-1.3.1/bin/prepare.sh @@ -0,0 +1,55 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/bin/prepare.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# Run this script to prepare taglib 1.3.1 to be configured and compiled. +# For more information on taglib, +# see http://freshmeat.net/redir/taglib/47265/url_homepage/taglib +#------------------------------------------------------------------------------- +product=taglib-1.3.1 + +reldir=`dirname $0`/.. +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + +tar=$basedir/src/$product.tar.gz + +mkdir -p ${tmpdir} + +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir + +cd ${tmpdir} +if [ ! -d $product ]; then + tar xfz ${tar} + cd $product + patch -p1 < $etcdir/taglib-1.3.1-length-in-microseconds.patch +fi + diff --git a/livesupport/tools/taglib/taglib-1.3.1/etc/Makefile.in b/livesupport/tools/taglib/taglib-1.3.1/etc/Makefile.in new file mode 100644 index 000000000..a76c9052a --- /dev/null +++ b/livesupport/tools/taglib/taglib-1.3.1/etc/Makefile.in @@ -0,0 +1,90 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +TAGLIB_VERSION = taglib-1.3.1 +TAGLIB_DIR = ${TMP_DIR}/${TAGLIB_VERSION} + +prefix = @prefix@ +# datadir will be defiend as ${prefix}/share, so we need to define ${prefix} +# above +docdir = @datadir@/doc/${TAGLIB_VERSION} + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + ${MAKE} -C ${TAGLIB_DIR} + # make the reference documentation and install that as well, as the + # autoconf thing doesn't :( + cd ${TAGLIB_DIR}/taglib-api && ${DOXYGEN} taglib.doxygen + touch ${TMP_DIR}/all.stamp + +install: all ${TMP_DIR}/install.stamp +${TMP_DIR}/install.stamp: + ${MAKE} -C ${TAGLIB_DIR} install + # make the reference documentation and install that as well, as the + # autoconf thing doesn't :( + ${MKDIR} ${docdir} + cp -pPR ${TAGLIB_DIR}/taglib-api/* ${docdir} + touch ${TMP_DIR}/install.stamp + +clean: + ${MAKE} -C ${TAGLIB_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RM} ${TMP_DIR}/*.stamp + ${RMDIR} ${TAGLIB_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + + diff --git a/livesupport/tools/taglib/taglib-1.3.1/etc/configure.ac b/livesupport/tools/taglib/taglib-1.3.1/etc/configure.ac new file mode 100644 index 000000000..347798f53 --- /dev/null +++ b/livesupport/tools/taglib/taglib-1.3.1/etc/configure.ac @@ -0,0 +1,54 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(taglib, 1.3.1, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/taglib-1.3.1.tar.gz) + + +dnl untar the sources before anything happens +../bin/prepare.sh + +cd ../tmp/taglib-1.3.1 +./configure --prefix=$prefix +cd - + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/autogen.sh b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/autogen.sh new file mode 100755 index 000000000..2b15f714a --- /dev/null +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/autogen.sh @@ -0,0 +1,101 @@ +#!/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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/autogen.sh,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) +#------------------------------------------------------------------------------- + +package="xmlrpc++" + +# assume we're in $basedir/bin +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../../usr; pwd;` + +bindir=$basedir/bin +etcdir=$basedir/etc +tmpdir=$basedir/tmp + +cd "$tmpdir" +DIE=0 + +(autoheader --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +echo "Generating configuration files for $package, please wait...." + +configure_ac=${etcdir}/configure.ac +configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 + +# copy over configure.ac and acinlclude.m4 from etc to tmp, +# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to +# look for configure.ac in the current directory, and include acinclude.m4 +# in aclocal.m4 it without a directory path in front +#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" +#echo " aclocal $ACLOCAL_FLAGS" +#cp -f ${configure_ac} ${tmpdir} +#cp -f ${etcdir}/acinclude.m4 ${tmpdir} +#aclocal $ACLOCAL_FLAGS + +#echo " autoheader ${configure_ac}" +#autoheader ${configure_ac} + +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib" + +${configure} "$@" && echo diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install-sh b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install-sh new file mode 100755 index 000000000..1a8353401 --- /dev/null +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/prepare.sh similarity index 66% rename from livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh rename to livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/prepare.sh index 4d0b10116..1c8474ed9 100755 --- a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/prepare.sh @@ -22,37 +22,35 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.7 $ -# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/Attic/install.sh,v $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/prepare.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Run this script to install cppunit into the development system usr -# environment. +# Run this script to prepare xmlrpc++ to be configured and compiled. +# For more information on xmlrpc++, see http://xmlrpcpp.sourceforge.net/ #------------------------------------------------------------------------------- product=xmlrpc++-20040713 reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -installdir=`cd $basedir/../../../usr; pwd;` -tmpdir=$basedir/tmp -etcdir=$basedir/etc +basedir=`cd ${reldir}; pwd;` +installdir=`cd ${basedir}/../../../usr; pwd;` +bindir=${basedir}/bin +etcdir=${basedir}/etc +tmpdir=${basedir}/tmp + tar=$basedir/src/$product.tar.gz -# the automake patch expects automake 1.4 -export WANT_AUTOMAKE=1.4 +mkdir -p ${tmpdir} -echo "installing $product from $basedir to $installdir" +# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it +cp -r $bindir/install-sh $tmpdir -mkdir -p $tmpdir -cd $tmpdir +cd ${tmpdir} +if [ ! -d xmlrpc++ ]; then + tar xfz ${tar} + cd xmlrpc++ + patch -p1 < $etcdir/xmlrpc++-automake.patch + patch -p1 < $etcdir/uninitialised_XmlRpcSource_ssl_ssl.patch + patch -p1 < $etcdir/incorrect_XmlRpcValue_struct_tm_conversion.patch +fi -tar xfz $tar -cd xmlrpc++ -patch -p1 < $etcdir/xmlrpc++-automake.patch -patch -p1 < $etcdir/uninitialised_XmlRpcSource_ssl_ssl.patch -patch -p1 < $etcdir/incorrect_XmlRpcValue_struct_tm_conversion.patch -sh autogen.sh --prefix=$installdir -make install - -cd $basedir -rm -rf tmp diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/Makefile.in b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/Makefile.in new file mode 100644 index 000000000..18e646642 --- /dev/null +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/Makefile.in @@ -0,0 +1,78 @@ +#------------------------------------------------------------------------------- +# 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: maroy $ +# Version : $Revision: 1.2 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/Makefile.in,v $ +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# General command definitions +#------------------------------------------------------------------------------- +MKDIR = mkdir -p +RM = rm -f +RMDIR = rm -rf +DOXYGEN = doxygen +DOXYTAG = doxytag +XSLTPROC = xsltproc +ECHO = @echo +FLAWFINDER = flawfinder + + +#------------------------------------------------------------------------------- +# Basic directory and file definitions +#------------------------------------------------------------------------------- +BASE_DIR = . +BIN_DIR = ${BASE_DIR}/bin +DOC_DIR = ${BASE_DIR}/doc +DOXYGEN_DIR = ${DOC_DIR}/doxygen +COVERAGE_DIR = ${DOC_DIR}/coverage +ETC_DIR = ${BASE_DIR}/etc +TMP_DIR = ${BASE_DIR}/tmp + +XMLRPCXX_VERSION = xmlrpc++-20040713 +XMLRPCXX_DIR = ${TMP_DIR}/xmlrpc++ + + +#------------------------------------------------------------------------------- +# Targets +#------------------------------------------------------------------------------- +all: ${TMP_DIR}/all.stamp +${TMP_DIR}/all.stamp: + ${MAKE} -C ${XMLRPCXX_DIR} + touch ${TMP_DIR}/all.stamp + +install: all ${TMP_DIR}/install.stamp +${TMP_DIR}/install.stamp: + ${MAKE} -C ${XMLRPCXX_DIR} install + touch ${TMP_DIR}/install.stamp + +clean: + ${MAKE} -C ${XMLRPCXX_DIR} clean + ${RM} ${TMP_DIR}/*.stamp + +distclean: + ${RMDIR} ${XMLRPCXX_DIR} + ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh + ${RM} ${TMP_DIR}/depcomp ${TMP_DIR}/ltmain.sh ${TMP_DIR}/missing + ${RM} ${TMP_DIR}/*.stamp + diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/configure.ac b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/configure.ac new file mode 100644 index 000000000..c7fe911e5 --- /dev/null +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/configure.ac @@ -0,0 +1,55 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl +dnl Author : $Author: maroy $ +dnl Version : $Revision: 1.2 $ +dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/configure.ac,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl NOTE: Run all configure related scripts from the tmp directory of the +dnl project. +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 it is being run from. We clearly don't want these in our base directory. +dnl----------------------------------------------------------------------------- +AC_INIT(xmlrpc++, 20040713, bugs@campware.org) +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) +AC_REVISION($Revision: 1.2 $) + +AC_CONFIG_SRCDIR(../src/xmlrpc++-20040713.tar.gz) + + +dnl untar the sources before anything happens +../bin/prepare.sh + +dnl generate autoconf environment +cd ../tmp/xmlrpc++ +sh autogen.sh --prefix=$prefix +cd - + + +AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) + +AC_OUTPUT() + diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/xmlrpc++-automake.patch b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/xmlrpc++-automake.patch index 128228237..14de32d39 100644 --- a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/xmlrpc++-automake.patch +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/etc/xmlrpc++-automake.patch @@ -161,8 +161,8 @@ diff -Naur xmlrpc++/autogen.sh xmlrpc++-automake/autogen.sh +autoheader +echo " libtoolize --automake" +libtoolize --automake -+echo " automake --add-missing $AUTOMAKE_FLAGS" -+automake --add-missing $AUTOMAKE_FLAGS ++echo " automake --add-missing --foreign $AUTOMAKE_FLAGS" ++automake --add-missing --foreign $AUTOMAKE_FLAGS +echo " autoconf" +autoconf +