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. (Now same as e16 and others).
This commit is contained in:
parent
b79b167d28
commit
8b60be897b
28
Makefile.am
28
Makefile.am
|
@ -2,26 +2,32 @@ AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = api epplets
|
|
||||||
|
|
||||||
EXTRA_DIST = $(PACKAGE).spec.in
|
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
Makefile.in aclocal.m4 compile config.* configure depcomp \
|
Makefile.in aclocal.m4 compile config.* configure depcomp \
|
||||||
install-sh ltmain.sh missing */Makefile.in
|
install-sh ltmain.sh missing */Makefile.in
|
||||||
|
|
||||||
CLEANFILES = $(PACKAGE).spec
|
CLEANFILES = $(PACKAGE).spec
|
||||||
|
|
||||||
if SRC_IS_GIT
|
EXTRA_DIST = $(PACKAGE).spec.in
|
||||||
RPM_RELEASE=`echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD`
|
|
||||||
else
|
SUBDIRS = api epplets
|
||||||
RPM_RELEASE=`echo -n "1.%(date '+%y%m%d')"`
|
|
||||||
endif
|
|
||||||
|
|
||||||
dist-hook: $(top_builddir)/$(PACKAGE).spec
|
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
|
$(top_builddir)/$(PACKAGE).spec: FORCE
|
||||||
sed "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPM_RELEASE)/" \
|
@if [ -f $(top_srcdir)/.git-src -a -z "$(release)" ]; then \
|
||||||
$(top_srcdir)/$(PACKAGE).spec.in > $@
|
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:
|
FORCE:
|
||||||
|
|
|
@ -7,8 +7,6 @@ AC_INIT([e16-epplets],[pkg_version],[enlightenment-devel@lists.sourceforge.net])
|
||||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git)
|
|
||||||
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
AC_SUBST(E_RPM_REVISION, [rpm_revision])
|
AC_SUBST(E_RPM_REVISION, [rpm_revision])
|
||||||
|
|
Loading…
Reference in New Issue