Release 0.14

This commit is contained in:
o9000 2017-03-26 10:49:47 +02:00
parent 0fc22b5cd6
commit cb43e76660
6 changed files with 10 additions and 47 deletions

View file

@ -1,4 +1,4 @@
2017-03-25 master 2017-03-26 0.14
- Enhancements: - Enhancements:
- New plugin: button. - New plugin: button.

View file

@ -1,5 +1,5 @@
# Latest stable release: 0.13.3 # Latest stable release: 0.14
Changes: https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog Changes: https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog
Documentation: [doc/tint2.md](doc/tint2.md) Documentation: [doc/tint2.md](doc/tint2.md)
@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
``` ```
git clone https://gitlab.com/o9000/tint2.git git clone https://gitlab.com/o9000/tint2.git
cd tint2 cd tint2
git checkout 0.13.3 git checkout 0.14
mkdir build mkdir build
cd build cd build
cmake .. cmake ..

View file

@ -199,9 +199,9 @@ pre {
</style> </style>
</head> </head>
<body> <body>
<h1 id="latest-stable-release-0-13-3"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.13.3</span><a name="latest-stable-release-0-13-3" href="#latest-stable-release-0-13-3" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git <h1 id="latest-stable-release-0-14"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.14</span><a name="latest-stable-release-0-14" href="#latest-stable-release-0-14" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
cd tint2 cd tint2
git checkout 0.13.3 git checkout 0.14
mkdir build mkdir build
cd build cd build
cmake .. cmake ..

View file

@ -1,4 +1,4 @@
.TH TINT2 1 "2017\-03\-12" 0.13.3 .TH TINT2 1 "2017\-03\-26" 0.14
.SH NAME .SH NAME
.PP .PP
tint2 \- lightweight panel/taskbar tint2 \- lightweight panel/taskbar

View file

@ -1,4 +1,4 @@
# TINT2 1 "2017-03-12" 0.13.3 # TINT2 1 "2017-03-26" 0.14
## NAME ## NAME
tint2 - lightweight panel/taskbar tint2 - lightweight panel/taskbar

View file

@ -1,46 +1,9 @@
#!/bin/sh #!/bin/sh
MAJOR=0.13 MAJOR=0.14
DIRTY="" DIRTY=""
if git status 1>/dev/null 2>/dev/null VERSION=0.14
then
git update-index -q --ignore-submodules --refresh
# Disallow unstaged changes in the working tree
if ! git diff-files --quiet --ignore-submodules --
then
if [ "$1" = "--strict" ]
then
echo >&2 "Error: there are unstaged changes."
git diff-files --name-status -r --ignore-submodules -- >&2
exit 1
else
DIRTY="-dirty"
fi
fi
# Disallow uncommitted changes in the index
if ! git diff-index --cached --quiet HEAD --ignore-submodules --
then
if [ "$1" = "--strict" ]
then
echo >&2 "Error: there are uncommitted changes."
git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
exit 1
else
DIRTY="-dirty"
fi
fi
VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
else
VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
if [ $VERSION = "master" ]
then
VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
fi
fi
VERSION=$(echo "$VERSION" | sed 's/^v//')
echo '#define VERSION_STRING "'$VERSION'"' > version.h echo '#define VERSION_STRING "'$VERSION'"' > version.h
echo $VERSION echo $VERSION