Merge branch 'jbonjean'

tools/build-system/launch-build-machine-2.sh

@@ -10,6 +10,8 @@
 # Last Modified: 2009-10-21 18:18:07 -0400
 #####################################################
 
+#set -x
+
 # home directory
 ROOT_DIR=${HOME}
 
@@ -83,6 +85,8 @@ fi
 # logging
 if [ ${DO_LOGGING} ]; then
 
+	rm -f ${ROOT_DIR}/packaging.log >/dev/null 2>&1	
+
 	# open file descriptor
 	exec 3<> ${ROOT_DIR}/packaging.log
 
@@ -101,16 +105,17 @@ fi
 # COMMON PART
 #########################
 
+cd ${REFERENCE_REPOSITORY}
+
 echo "Update reference sources"
 if [ ${IS_RELEASE} ]; then
-        cd ${REFERENCE_REPOSITORY} && git checkout . && git checkout -f release && git pull
+        git checkout . && git checkout -f release && git pull
 else
-        cd ${REFERENCE_REPOSITORY} && git checkout . && git checkout -f master && git pull
+        git checkout . && git checkout -f master && git pull
 fi
 
 echo "Retrieve build info"
 # retrieve info we may need
-cd ${REFERENCE_REPOSITORY}
 CURRENT_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 1`
 PREVIOUS_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 2 | sed -n '1p;1q'`
 CURRENT_RELEASE_COMMIT_HASH=`git show --pretty=format:"%H" -s ${CURRENT_RELEASE_TAG_NAME} | tail -n 1`
@@ -120,6 +125,7 @@ CURRENT_RELEASE_TYPE=${CURRENT_RELEASE_TAG_NAME##*.}
 PREVIOUS_RELEASE_TYPE=${PREVIOUS_RELEASE_TAG_NAME##*.}
 CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME%*.*}
 PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%*.*}
+
 cd ${LAUNCHPAD_DIR}
 
 COMMIT_HASH_BEGIN=""
@@ -127,9 +133,6 @@ COMMIT_HASH_END=""
 SOFTWARE_VERSION=""
 LAUNCHPAD_CONF_PREFIX=""
 
-echo "Clean build directory"
-git clean -f -x ${LAUNCHPAD_DIR}/* >/dev/null
-
 if [ ${IS_RELEASE} ]; then
 	VERSION_APPEND=""
 	if [ "${CURRENT_RELEASE_TYPE}" != "stable" ] ; then
@@ -144,10 +147,11 @@ else
 	LAUNCHPAD_CONF_PREFIX="sflphone-nightly"
 fi
 
-cd ${LAUNCHPAD_DIR}
-
 VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~SYSTEM"
 
+echo "Clean build directory"
+git clean -f -x ${LAUNCHPAD_DIR}/* >/dev/null
+
 for LAUNCHPAD_PACKAGE in ${LAUNCHPAD_PACKAGES[*]}
 do
 	echo " Package: ${LAUNCHPAD_PACKAGE}"	
@@ -155,18 +159,21 @@ do
 	echo "  --> Clean old sources"
 	git clean -f -x ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/* >/dev/null
 
-	echo "  --> Retrieve new sources"
-	cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_DIR}/ 
-
 	DEBIAN_DIR="${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian"
 
 	echo "  --> Clean debian directory"
 	git checkout ${DEBIAN_DIR} 
 
+	echo "  --> Retrieve new sources"
+	cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_DIR}/ 
+
+	echo "  --> Update software version number (${SOFTWARE_VERSION})"
+	echo "${SOFTWARE_VERSION}" > ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/VERSION
+
 	echo "  --> Update debian changelog"
 
 cat << END > ${WORKING_DIR}/sfl-git-dch.conf
-WORKING_DIR="${WORKING_DIR}"
+WORKING_DIR="${REFERENCE_REPOSITORY}"
 SOFTWARE="${LAUNCHPAD_PACKAGE}"
 VERSION="${VERSION}"
 DISTRIBUTION="SYSTEM"
@@ -174,8 +181,8 @@ CHANGELOG_FILE="${DEBIAN_DIR}/changelog"
 COMMIT_HASH_BEGIN="${COMMIT_HASH_BEGIN}"
 COMMIT_HASH_END="${COMMIT_HASH_END}"
 IS_RELEASE=${IS_RELEASE}
-export DEBFULLNAME="SFLphone Automatic Build System"
-export DEBEMAIL="team@sflphone.org"
+export DEBFULLNAME="Julien Bonjean"
+export DEBEMAIL="julien.bonjean@savoirfairelinux.com"
 export EDITOR="echo"
 END
 
@@ -186,6 +193,8 @@ END
 	fi
 	rm -f ${WORKING_DIR}/sfl-git-dch.conf >/dev/null 2>&1
 
+	cd ${LAUNCHPAD_DIR}
+
 	cp ${DEBIAN_DIR}/changelog ${DEBIAN_DIR}/changelog.generic
 	
 	for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}

tools/build-system/sfl-git-dch-2.sh

@@ -10,6 +10,8 @@
 # Last Modified: 2009-10-21 14:58:22 -0400
 #####################################################
 
+#set -x
+
 . $1
 
 echo "********************************************************************************"
@@ -23,6 +25,8 @@ else
 	echo "Snapshot mode"
 fi
 
+cd ${WORKING_DIR}
+
 # use git log to retrieve changelog content
 CHANGELOG_CONTENT=`git log --no-merges --pretty=format:"%s" ${COMMIT_HASH_BEGIN}..${COMMIT_HASH_END} | grep -v "\[\#1262\]"`
 
@@ -84,5 +88,7 @@ echo
 echo "All done !"
 echo "********************************************************************************"
 
+cd -
+
 exit 0