e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

autofoo: Rework git tag/release stuff 

- Add 'release' target to make dist without git tag in rpm name and
  version string.
- Use .git-src (not .git) to test if we are building from git.
This commit is contained in:
Kim Woelders 2022-10-22 08:12:46 +02:00
parent 6a1a3fff15
commit de0dcfadb9
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.git-src Normal file
View File

32
Makefile.am
View File

@ -25,24 +25,30 @@ sample-scripts/shade-pagers.pl \
sample-scripts/place-pagers.pl \
AUTHORS COMPLIANCE COPYING ChangeLog
if SRC_IS_GIT
version.h: FORCE
@echo '#define E16_VERSION "'`git describe --dirty`'"' > $@.tmp
@if [ -f $(top_srcdir)/.git-src -a -z "$(release)" ]; then \
echo '#define E16_VERSION "'`git describe --dirty`'"' > $@.tmp; \
else \
echo '#define E16_VERSION "@VERSION@"' > $@.tmp; \
fi
@if cmp -s $@.tmp $@; then rm $@.tmp; else mv $@.tmp $@; fi
RPM_RELEASE=`echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD`
else
version.h: FORCE
@echo '#define E16_VERSION "@VERSION@"' > $@.tmp
@if cmp -s $@.tmp $@; then rm $@.tmp; else mv $@.tmp $@; fi
RPM_RELEASE=1
endif
dist-hook: $(top_builddir)/$(PACKAGE).spec
RPR_DEV = `echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD`
RPR_REL = 1
SED_DEV = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_DEV)/"
SED_REL = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_REL)/"
$(top_builddir)/$(PACKAGE).spec: FORCE
sed "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPM_RELEASE)/" \
$(top_srcdir)/$(PACKAGE).spec.in > $@
@if [ -f $(top_srcdir)/.git-src -a -z "$(release)" ]; then \
sed $(SED_DEV) $(top_srcdir)/$(PACKAGE).spec.in > $@; \
else \
sed $(SED_REL) $(top_srcdir)/$(PACKAGE).spec.in > $@; \
fi
.PHONY: release
release:
$(MAKE) dist release=y
FORCE:

2
configure.ac
View File

@ -4,8 +4,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4])
AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git)
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC