emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Extract version from GIT, inspiration from mdio-tools"

Browse Source 
This reverts commit da7425f757.
This commit is contained in:
Joachim Wiberg 2021-11-17 06:51:45 +01:00
parent 17a62a7f31
commit f3ef9d7514
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.am
View File

@ -25,10 +25,9 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
SUBDIRS = example man src test
doc_DATA = README.md LICENSE ChangeLog.md syslog.conf doc_DATA = README.md LICENSE ChangeLog.md syslog.conf
EXTRA_DIST = README.md LICENSE ChangeLog.md syslog.conf EXTRA_DIST = README.md LICENSE ChangeLog.md syslog.conf
SUBDIRS = example man src test
TAG = $(top_srcdir)/.git/refs/tags/$(PACKAGE_VERSION)
if HAVE_SYSTEMD if HAVE_SYSTEMD
systemd_DATA = syslogd.service systemd_DATA = syslogd.service
@ -37,9 +36,22 @@ endif
# #
# Check if tagged in git # Check if tagged in git
# #
$(TAG): release-hook:
@printf "\e[1m\e[41mPlease create the \"$(PACKAGE_VERSION)\" tag first\e[0m\n" @if [ ! `git tag -l v$(PACKAGE_VERSION) | grep $(PACKAGE_VERSION)` ]; then \
@exit 1 echo; \
printf "\e[1m\e[41mCannot find release tag $(PACKAGE_VERSION)\e[0m\n"; \
printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn; \
if [ "$$yorn" != "y" -a "$$yorn" != "Y" ]; then \
printf "OK, aborting release.\n"; \
exit 1; \
fi; \
echo; \
else \
echo; \
printf "\e[1m\e[42mFound GIT release tag $(PACKAGE_VERSION)\e[0m\n"; \
printf "\e[1m\e[44m>>Remember to push tags!\e[0m\n"; \
echo; \
fi
# #
# Generate .deb package(s) # Generate .deb package(s)

4
configure.ac
View File

@ -25,8 +25,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
AC_INIT([sysklogd], m4_esyscmd_s(git describe --always --dirty --tags), AC_INIT([sysklogd], [2.3.0-beta1], [https://github.com/troglobit/sysklogd/issues],,
[https://github.com/troglobit/sysklogd/issues],,[https://github.com/troglobit/sysklogd]) [https://github.com/troglobit/sysklogd])
AC_CONFIG_AUX_DIR(aux) AC_CONFIG_AUX_DIR(aux)
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects]) AM_INIT_AUTOMAKE([1.11 foreign subdir-objects])
LT_INIT([pic-only]) LT_INIT([pic-only])