From 55647552a886d741d7d06a0331938e43a4f9ed28 Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Thu, 14 May 2009 18:00:04 -0400
Subject: [PATCH] [#1422] Fixed some issues with new changelog generation
script
---
tools/build-system/launch-build-machine.sh | 6 ++--
.../remote/build-package-ubuntu.sh | 35 ++++++++++---------
tools/build-system/sfl-git-dch.sh | 4 +--
3 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index adcf2320e8..30f47ec621 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-14 16:24:40 -0400
+# Last Modified: 2009-05-14 17:57:35 -0400
#####################################################
#
@@ -250,7 +250,7 @@ if [ ${DO_PREPARE} ]; then
fi
git commit -m "[#1262] Updated changelogs for version ${VERSION_COMMIT}" . >/dev/null
echo " Pushing commit"
-# git push origin master >/dev/null
+ git push origin master >/dev/null
# change back current branch if needed
if [ ${RELEASE_MODE} ]; then
@@ -260,7 +260,7 @@ if [ ${DO_PREPARE} ]; then
fi
echo "Archiving repository"
- tar czf ${REPOSITORY_ARCHIVE} -C `dirname ${REPOSITORY_DIR}` sflphone
+ tar czf ${REPOSITORY_ARCHIVE} --exclude .git -C `dirname ${REPOSITORY_DIR}` sflphone
if [ "$?" -ne "0" ]; then
echo " !! Cannot archive repository"
diff --git a/tools/build-system/remote/build-package-ubuntu.sh b/tools/build-system/remote/build-package-ubuntu.sh
index b16a3b5418..e975f6833e 100755
--- a/tools/build-system/remote/build-package-ubuntu.sh
+++ b/tools/build-system/remote/build-package-ubuntu.sh
@@ -66,8 +66,9 @@ echo "Switch to internal logging"
# get system parameters
ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
OS_VERSION=`lsb_release -d -s -c | sed -e '1d'`
-VER=`cd ${REPOSITORY_DIR} && git describe --tag HEAD | cut -d "/" -f2 | cut -d "-" -f1`
-FULL_VER=`cd ${REPOSITORY_DIR} && git describe --tag HEAD | cut -d "/" -f2 | cut -d "-" -f1-2`
+PACKAGE_SYSVER="0ubuntu1"
+VERSION=`cd ${REPOSITORY_DIR} && head -n 1 ./sflphone-client-gnome/debian/changelog | awk '{print $2}' | sed -e 's/(//g' -e 's/)//g' | cut -d "-" -f1`
+FULL_VERSION=`cd ${REPOSITORY_DIR} && head -n 1 ./sflphone-client-gnome/debian/changelog | awk '{print $2}' | sed -e 's/(//g' -e 's/)//g' -e 's/SYSVER/'${PACKAGE_SYSVER}'/g'`
# define log files
GLOBAL_LOG=${ROOT_DIR}/sflphone-${OS_VERSION}-${ARCH_FLAG}.log
@@ -80,7 +81,7 @@ exec 3<>${GLOBAL_LOG}
exec 1>&3
exec 2>&3
-echo "SFLPhone version is ${VER}"
+echo "SFLPhone version is ${VERSION}"
echo "Do updates"
sudo apt-get update >/dev/null
@@ -89,11 +90,11 @@ sudo apt-get upgrade -y >/dev/null
# generate the changelog, according to the distribution
echo "Generate changelogs"
sed -i 's/SYSTEM/'${OS_VERSION}'/g' ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/changelog && \
-sed -i 's/SYSVER/0ubuntu1/g' ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/changelog && \
+sed -i 's/SYSVER/'${PACKAGE_SYSVER}'/g' ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/changelog && \
# sed -i 's/SYSTEM/'${OS_VERSION}'/g' ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/changelog && \
- # sed -i 's/SYSVER/0ubuntu1/g' ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/changelog && \
+ # sed -i 's/SYSVER/'${PACKAGE_SYSVER}'/g' ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/changelog && \
sed -i 's/SYSTEM/'${OS_VERSION}'/g' ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/changelog && \
- sed -i 's/SYSVER/0ubuntu1/g' ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/changelog
+ sed -i 's/SYSVER/'${PACKAGE_SYSVER}'/g' ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/changelog
if [ "$?" -ne "0" ]; then
echo "!! Cannot generate changelogs"
@@ -114,16 +115,16 @@ fi
# provide prerequisite directories used by debuild
echo "Build sflphone packages on Ubuntu $OS_VERSION $ARCH_FLAG bit architecture...."
cp -r ${REPOSITORY_SFLPHONE_COMMON_DIR} ${BUILD_DIR}/sflphone-common && \
-cp -r ${REPOSITORY_SFLPHONE_COMMON_DIR} ${BUILD_DIR}/sflphone-common-$VER.orig && \
- # cp -r ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR} ${BUILD_DIR}/sflphone-client-kde-$VER.orig && \
- cp -r ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR} ${BUILD_DIR}/sflphone-client-gnome-$VER.orig && \
+cp -r ${REPOSITORY_SFLPHONE_COMMON_DIR} ${BUILD_DIR}/sflphone-common-${FULL_VERSION}.orig && \
+ # cp -r ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR} ${BUILD_DIR}/sflphone-client-kde-${FULL_VERSION}.orig && \
+ cp -r ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR} ${BUILD_DIR}/sflphone-client-gnome-${FULL_VERSION}.orig && \
# do a cp to because path must remain for client compilation
-mv ${REPOSITORY_SFLPHONE_COMMON_DIR} ${BUILD_DIR}/sflphone-common-$VER && \
- # mv ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR} ${BUILD_DIR}/sflphone-client-kde-$VER && \
- mv ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR} ${BUILD_DIR}/sflphone-client-gnome-$VER
+mv ${REPOSITORY_SFLPHONE_COMMON_DIR} ${BUILD_DIR}/sflphone-common-${FULL_VERSION} && \
+ # mv ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR} ${BUILD_DIR}/sflphone-client-kde-${FULL_VERSION} && \
+ mv ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR} ${BUILD_DIR}/sflphone-client-gnome-${FULL_VERSION}
# build package sflphone-common
-cd ${BUILD_DIR}/sflphone-common-$VER/debian && \
+cd ${BUILD_DIR}/sflphone-common-${FULL_VERSION}/debian && \
debuild -us -uc >${PACKAGING_LOG} 2>&1
if [ "$?" -ne "0" ]; then
@@ -132,8 +133,8 @@ if [ "$?" -ne "0" ]; then
fi
# build package sflphone-client-gnome
-cd ${BUILD_DIR}/sflphone-client-gnome-$VER/debian && \
-debuild -us -uc >${PACKAGING_LOG} 2>&1
+cd ${BUILD_DIR}/sflphone-client-gnome-${FULL_VERSION}/debian && \
+debuild -us -uc >>${PACKAGING_LOG} 2>&1
if [ "$?" -ne "0" ]; then
echo "!! Cannot generate package sflphone-client-gnome"
@@ -141,8 +142,8 @@ if [ "$?" -ne "0" ]; then
fi
# build package sflphone-client-kde
-# cd ${BUILD_DIR}/sflphone-client-kde-$VER/debian && \
-# debuild -us -uc >${PACKAGING_LOG} 2>&1
+# cd ${BUILD_DIR}/sflphone-client-kde-${FULL_VERSION}/debian && \
+# debuild -us -uc >>${PACKAGING_LOG} 2>&1
# if [ "$?" -ne "0" ]; then
# echo "!! Cannot generate package sflphone-client-kde"
diff --git a/tools/build-system/sfl-git-dch.sh b/tools/build-system/sfl-git-dch.sh
index 67bf9012ee..986da2bdaa 100755
--- a/tools/build-system/sfl-git-dch.sh
+++ b/tools/build-system/sfl-git-dch.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-13
-# Last Modified: 2009-05-14 16:24:44 -0400
+# Last Modified: 2009-05-14 17:22:48 -0400
#####################################################
# set -x
@@ -79,7 +79,7 @@ then
SOFTWARE_VERSION_APPEND="~${RELEASE_MODE}"
fi
else
- SOFTWARE_VERSION_APPEND="~snapshot-${SNAPSHOT_TAG}"
+ SOFTWARE_VERSION_APPEND="~snapshot${SNAPSHOT_TAG}"
fi
--
GitLab