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

[#1456] Added version dependancy handling

Conflicts:

	tools/build-system/launch-build-machine.sh
parent 097fa088
Branches
Tags
No related merge requests found
......@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-04-20
# Last Modified: 2009-05-15 12:23:31 -0400
# Last Modified: 2009-05-19 17:49:40 -0400
#####################################################
#
......@@ -248,7 +248,7 @@ if [ ${DO_PREPARE} ]; then
if [ ${RELEASE_MODE} ]; then
echo "Switch to master branch for commit"
git checkout master
git checkout -f master
fi
echo " Doing commit"
......@@ -264,7 +264,7 @@ if [ ${DO_PREPARE} ]; then
if [ ${RELEASE_MODE} ]; then
echo "Switch back to release branch"
git checkout release
git merge master
# git merge master
fi
echo "Archiving repository"
......
......@@ -105,7 +105,8 @@ fi
echo "Generate control files"
cp ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/control && \
# cp ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/control && \
cp ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control
cp ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control && \
find ${REPOSITORY_DIR} -name "control" -exec sed -i "s/VERSION/${FULL_VERSION}/g" {} \;
if [ "$?" -ne "0" ]; then
echo "!! Cannot generate control files"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment