diff --git a/create-tar.sh b/create-tar.sh index 43b2839..3bcd568 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,7 +2,8 @@ CHANNEL="esr60" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="abae8941234801d8aa5b6cfd8cc49ef62bc48e62" +RELEASE_TAG="c73d49cb8736" +MOZ_RELEASE_TAG="abae89412348" VERSION="60.0" VERSION_SUFFIX="" LOCALE_FILE="thunderbird-$VERSION/comm/mail/locales/l10n-changesets.json" @@ -32,7 +33,6 @@ if [ -e thunderbird-$VERSION$VERSION_SUFFIX.source.tar.xz ]; then && \ xz -9 -v thunderbird-$VERSION$VERSION_SUFFIX.source.tar else - # thunderbird if [ -d thunderbird-$VERSION ]; then pushd thunderbird-$VERSION _repourl=$(hg paths) @@ -51,15 +51,14 @@ else fi if [ ! -d thunderbird-$VERSION ]; then echo "cloning new $BRANCH..." - hg clone http://hg.mozilla.org/$BRANCH thunderbird-$VERSION + hg clone http://hg.mozilla.org/releases/mozilla-$CHANNEL thunderbird-$VERSION + hg clone http://hg.mozilla.org/releases/comm-$CHANNEL thunderbird-$VERSION/comm fi pushd thunderbird-$VERSION - hg update --check - echo "running client.py..." - [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" - # temporary! - _extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-$CHANNEL $_extra" - python client.py checkout --skip-chatzilla --skip-venkman $_extra + hg update --check $MOZ_RELEASE_TAG + pushd comm + hg update --check $RELEASE_TAG + popd popd echo "creating archive..." rm -rf thunderbird-${VERSION}/{,comm/}other-licenses/7zstub