mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-02 06:08:01 +02:00
[RELEASING] Update Makefile for git-1.6
Git moved all the subcommands out of the PATH, so we need to update our usage.
This commit is contained in:
parent
2fa6b63537
commit
1c2eba92c1
2 changed files with 4 additions and 4 deletions
|
|
@ -37,7 +37,7 @@ $(srcdir)/ChangeLog:
|
|||
@if test -d "$(srcdir)/.git"; then \
|
||||
version=$(CURR_CHANGELOG_VERSION); \
|
||||
prev=$(PREV_CHANGELOG_VERSION).0; \
|
||||
nearest_tag=`git-describe | sed 's/-.*//'`; \
|
||||
nearest_tag=`git describe | sed 's/-.*//'`; \
|
||||
before=$(srcdir)/ChangeLog.cache-$$prev..$$nearest_tag; \
|
||||
after=$(srcdir)/ChangeLog.cache-$$nearest_tag..; \
|
||||
$(MAKE) $(AM_MAKEFLAGS) $$before $$after && \
|
||||
|
|
@ -71,7 +71,7 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
|
|||
test "x$$from" = xinitial || from=$$from.0; \
|
||||
spec=$$from..$$to; \
|
||||
fi; \
|
||||
$(top_srcdir)/build/missing --run git-log --stat "$$spec") > $@.tmp \
|
||||
$(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
|
||||
&& mv -f $@.tmp $@ \
|
||||
|| ($(RM) $@.tmp; \
|
||||
echo Failed to generate $@, your $@ may be outdated >&2); \
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ dist-clear-sticky-bits:
|
|||
|
||||
snapshot:
|
||||
distdir="$(distdir)-`date '+%Y%m%d'`"; \
|
||||
test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
|
||||
test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git rev-parse HEAD | cut -c 1-6`; \
|
||||
TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" snapshot-dist
|
||||
|
||||
snapshot-dist: dist
|
||||
|
|
@ -97,7 +97,7 @@ release-upload: $(tar_file) $(sha1_file) $(gpg_file)
|
|||
scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
|
||||
mv $(tar_file) $(sha1_file) $(gpg_file) releases
|
||||
ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
|
||||
git-tag -s -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release" $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
|
||||
git tag -s -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release" $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
|
||||
|
||||
release-publish-message: releases/$(sha1_file)
|
||||
@echo "Please follow the instructions in RELEASING to push stuff out and"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue