Skip to content
Snippets Groups Projects
Commit c72a8264 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'jbonjean'

parents 6eae8696 c7d0eb90
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 471 additions and 53 deletions
sflphone-common/libs/pjproject-1.0.1/autogen.sh
+ 5
− 1
View file @ c72a8264
...@@ -7,13 +7,17 @@ ...@@ -7,13 +7,17 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-05-26 # Creation Date: 2009-05-26
# Last Modified: 2009-05-27 11:00:20 -0400 # Last Modified: 2009-06-01 18:25:28 -0400
##################################################### #####################################################
if [ -e /usr/share/misc/config.guess ]; then if [ -e /usr/share/misc/config.guess ]; then
rm -f config.sub config.guess rm -f config.sub config.guess
ln -s /usr/share/misc/config.sub . ln -s /usr/share/misc/config.sub .
ln -s /usr/share/misc/config.guess . ln -s /usr/share/misc/config.guess .
elif [ -e /usr/lib/rpm/config.guess ]; then
rm -f config.sub config.guess
ln -s /usr/lib/rpm/config.sub .
ln -s /usr/lib/rpm/config.guess .
else else
aclocal --force aclocal --force
automake --add-missing --force-missing --copy automake --add-missing --force-missing --copy
......
tools/build-system/distributions/build-packages.sh
+ 10
− 2
View file @ c72a8264
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-05-29 # Creation Date: 2009-05-29
# Last Modified: 2009-05-29 15:18:56 -0400 # Last Modified: 2009-06-01 17:27:25 -0400
##################################################### #####################################################
. ./globals . ./globals
...@@ -53,7 +53,7 @@ fi ...@@ -53,7 +53,7 @@ fi
# decompress repository # decompress repository
echo "Untar repository" echo "Untar repository"
cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE} cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE} >/dev/null 2>&1
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo " !! Cannot untar repository" echo " !! Cannot untar repository"
...@@ -69,6 +69,14 @@ elif [ "${DISTRIBUTION}" = "opensuse" ]; then ...@@ -69,6 +69,14 @@ elif [ "${DISTRIBUTION}" = "opensuse" ]; then
echo "Launch packaging for openSUSE 11" echo "Launch packaging for openSUSE 11"
cd ${OPENSUSE_DIR} && ./build-packages-opensuse.sh $* cd ${OPENSUSE_DIR} && ./build-packages-opensuse.sh $*
elif [ "${DISTRIBUTION}" = "mandriva" ]; then
echo "Launch packaging for Mandriva 2009.1"
cd ${MANDRIVA_DIR} && ./build-packages-mandriva.sh $*
elif [ "${DISTRIBUTION}" = "fedora" ]; then
echo "Launch packaging for Fedora 11"
cd ${FEDORA_DIR} && ./build-packages-fedora.sh $*
else else
echo "!! Cannot detect distribution" echo "!! Cannot detect distribution"
exit -1 exit -1
......
tools/build-system/distributions/globals
+ 4
− 1
View file @ c72a8264
...@@ -17,6 +17,8 @@ PACKAGING_DIR="${ROOT_DIR}/sflphone-packaging" ...@@ -17,6 +17,8 @@ PACKAGING_DIR="${ROOT_DIR}/sflphone-packaging"
# distributions # distributions
UBUNTU_DIR="${PACKAGING_DIR}/ubuntu" UBUNTU_DIR="${PACKAGING_DIR}/ubuntu"
OPENSUSE_DIR="${PACKAGING_DIR}/opensuse" OPENSUSE_DIR="${PACKAGING_DIR}/opensuse"
MANDRIVA_DIR="${PACKAGING_DIR}/mandriva"
FEDORA_DIR="${PACKAGING_DIR}/fedora"
# where packaging will be donne # where packaging will be donne
BUILD_DIR="${PACKAGING_DIR}/build" BUILD_DIR="${PACKAGING_DIR}/build"
...@@ -24,7 +26,8 @@ REPOSITORY_ARCHIVE="${BUILD_DIR}/sflphone.tar.gz" ...@@ -24,7 +26,8 @@ REPOSITORY_ARCHIVE="${BUILD_DIR}/sflphone.tar.gz"
REPOSITORY_DIR="${BUILD_DIR}/sflphone" REPOSITORY_DIR="${BUILD_DIR}/sflphone"
# target directories # target directories
DIST_DIR="${PACKAGING_DIR}/dists" DEB_RESULT_DIR="${PACKAGING_DIR}/deb/dists"
RPM_RESULT_DIR="${PACKAGING_DIR}/rpm"
# system information # system information
ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'` ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
......
tools/build-system/distributions/mandriva/build-packages-mandriva.sh 0 → 100755
+ 94
− 0
View file @ c72a8264
#!/bin/bash
#####################################################
# File Name: build-packages-opensuse.sh
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
# Last Modified: 2009-06-01 17:24:52 -0400
#####################################################
. ../globals
cd ${MANDRIVA_DIR}
if [ "$?" -ne "0" ]; then
echo " !! Cannot cd to Mandriva directory"
exit -1
fi
echo "Do updates"
sudo /usr/sbin/urpmi --auto-update --auto >/dev/null
# create build directories
echo "Create directories"
mkdir -p ${BUILD_DIR}/BUILD
mkdir -p ${RPM_RESULT_DIR}
mkdir -p ${BUILD_DIR}/SOURCES
mkdir -p ${BUILD_DIR}/SPECS
# create rpm macros
echo "Create RPM macros"
cat > ~/.rpmmacros << STOP
%packager Julien Bonjean (julien.bonjean@savoirfairelinux.com)
%distribution Savoir-faire Linux
%vendor Savoir-faire Linux
%_signature gpg
%_gpg_name Julien Bonjean
%_topdir ${BUILD_DIR}
%_builddir %{_topdir}/BUILD
%_rpmdir ${RPM_RESULT_DIR}
%_sourcedir %{_topdir}/SOURCES
%_specdir %{_topdir}/SPECS
%_srcrpmdir ${RPM_RESULT_DIR}
STOP
# create packages
for PACKAGE in ${PACKAGES[@]}
do
echo "Prepare ${PACKAGE}"
cd ${REPOSITORY_DIR}
echo " -> create source archive"
mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \
tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} >/dev/null && \
mv ${PACKAGE}-${VERSION} ${PACKAGE}
if [ "$?" -ne "0" ]; then
echo "!! Cannot create source archive"
exit -1
fi
echo " -> move archive to source directory"
mv ${PACKAGE}.tar.gz ${BUILD_DIR}/SOURCES
if [ "$?" -ne "0" ]; then
echo "!! Cannot move archive"
exit -1
fi
cd ${PACKAGING_DIR}
echo " -> update spec file"
sed "s/VERSION/${VERSION}/g" opensuse/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
if [ "$?" -ne "0" ]; then
echo "!! Cannot update spec file"
exit -1
fi
done
# launch build
echo "Launch build"
rpmbuild -ba ${BUILD_DIR}/SPECS/*.spec
if [ "$?" -ne "0" ]; then
echo "!! Cannot build packages"
exit -1
fi
tools/build-system/distributions/mandriva/sflphone-client-gnome.spec 0 → 100644
+ 74
− 0
View file @ c72a8264
#####################################################
# File Name: sflphone-client-gnome.spec
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
# Last Modified: 2009-05-27 17:23:32 -0400
#####################################################
Name: sflphone-client-gnome
License: GNU General Public License (GPL)
Group: Productivity/Networking/System
Summary: GNOME client for SFLphone
Version: VERSION
Release: mandriva
URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
BuildRoot: %{_tmppath}/%{name}-%{version}
Source0: sflphone-client-gnome.tar.gz
BuildRequires: gtk2-devel
BuildRequires: libnotify-devel
BuildRequires: libsexy-devel
BuildRequires: evolution-data-server-devel
BuildRequires: check-devel
BuildRequires: libdbus-glib-devel
BuildRequires: log4c-devel
Requires: sflphone-common = %{version}
Requires: dbus-1-glib
Requires: gtk2
Requires: glib2
Requires: dbus-1-glib
Requires: libnotify
Requires: librsvg
Requires: log4c
Requires: libsexy
Conflicts: sflphone
Prefix: %{_prefix}
%description
Provide a GNOME client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Authors:
--------
Julien Bonjean <julien.bonjean@savoirfairelinux.com>
%lang_package
%prep
%setup -q
%build
./autogen.sh --prefix=%{_prefix}
make -j
%install
make prefix=%{buildroot}/%{_prefix} install
%clean
make clean
%files
%defattr(-, root, root)
%{_prefix}/*
%doc AUTHORS COPYING README
%changelog
tools/build-system/distributions/mandriva/sflphone-client-kde.spec 0 → 100644
+ 67
− 0
View file @ c72a8264
#####################################################
# File Name: sflphone-client-kde.spec
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
# Last Modified: 2009-05-27 17:23:32 -0400
#####################################################
Name: sflphone-client-kde
License: GNU General Public License (GPL)
Group: Productivity/Networking/System
Summary: KDE client for SFLphone
Version: VERSION
Release: mandriva
URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
BuildRoot: %{_tmppath}/%{name}-%{version}
Source0: sflphone-client-kde.tar.gz
Requires: sflphone-common = %{version}
Requires: commoncpp2
Requires: libkdepimlibs4
Requires: libqt4-dbus-1
Requires: libqt4-svg
Requires: libqt4-x11
BuildRequires: cmake
BuildRequires: libcommoncpp-devel
BuildRequires: kdepimlibs4-devel
Conflicts: sflphone
Prefix: %{_prefix}
%description
Provide a KDE client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Authors:
--------
Julien Bonjean <julien.bonjean@savoirfairelinux.com>
%lang_package
%prep
%setup -q
%build
cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
make -j
%install
make install
%clean
make clean
%files
%defattr(-, root, root)
%{_prefix}/*
%doc AUTHORS COPYING README
%changelog
tools/build-system/distributions/mandriva/sflphone-common.spec 0 → 100644
+ 89
− 0
View file @ c72a8264
#####################################################
# File Name: sflphone-common.spec
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
# Last Modified: 2009-05-27 17:23:32 -0400
#####################################################
Name: sflphone-common
License: GNU General Public License (GPL)
Group: System Environment/Daemons
Summary: SIP and IAX2 compatible softphone - Core
Version: VERSION
Release: mandriva
URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
BuildRoot: %{_tmppath}/%{name}-%{version}
Source0: sflphone-common.tar.gz
BuildRequires: glibc-devel
BuildRequires: libccrtp-devel
BuildRequires: libsamplerate-devel
BuildRequires: dbus-1-devel
BuildRequires: libexpat-devel
BuildRequires: libgsm-devel
BuildRequires: speex-devel
BuildRequires: libcppunit-devel
BuildRequires: libcommoncpp-devel
BuildRequires: libalsa2-devel
BuildRequires: libpulseaudio-devel
BuildRequires: libext2fs-devel
Requires: libsamplerate
Requires: libexpat1
Requires: commoncpp2
Requires: libgsm1
Requires: libspeex
Requires: dbus-1
Requires: libasound2
Requires: libpulse0
Requires: libccrtp1
Conflicts: sflphone
Prefix: %{_prefix}
%description
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Authors:
--------
Julien Bonjean <julien.bonjean@savoirfairelinux.com>
%prep
%setup -q
%build
cd libs/pjproject-1.0.1
./autogen.sh --prefix=%{_prefix}
make dep
make clean
make
cd -
./autogen.sh --prefix=%{_prefix}
make -j
%install
cd libs/pjproject-1.0.1
make prefix=%{buildroot}/%{_prefix} install
cd -
make prefix=%{buildroot}/%{_prefix} install
%clean
cd libs/pjproject-1.0.1
make clean
cd -
make clean
%files
%defattr(-, root, root)
%{_prefix}/*
%exclude %{_prefix}/include
%doc AUTHORS COPYING README TODO
%changelog
tools/build-system/distributions/opensuse/build-packages-opensuse.sh
+ 9
− 7
View file @ c72a8264
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-05-27 # Creation Date: 2009-05-27
# Last Modified: 2009-05-29 15:18:14 -0400 # Last Modified: 2009-05-29 18:11:44 -0400
##################################################### #####################################################
. ../globals . ../globals
...@@ -19,13 +19,15 @@ if [ "$?" -ne "0" ]; then ...@@ -19,13 +19,15 @@ if [ "$?" -ne "0" ]; then
exit -1 exit -1
fi fi
echo "Do updates"
sudo /usr/bin/zypper -n update >/dev/null
# create build directories # create build directories
echo "Create directories" echo "Create directories"
mkdir -p ${BUILD_DIR}/BUILD mkdir -p ${BUILD_DIR}/BUILD
mkdir -p ${BUILD_DIR}/RPMS mkdir -p ${RPM_RESULT_DIR}
mkdir -p ${BUILD_DIR}/SOURCES mkdir -p ${BUILD_DIR}/SOURCES
mkdir -p ${BUILD_DIR}/SPECS mkdir -p ${BUILD_DIR}/SPECS
mkdir -p ${BUILD_DIR}/SRPMS
# create rpm macros # create rpm macros
echo "Create RPM macros" echo "Create RPM macros"
...@@ -39,10 +41,10 @@ cat > ~/.rpmmacros << STOP ...@@ -39,10 +41,10 @@ cat > ~/.rpmmacros << STOP
%_topdir ${BUILD_DIR} %_topdir ${BUILD_DIR}
%_builddir %{_topdir}/BUILD %_builddir %{_topdir}/BUILD
%_rpmdir %{_topdir}/RPMS %_rpmdir ${RPM_RESULT_DIR}
%_sourcedir %{_topdir}/SOURCES %_sourcedir %{_topdir}/SOURCES
%_specdir %{_topdir}/SPECS %_specdir %{_topdir}/SPECS
%_srcrpmdir %{_topdir}/SRPMS %_srcrpmdir ${RPM_RESULT_DIR}
STOP STOP
# create packages # create packages
...@@ -54,7 +56,7 @@ do ...@@ -54,7 +56,7 @@ do
echo " -> create source archive" echo " -> create source archive"
mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \ mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \
tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} && \ tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} >/dev/null && \
mv ${PACKAGE}-${VERSION} ${PACKAGE} mv ${PACKAGE}-${VERSION} ${PACKAGE}
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
...@@ -73,7 +75,7 @@ do ...@@ -73,7 +75,7 @@ do
cd ${PACKAGING_DIR} cd ${PACKAGING_DIR}
echo " -> update spec file" echo " -> update spec file"
sed "s/VERSION/${VERSION}/g" ${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec sed "s/VERSION/${VERSION}/g" opensuse/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo "!! Cannot update spec file" echo "!! Cannot update spec file"
......
tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
+ 1
− 0
View file @ c72a8264
...@@ -27,6 +27,7 @@ BuildRequires: dbus-1-glib-devel ...@@ -27,6 +27,7 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libsexy-devel BuildRequires: libsexy-devel
BuildRequires: evolution-data-server-devel BuildRequires: evolution-data-server-devel
BuildRequires: check-devel
Requires: sflphone-common = %{version} Requires: sflphone-common = %{version}
Requires: dbus-1-glib Requires: dbus-1-glib
Requires: gtk2 Requires: gtk2
......
tools/build-system/distributions/opensuse/sflphone-client-kde.spec 0 → 100644
+ 67
− 0
View file @ c72a8264
#####################################################
# File Name: sflphone-client-kde.spec
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
# Last Modified: 2009-05-27 17:23:32 -0400
#####################################################
Name: sflphone-client-kde
License: GNU General Public License (GPL)
Group: Productivity/Networking/System
Summary: KDE client for SFLphone
Version: VERSION
Release: opensuse
URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
BuildRoot: %{_tmppath}/%{name}-%{version}
Source0: sflphone-client-kde.tar.gz
Requires: sflphone-common = %{version}
Requires: commoncpp2
Requires: libkdepimlibs4
Requires: libqt4-dbus-1
Requires: libqt4-svg
Requires: libqt4-x11
BuildRequires: cmake
BuildRequires: libkdepimlibs4-devel
BuildRequires: commoncpp2-devel
Conflicts: sflphone
Prefix: %{_prefix}
%description
Provide a KDE client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Authors:
--------
Julien Bonjean <julien.bonjean@savoirfairelinux.com>
%lang_package
%prep
%setup -q
%build
cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
make -j
%install
make install
%clean
make clean
%files
%defattr(-, root, root)
%{_prefix}/*
%doc AUTHORS COPYING README
%changelog
tools/build-system/distributions/opensuse/sflphone-common.spec
+ 1
− 0
View file @ c72a8264
...@@ -31,6 +31,7 @@ BuildRequires: libgsm-devel ...@@ -31,6 +31,7 @@ BuildRequires: libgsm-devel
BuildRequires: speex-devel BuildRequires: speex-devel
BuildRequires: libcppunit-devel BuildRequires: libcppunit-devel
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: libuuid-devel
Requires: libsamplerate Requires: libsamplerate
Requires: libexpat1 Requires: libexpat1
Requires: commoncpp2 Requires: commoncpp2
......
tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
+ 8
− 9
View file @ c72a8264
...@@ -34,7 +34,6 @@ echo "Do updates" ...@@ -34,7 +34,6 @@ echo "Do updates"
sudo apt-get update >/dev/null sudo apt-get update >/dev/null
sudo apt-get upgrade -y >/dev/null sudo apt-get upgrade -y >/dev/null
for PACKAGE in ${PACKAGES[@]} for PACKAGE in ${PACKAGES[@]}
do do
echo "Process ${PACKAGE}" echo "Process ${PACKAGE}"
...@@ -90,15 +89,15 @@ else ...@@ -90,15 +89,15 @@ else
BINARY_DIR="binary-amd64" BINARY_DIR="binary-amd64"
fi fi
mkdir -p ${DIST_DIR}/${DIST}/universe/source mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/source
mkdir -p ${DIST_DIR}/${DIST}/universe/${BINARY_DIR} mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR}
mv ${REPOSITORY_DIR}/sflphone*.deb ${DIST_DIR}/${DIST}/universe/${BINARY_DIR} && \ mv ${REPOSITORY_DIR}/sflphone*.deb ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR} && \
mv ${REPOSITORY_DIR}/sflphone*.dsc ${DIST_DIR}/${DIST}/universe/source/ && \ mv ${REPOSITORY_DIR}/sflphone*.dsc ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
mv ${REPOSITORY_DIR}/sflphone*.build ${DIST_DIR}/${DIST}/universe/source/ && \ mv ${REPOSITORY_DIR}/sflphone*.build ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
mv ${REPOSITORY_DIR}/sflphone*.changes ${DIST_DIR}/${DIST}/universe/source/ && \ mv ${REPOSITORY_DIR}/sflphone*.changes ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
mv ${REPOSITORY_DIR}/sflphone*.orig.tar.gz ${DIST_DIR}/${DIST}/universe/source/ && \ mv ${REPOSITORY_DIR}/sflphone*.orig.tar.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
mv ${REPOSITORY_DIR}/sflphone*.diff.gz ${DIST_DIR}/${DIST}/universe/source/ mv ${REPOSITORY_DIR}/sflphone*.diff.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo "!! Cannot copy dist files" echo "!! Cannot copy dist files"
......
tools/build-system/launch-build-machine.sh
+ 34
− 26
View file @ c72a8264
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-04-20 # Creation Date: 2009-04-20
# Last Modified: 2009-05-29 14:23:45 -0400 # Last Modified: 2009-06-01 19:11:22 -0400
##################################################### #####################################################
# #
...@@ -40,7 +40,6 @@ REMOTE_ROOT_DIR="/home/sflphone" ...@@ -40,7 +40,6 @@ REMOTE_ROOT_DIR="/home/sflphone"
SCRIPTS_DIR="${ROOT_DIR}/build-system" SCRIPTS_DIR="${ROOT_DIR}/build-system"
PACKAGING_SCRIPTS_DIR="${SCRIPTS_DIR}/remote" PACKAGING_SCRIPTS_DIR="${SCRIPTS_DIR}/remote"
DISTRIBUTION_SCRIPTS_DIR="${SCRIPTS_DIR}/distributions" DISTRIBUTION_SCRIPTS_DIR="${SCRIPTS_DIR}/distributions"
BIN_DIR="${SCRIPTS_DIR}/bin"
# directory that will be deployed to remote machine # directory that will be deployed to remote machine
TODEPLOY_DIR="${ROOT_DIR}/sflphone-packaging" TODEPLOY_DIR="${ROOT_DIR}/sflphone-packaging"
...@@ -78,7 +77,7 @@ export EDITOR ...@@ -78,7 +77,7 @@ export EDITOR
NON_FATAL_ERRORS="" NON_FATAL_ERRORS=""
MACHINES=( "ubuntu-8.04" "ubuntu-8.04-64" "ubuntu-8.10" "ubuntu-8.10-64" "ubuntu-9.04" "ubuntu-9.04-64" ) MACHINES=( "ubuntu-8.04" "ubuntu-8.04-64" "ubuntu-8.10" "ubuntu-8.10-64" "ubuntu-9.04" "ubuntu-9.04-64" "opensuse-11" "opensuse-11-64" "mandriva-2009.1" )
######################### #########################
# BEGIN # BEGIN
...@@ -125,7 +124,7 @@ do ...@@ -125,7 +124,7 @@ do
RELEASE_MODE=(${PARAMETER##*=});; RELEASE_MODE=(${PARAMETER##*=});;
--list-machines) --list-machines)
echo "Available machines :" echo "Available machines :"
for MACHINE in ${MACHINES}; do for MACHINE in ${MACHINES[@]}; do
echo " "${MACHINE} echo " "${MACHINE}
done done
exit 0;; exit 0;;
...@@ -308,6 +307,7 @@ if [ ${DO_MAIN_LOOP} ]; then ...@@ -308,6 +307,7 @@ if [ ${DO_MAIN_LOOP} ]; then
echo "Entering main loop" echo "Entering main loop"
echo echo
rm -f ${PACKAGING_RESULT_DIR}/stats.log
for MACHINE in ${MACHINES[*]} for MACHINE in ${MACHINES[*]}
do do
...@@ -317,6 +317,9 @@ if [ ${DO_MAIN_LOOP} ]; then ...@@ -317,6 +317,9 @@ if [ ${DO_MAIN_LOOP} ]; then
echo "Not needed, already running" echo "Not needed, already running"
else else
cd ${VBOX_USER_HOME} && VBoxHeadless -startvm "${MACHINE}" -p 50000 & cd ${VBOX_USER_HOME} && VBoxHeadless -startvm "${MACHINE}" -p 50000 &
if [[ ${MACHINE} =~ "opensuse" ]]; then
STARTUP_WAIT=200
fi
echo "Wait ${STARTUP_WAIT} s" echo "Wait ${STARTUP_WAIT} s"
sleep ${STARTUP_WAIT} sleep ${STARTUP_WAIT}
fi fi
...@@ -329,24 +332,29 @@ if [ ${DO_MAIN_LOOP} ]; then ...@@ -329,24 +332,29 @@ if [ ${DO_MAIN_LOOP} ]; then
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo " !! Cannot deploy packaging system" echo " !! Cannot deploy packaging system"
NON_FATAL_ERRORS="${NON_FATAL_ERRORS} !! Error when packaging for ${MACHINE}\n" echo "${MACHINE} : Cannot deploy packaging system" >> ${PACKAGING_RESULT_DIR}/stats.log
fi else
echo "Launch remote build" echo "Launch remote build"
${SSH_BASE} "cd ${REMOTE_DEPLOY_DIR} && ./build-packages.sh ${RELEASE_MODE}" ${SSH_BASE} "cd ${REMOTE_DEPLOY_DIR} && ./build-packages.sh ${RELEASE_MODE}"
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo " !! Error during remote packaging process" echo " !! Error during remote packaging process"
NON_FATAL_ERRORS="${NON_FATAL_ERRORS} !! Error when packaging for ${MACHINE}\n" echo "${MACHINE} : Error during remote packaging process" >> ${PACKAGING_RESULT_DIR}/stats.log
fi else
echo "Retrieve dists and log files (current tag is ${TAG})" echo "Retrieve dists and log files (current tag is ${TAG})"
${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}/dists ${PACKAGING_RESULT_DIR}/ ${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}/deb ${PACKAGING_RESULT_DIR}/ >/dev/null 2>&1
${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}/rpm ${PACKAGING_RESULT_DIR}/ >/dev/null 2>&1
${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}"/*.log" ${PACKAGING_RESULT_DIR}/ ${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}"/*.log" ${PACKAGING_RESULT_DIR}/
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo " !! Cannot retrieve remote files" echo " !! Cannot retrieve remote files"
NON_FATAL_ERRORS="${NON_FATAL_ERRORS} !! Error when packaging for ${MACHINE}\n" echo "${MACHINE} : Cannot retrieve remote files" >> ${PACKAGING_RESULT_DIR}/stats.log
else
echo "${MACHINE} : OK" >> ${PACKAGING_RESULT_DIR}/stats.log
fi
fi
fi fi
if [ "${VM_STATE}" = "running" ]; then if [ "${VM_STATE}" = "running" ]; then
...@@ -387,8 +395,8 @@ if [ ${DO_SIGNATURES} ]; then ...@@ -387,8 +395,8 @@ if [ ${DO_SIGNATURES} ]; then
fi fi
echo "Sign packages" echo "Sign packages"
find ${PACKAGING_RESULT_DIR} -name "*.deb" -exec dpkg-sig -k 'Savoir-Faire Linux Inc.' --sign builder --sign-changes full {} \; >/dev/null 2>&1 find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.deb" -exec dpkg-sig -k 'Savoir-Faire Linux Inc.' --sign builder --sign-changes full {} \; >/dev/null 2>&1
find ${PACKAGING_RESULT_DIR} -name "*.changes" -printf "debsign -k'Savoir-Faire Linux Inc.' %p\n" | sh >/dev/null 2>&1 find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.changes" -printf "debsign -k'Savoir-Faire Linux Inc.' %p\n" | sh >/dev/null 2>&1
fi fi
######################### #########################
...@@ -410,7 +418,7 @@ if [ ${DO_UPLOAD} ]; then ...@@ -410,7 +418,7 @@ if [ ${DO_UPLOAD} ]; then
echo "Upload packages" echo "Upload packages"
echo "Install dists files to repository" echo "Install dists files to repository"
scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/dists ${SSH_REPOSITORY_HOST}: scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/deb/dists ${SSH_REPOSITORY_HOST}:
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo " !! Cannot upload packages" echo " !! Cannot upload packages"
......
tools/build-system/send-emails.sh
+ 8
− 7
View file @ c72a8264
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-04-20 # Creation Date: 2009-04-20
# Last Modified: # Last Modified: 2009-06-01 18:11:20 -0400
##################################################### #####################################################
TAG=`date +%Y-%m-%d` TAG=`date +%Y-%m-%d`
...@@ -28,12 +28,13 @@ MAIL_SUBJECT="[ ${TAG} ] SFLphone Automatic Build System : ${STATUS}" ...@@ -28,12 +28,13 @@ MAIL_SUBJECT="[ ${TAG} ] SFLphone Automatic Build System : ${STATUS}"
if [ "$1" -eq 0 ]; then if [ "$1" -eq 0 ]; then
echo | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com echo | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
else else
( # (
for i in ${PACKAGING_RESULT_DIR}/*.log # for i in ${PACKAGING_RESULT_DIR}/*.log
do # do
uuencode $i $(basename $i) # uuencode $i $(basename $i)
done # done
) | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com # )
cat ${PACKAGING_RESULT_DIR}/stats.log | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
fi fi
exit 0 exit 0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment