Skip to content
Snippets Groups Projects
Commit 86da8e09 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#2181] Updated version management

parent c9fcca77
Branches
Tags
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-10-20 # Creation Date: 2009-10-20
# Last Modified: 2009-10-21 16:54:28 -0400 # Last Modified: 2009-10-21 18:18:07 -0400
##################################################### #####################################################
# home directory # home directory
...@@ -21,7 +21,6 @@ VERSION_INDEX="1" ...@@ -21,7 +21,6 @@ VERSION_INDEX="1"
DO_PUSH=1 DO_PUSH=1
DO_LOGGING=1 DO_LOGGING=1
DO_UPLOAD=1 DO_UPLOAD=1
DO_GIT_BRANCH_CHANGE=1
EDITOR=echo EDITOR=echo
export EDITOR export EDITOR
...@@ -31,7 +30,8 @@ REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository" ...@@ -31,7 +30,8 @@ REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system" WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
LAUNCHPAD_DIR="${WORKING_DIR}/launchpad" LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" ) LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" ) #LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
LAUNCHPAD_PACKAGES=( "sflphone-client-kde" )
echo echo
echo " /***********************\\" echo " /***********************\\"
...@@ -48,15 +48,12 @@ do ...@@ -48,15 +48,12 @@ do
echo " --skip-push" echo " --skip-push"
echo " --skip-upload" echo " --skip-upload"
echo " --no-logging" echo " --no-logging"
echo " --skip-git-branch-change"
echo " --release" echo " --release"
echo " --version-index=[1,2,...]" echo " --version-index=[1,2,...]"
echo echo
exit 0;; exit 0;;
--skip-push) --skip-push)
unset DO_PUSH;; unset DO_PUSH;;
--skip-git-branch-change)
unset DO_GIT_BRANCH_CHANGE;;
--skip-upload) --skip-upload)
unset DO_UPLOAD;; unset DO_UPLOAD;;
--no-logging) --no-logging)
...@@ -141,13 +138,13 @@ if [ ${IS_RELEASE} ]; then ...@@ -141,13 +138,13 @@ if [ ${IS_RELEASE} ]; then
COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}" COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}"
else else
SNAPSHOT_TAG=`date +%Y%m%d` SNAPSHOT_TAG=`date +%Y%m%d`
SOFTWARE_VERSION="snapshot${SNAPSHOT_TAG}0${VERSION_INDEX}" SOFTWARE_VERSION="snapshot${SNAPSHOT_TAG}"
COMMIT_HASH_BEGIN="${CURRENT_RELEASE_COMMIT_HASH}" COMMIT_HASH_BEGIN="${CURRENT_RELEASE_COMMIT_HASH}"
fi fi
cd ${LAUNCHPAD_DIR} cd ${LAUNCHPAD_DIR}
VERSION="ppa~SYSTEM~${SOFTWARE_VERSION}" VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~SYSTEM"
for LAUNCHPAD_PACKAGE in ${LAUNCHPAD_PACKAGES[*]} for LAUNCHPAD_PACKAGE in ${LAUNCHPAD_PACKAGES[*]}
do do
...@@ -192,7 +189,7 @@ END ...@@ -192,7 +189,7 @@ END
for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]} for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}
do do
LOCAL_VERSION="ppa~${LAUNCHPAD_DISTRIBUTION}~${SOFTWARE_VERSION}" LOCAL_VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~${LAUNCHPAD_DISTRIBUTION}"
cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
...@@ -212,7 +209,7 @@ END ...@@ -212,7 +209,7 @@ END
done done
# if push is activated # if push is activated
if [[ ${DO_PUSH} && ${IS_RELEASE} && ${DO_GIT_BRANCH_CHANGE} ]];then if [[ ${DO_PUSH} && ${IS_RELEASE} ]];then
echo " Doing commit" echo " Doing commit"
git commit -m "[#1262] Released ${SOFTWARE_VERSION}" . git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment