diff --git a/tools/build-system/distributions/build-packages.sh b/tools/build-system/distributions/build-packages.sh
index a8f2d049d1c1e9f004cbf50c2ed3b0311cf5946e..166c162cc6a9aa93a83139a6210f0b341e3593a5 100755
--- a/tools/build-system/distributions/build-packages.sh
+++ b/tools/build-system/distributions/build-packages.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-29
-# Last Modified: 2009-05-29 15:18:56 -0400
+# Last Modified: 2009-05-29 17:42:50 -0400
#####################################################
. ./globals
@@ -53,7 +53,7 @@ fi
# decompress 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
echo " !! Cannot untar repository"
diff --git a/tools/build-system/distributions/globals b/tools/build-system/distributions/globals
index ceaf1d927745e8b1e30926d5735cb1b709f680dd..dab38b1c24e41adb9f15b986799703a1dfef988f 100644
--- a/tools/build-system/distributions/globals
+++ b/tools/build-system/distributions/globals
@@ -24,7 +24,8 @@ REPOSITORY_ARCHIVE="${BUILD_DIR}/sflphone.tar.gz"
REPOSITORY_DIR="${BUILD_DIR}/sflphone"
# target directories
-DIST_DIR="${PACKAGING_DIR}/dists"
+DEB_RESULT_DIR="${PACKAGING_DIR}/deb/dists"
+RPM_RESULT_DIR="${PACKAGING_DIR}/rpm"
# system information
ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
diff --git a/tools/build-system/distributions/opensuse/build-packages-opensuse.sh b/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
index 7960172fe89943d1b7dbb16c2c5cbbf92a56340f..5e4a20a66a477c049d20151d5181e66dc3a0c925 100755
--- a/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
+++ b/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
-# Last Modified: 2009-05-29 15:18:14 -0400
+# Last Modified: 2009-05-29 16:50:27 -0400
#####################################################
. ../globals
@@ -19,13 +19,15 @@ if [ "$?" -ne "0" ]; then
exit -1
fi
+echo "Do updates"
+#sudo /usr/bin/zypper -n update >/dev/null
+
# create build directories
echo "Create directories"
mkdir -p ${BUILD_DIR}/BUILD
-mkdir -p ${BUILD_DIR}/RPMS
+mkdir -p ${RPM_RESULT_DIR}
mkdir -p ${BUILD_DIR}/SOURCES
mkdir -p ${BUILD_DIR}/SPECS
-mkdir -p ${BUILD_DIR}/SRPMS
# create rpm macros
echo "Create RPM macros"
@@ -39,10 +41,10 @@ cat > ~/.rpmmacros << STOP
%_topdir ${BUILD_DIR}
%_builddir %{_topdir}/BUILD
-%_rpmdir %{_topdir}/RPMS
+%_rpmdir ${RPM_RESULT_DIR}
%_sourcedir %{_topdir}/SOURCES
%_specdir %{_topdir}/SPECS
-%_srcrpmdir %{_topdir}/SRPMS
+%_srcrpmdir ${RPM_RESULT_DIR}
STOP
# create packages
@@ -54,7 +56,7 @@ do
echo " -> create source archive"
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}
if [ "$?" -ne "0" ]; then
@@ -73,7 +75,7 @@ do
cd ${PACKAGING_DIR}
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
echo "!! Cannot update spec file"
diff --git a/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh b/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
index 8b8c85e457f728cfd227b87953c7ac992ac08625..ed92471607933a2bf23ae5e8dc2ee34ee9e161c9 100755
--- a/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
+++ b/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
@@ -34,7 +34,6 @@ echo "Do updates"
sudo apt-get update >/dev/null
sudo apt-get upgrade -y >/dev/null
-
for PACKAGE in ${PACKAGES[@]}
do
echo "Process ${PACKAGE}"
@@ -90,15 +89,15 @@ else
BINARY_DIR="binary-amd64"
fi
-mkdir -p ${DIST_DIR}/${DIST}/universe/source
-mkdir -p ${DIST_DIR}/${DIST}/universe/${BINARY_DIR}
+mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/source
+mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR}
-mv ${REPOSITORY_DIR}/sflphone*.deb ${DIST_DIR}/${DIST}/universe/${BINARY_DIR} && \
-mv ${REPOSITORY_DIR}/sflphone*.dsc ${DIST_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.build ${DIST_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.changes ${DIST_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.orig.tar.gz ${DIST_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.diff.gz ${DIST_DIR}/${DIST}/universe/source/
+mv ${REPOSITORY_DIR}/sflphone*.deb ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR} && \
+mv ${REPOSITORY_DIR}/sflphone*.dsc ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
+mv ${REPOSITORY_DIR}/sflphone*.build ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
+mv ${REPOSITORY_DIR}/sflphone*.changes ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
+mv ${REPOSITORY_DIR}/sflphone*.orig.tar.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
+mv ${REPOSITORY_DIR}/sflphone*.diff.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/
if [ "$?" -ne "0" ]; then
echo "!! Cannot copy dist files"
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index 1b79a17c359250a4ef31aec8c52c3a92353de45a..4a58006518146b7792a9bd5c84441ac9415a21af 100755
--- a/tools/build-system/launch-build-machine.sh
+++ b/tools/build-system/launch-build-machine.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-04-20
-# Last Modified: 2009-05-29 14:23:45 -0400
+# Last Modified: 2009-05-29 17:21:22 -0400
#####################################################
#
@@ -40,7 +40,6 @@ REMOTE_ROOT_DIR="/home/sflphone"
SCRIPTS_DIR="${ROOT_DIR}/build-system"
PACKAGING_SCRIPTS_DIR="${SCRIPTS_DIR}/remote"
DISTRIBUTION_SCRIPTS_DIR="${SCRIPTS_DIR}/distributions"
-BIN_DIR="${SCRIPTS_DIR}/bin"
# directory that will be deployed to remote machine
TODEPLOY_DIR="${ROOT_DIR}/sflphone-packaging"
@@ -78,7 +77,7 @@ export EDITOR
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")
#########################
# BEGIN
@@ -125,7 +124,7 @@ do
RELEASE_MODE=(${PARAMETER##*=});;
--list-machines)
echo "Available machines :"
- for MACHINE in ${MACHINES}; do
+ for MACHINE in ${MACHINES[@]}; do
echo " "${MACHINE}
done
exit 0;;
@@ -341,7 +340,8 @@ if [ ${DO_MAIN_LOOP} ]; then
fi
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}/
if [ "$?" -ne "0" ]; then
@@ -387,8 +387,8 @@ if [ ${DO_SIGNATURES} ]; then
fi
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} -name "*.changes" -printf "debsign -k'Savoir-Faire Linux Inc.' %p\n" | sh >/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}/deb/dists -name "*.changes" -printf "debsign -k'Savoir-Faire Linux Inc.' %p\n" | sh >/dev/null 2>&1
fi
#########################
@@ -410,7 +410,7 @@ if [ ${DO_UPLOAD} ]; then
echo "Upload packages"
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
echo " !! Cannot upload packages"
diff --git a/tools/build-system/send-emails.sh b/tools/build-system/send-emails.sh
index 065e9c691a071a48b0f10f5206972b9abf9ad49f..b0b2612cc86d29922086e67c3ff2eb425c5e4f43 100755
--- a/tools/build-system/send-emails.sh
+++ b/tools/build-system/send-emails.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-04-20
-# Last Modified:
+# Last Modified: 2009-05-29 18:09:44 -0400
#####################################################
TAG=`date +%Y-%m-%d`
@@ -28,12 +28,13 @@ MAIL_SUBJECT="[ ${TAG} ] SFLphone Automatic Build System : ${STATUS}"
if [ "$1" -eq 0 ]; then
echo | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
else
- (
- for i in ${PACKAGING_RESULT_DIR}/*.log
- do
- uuencode $i $(basename $i)
- done
- ) | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
+# (
+# for i in ${PACKAGING_RESULT_DIR}/*.log
+# do
+# uuencode $i $(basename $i)
+# done
+# )
+ echo | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
fi
exit 0