X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=33cb4f532d1acc58d5d858cd73724c48696ca656;hb=6e519e18e14b5509ad4bcd28d7b41e6d3350f782;hp=7b5211450cd9905d783ce91cf1876d4164fea981;hpb=ab2d46b65bdbce4df772fee884a821c9d0a9f4f3;p=i3%2Fi3
diff --git a/release.sh b/release.sh
index 7b521145..33cb4f53 100755
--- a/release.sh
+++ b/release.sh
@@ -55,11 +55,17 @@ git checkout -b release-${RELEASE_VERSION}
cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSION}"
git add RELEASE-NOTES-${RELEASE_VERSION}
git rm RELEASE-NOTES-${PREVIOUS_VERSION}
-sed -i "s,[^<]*,${RELEASE_VERSION},g" man/asciidoc.conf
+sed -i "s,RELEASE-NOTES-${PREVIOUS_VERSION},RELEASE-NOTES-${RELEASE_VERSION},g" Makefile.am
+sed -i "s/AC_INIT(\[i3\], \[${PREVIOUS_VERSION}\]/AC_INIT([i3], [${RELEASE_VERSION}]/" configure.ac
+echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION
+git add I3_VERSION
git commit -a -m "release i3 ${RELEASE_VERSION}"
git tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D
-make dist
+autoreconf -fi
+mkdir build
+(cd build && ../configure && make dist-bzip2 -j8)
+cp build/i3-${RELEASE_VERSION}.tar.bz2 .
echo "Differences in the release tarball file lists:"
@@ -68,14 +74,13 @@ diff -u \
<(tar tf i3-${RELEASE_VERSION}.tar.bz2 | sed "s,i3-${RELEASE_VERSION}/,,g" | sort) \
| colordiff
-if ! tar xf i3-${RELEASE_VERSION}.tar.bz2 --to-stdout --strip-components=1 i3-${RELEASE_VERSION}/I3_VERSION | grep -q "^${RELEASE_VERSION} "
-then
- echo "I3_VERSION file does not start with ${RELEASE_VERSION}"
- exit 1
-fi
gpg --armor -b i3-${RELEASE_VERSION}.tar.bz2
+echo "${RELEASE_VERSION}-non-git" > I3_VERSION
+git add I3_VERSION
+git commit -a -m "Set non-git version to ${RELEASE_VERSION}-non-git."
+
if [ "${RELEASE_BRANCH}" = "master" ]; then
git checkout master
git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
@@ -156,7 +161,7 @@ git add downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt
sed -i "s,
Documentation for i3 v[^<]*
,Documentation for i3 v${RELEASE_VERSION}
,g" docs/index.html
sed -i "s,[^<]*,${RELEASE_VERSION},g" index.html
sed -i "s,The current stable version is .*$,The current stable version is ${RELEASE_VERSION}.,g" downloads/index.html
-sed -i "s,,\n \n ${RELEASE_VERSION} | \n i3-${RELEASE_VERSION}.tar.bz2 | \n $(ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g') | \n signature | \n $(date +'%Y-%m-%d') | \n release notes | \n
\n,g" downloads/index.html
+sed -i "s,,\n \n ${RELEASE_VERSION} | \n i3-${RELEASE_VERSION}.tar.bz2 | \n $(LC_ALL=en_US.UTF-8 ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g' | sed 's/M$/ MiB/g') | \n signature | \n $(date +'%Y-%m-%d') | \n release notes | \n
\n,g" downloads/index.html
git commit -a -m "add ${RELEASE_VERSION} release"
@@ -231,3 +236,4 @@ echo "Announce on:"
echo " twitter"
echo " google+"
echo " #i3 topic"
+echo " reddit /r/i3wm"