mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 10:00:45 -05:00
build: Fix up ChangeLog build generation
Since the pre-git-import ChangeLog has been moved, we need to put it back in the list temporarily when generating the rest.
This commit is contained in:
parent
fbdc967575
commit
e8bd46b82b
@ -11,7 +11,7 @@ PREV_CHANGELOG_VERSION=$$(if test "x$$(echo "($$version-0.1)*2/2"|bc)" = "x$$(ec
|
|||||||
CHANGELOGS = ChangeLog \
|
CHANGELOGS = ChangeLog \
|
||||||
`version=$(CURR_CHANGELOG_VERSION); \
|
`version=$(CURR_CHANGELOG_VERSION); \
|
||||||
version=$(PREV_CHANGELOG_VERSION); \
|
version=$(PREV_CHANGELOG_VERSION); \
|
||||||
while test "x$$version" != xgit-import; do \
|
while test "x$$version" != "xgit-import"; do \
|
||||||
echo ChangeLog.pre-$$version; \
|
echo ChangeLog.pre-$$version; \
|
||||||
version=$(PREV_CHANGELOG_VERSION); \
|
version=$(PREV_CHANGELOG_VERSION); \
|
||||||
done`
|
done`
|
||||||
@ -19,6 +19,7 @@ CHANGELOGS = ChangeLog \
|
|||||||
CLEANFILES += $(srcdir)/ChangeLog.cache-*
|
CLEANFILES += $(srcdir)/ChangeLog.cache-*
|
||||||
|
|
||||||
changelogs:
|
changelogs:
|
||||||
|
@cp -f $(top_srcdir)/doc/ChangeLog.pre-git-import $(srcdir)
|
||||||
@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
|
@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
|
||||||
|
|
||||||
dist-hook: changelogs
|
dist-hook: changelogs
|
||||||
@ -45,33 +46,33 @@ $(srcdir)/ChangeLog:
|
|||||||
echo A git checkout is required to generate this file >> $@); \
|
echo A git checkout is required to generate this file >> $@); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DISTCLEANFILES += ChangeLog.cache-*
|
DISTCLEANFILES += ChangeLog.cache-* ChangeLog.pre-git-import
|
||||||
|
|
||||||
ChangeLog.cache-*..: .git
|
ChangeLog.cache-*..: .git
|
||||||
|
|
||||||
ChangeLog%: $(srcdir)/ChangeLog%
|
ChangeLog%: $(srcdir)/ChangeLog%
|
||||||
|
|
||||||
$(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
|
$(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
|
||||||
@echo Creating $@
|
@echo "Creating $@"
|
||||||
@if test -d "$(srcdir)/.git"; then \
|
@if test -d "$(srcdir)/.git"; then \
|
||||||
(cd "$(srcdir)" && \
|
(cd "$(srcdir)" && \
|
||||||
version=$$(echo "$@" | sed 's/.*ChangeLog\([.].*-\)\?//'); \
|
version=$$(echo "$@" | sed 's/.*ChangeLog\([.].*-\)\?//'); \
|
||||||
if echo "$@" | grep -q '^ChangeLog[.]cache'; then \
|
if echo "$@" | grep -q '^ChangeLog[.]cache'; then \
|
||||||
spec=$$version; \
|
spec=$$version; \
|
||||||
|
else \
|
||||||
|
to=$$version; \
|
||||||
|
test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \
|
||||||
|
from=$(PREV_CHANGELOG_VERSION); \
|
||||||
|
test "x$$to" = x || to=$$to.0; \
|
||||||
|
test "x$$from" = xgit-import || from=$$from.0; \
|
||||||
|
spec=$$from..$$to; \
|
||||||
|
fi; \
|
||||||
|
$(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
|
||||||
|
&& mv -f $@.tmp $@ \
|
||||||
|
|| ($(RM) $@.tmp; \
|
||||||
|
echo Failed to generate $@, your $@ may be outdated >&2); \
|
||||||
else \
|
else \
|
||||||
to=$$version; \
|
echo A git checkout is required to generate $@ >&2; \
|
||||||
test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \
|
|
||||||
from=$(PREV_CHANGELOG_VERSION); \
|
|
||||||
test "x$$to" = x || to=$$to.0; \
|
|
||||||
test "x$$from" = xgit-import || from=$$from.0; \
|
|
||||||
spec=$$from..$$to; \
|
|
||||||
fi; \
|
|
||||||
$(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
|
|
||||||
&& mv -f $@.tmp $@ \
|
|
||||||
|| ($(RM) $@.tmp; \
|
|
||||||
echo Failed to generate $@, your $@ may be outdated >&2); \
|
|
||||||
else \
|
|
||||||
echo A git checkout is required to generate $@ >&2; \
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.PHONY: changelogs ChangeLog $(srcdir)/ChangeLog
|
.PHONY: changelogs ChangeLog $(srcdir)/ChangeLog
|
||||||
|
Loading…
Reference in New Issue
Block a user