Commit b5b34449 authored by anarcat's avatar anarcat

use the drupalcode.org makefile instead of cascading down

parent 5e9775dc
......@@ -3,7 +3,4 @@ api = 2
projects[drupal][type] = "core"
projects[hostmaster][type] = "profile"
projects[hostmaster][download][type] = "git"
projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
projects[hostmaster][download][branch] = "6.x-2.x"
includes[hostmaster] = "http://drupalcode.org/project/hostmaster.git/blob_plain/6.x-2.x:/hostmaster.make"
......@@ -50,17 +50,21 @@ cat <<EOF
The following operations will be done:
0. prompt you for a debian/changelog entry
1. change the makefile to download tarball
1. change the makefile to download the stable release
2. change the upgrade.sh.txt version
3. display the resulting diff
4. commit those changes to git
5. lay down the tag
6. revert the commit
7. (optionally) push those changes
7. change the version numbers in the hostmaster makefile
8. lay down the tag in hostmaster
9. lay down the tags in eldir and hosting
The operation can be aborted before step 7. Don't forget that as
long as changes are not pushed upstream, this can all be reverted (see
git-reset(1) and git-revert(1) ).
Don't forget that as long as changes are not pushed upstream, this can
all be reverted (see git-reset(1) and git-revert(1)).
YOU WILL NEED TO PUSH CHANGES TO provision, hostmaster, hosting and
eldir ONCE THIS SCRIPT IS DONE.
EOF
......@@ -70,14 +74,13 @@ fi
git pull --rebase
dch -v $version -D testing
debversion=$(echo $version | sed -e 's/-/~/')
dch -v $debversion -D testing
git add debian/changelog
echo changing makefile to download tarball
#sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/ = "get"/' \
# -e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://ftp.drupal.org/files/projects/hostmaster-'$major-$version'.tgz"#' \
# -e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[directory_name] = "hostmaster"/' aegir.make && git add aegir.make && rm aegir.make.tmp
sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[tag] = "'$major-$version'"/' aegir.make && git add aegir.make && rm aegir.make.tmp
sed -i'.tmp' -e"/^includes\[hostmaster\].*/s# *= .*\$# = \"http://drupalcode.org/project/hostmaster.git/blob_plain/$major-$version:/drupal-org.make\"#" aegir.make
git add aegir.make && rm aegir.make.tmp
echo changing provision.info version
sed -i'.tmp' -e"s/version *=.*$/version=$major-$version/" provision.info
......@@ -109,7 +112,23 @@ git reset --quiet HEAD 'debian/changelog'
git checkout -- 'debian/changelog'
git commit
if prompt_yes_no "push tags and commits upstream? "; then
# this makes sure we push the commit *and* the tag
git push --tags origin HEAD
fi
echo checking out slave modules
for module in hostmaster hosting eldir; do
if [ ! -d $module ]; then
git clone git.drupal.org:project/$module
fi
( cd $hostmaster ; git pull --rebase )
done
sed -n '1,/ --/p' debian/changelog | (
cd hostmaster
sed -i.tmp -e "/^projects\[\(eldir|hosting\)\]\[version\]/s/ *=.*$/ = $major-$version/" drupal-org.make
git diff
git commit -m"bump to release $version"
git tag -a -F - $major-$version
)
for module in hosting eldir; do
echo tagging $module
sed -n '1,/ --/p' debian/changelog | ( cd $module && git tag -a -F - $major-$version )
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment