gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: Fix a bug where old ANNOUNCE text might get added to annotated tag.

Browse source 
When adding an ANNOUNCE file to the annotated tag, added dependency
on the passed ANNOUNCE file to ensure the temporary file which
prepends 'Release x.yz' gets regenerated while tagging.
This commit is contained in:
Ivan Vučica 2017-12-10 16:11:16 +00:00
parent 50afbfa898
commit 88ea3f8589
No known key found for this signature in database
GPG key ID: 6E4D7BA2D93CAC9D
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2017-12-10 Ivan Vucica <ivan@vucica.net>
* Master/source-distribution.make
* GNUmakefile.in:
When adding an ANNOUNCE file to the annotated tag, added dependency
on the passed ANNOUNCE file to ensure the temporary file which
prepends 'Release x.yz' gets regenerated while tagging.
2017-12-07 Ivan Vucica <ivan@vucica.net>
* Master/source-distribution.make: Allow creating a Git tag and

12
GNUmakefile.in
View file

@ -439,16 +439,16 @@ git-tag:
-m "Release $(GNUSTEP_MAKE_VERSION)."
else
ifneq ($(GIT_TAG_ANNOUNCE_OMIT_PREFACE),yes)
.INTERMEDIATE += git-tag-announce-file.tmp
git-tag-announce-file.tmp:
printf "Release $(GNUSTEP_MAKE_VERSION).\n\n" > git-tag-announce-file.tmp
cat $(GIT_TAG_ANNOUNCE_FILE) >> git-tag-announce-file.tmp
.INTERMEDIATE += git-tag-announce-file_$(GNUSTEP_MAKE_VERSION).tmp
git-tag-announce-file_$(GNUSTEP_MAKE_VERSION).tmp: $(GIT_TAG_ANNOUNCE_FILE)
printf "Release $(GNUSTEP_MAKE_VERSION).\n\n" > $@
cat $(GIT_TAG_ANNOUNCE_FILE) >> $@
git-tag: git-tag-announce-file.tmp
git-tag: git-tag-announce-file_$(GNUSTEP_MAKE_VERSION).tmp
git tag \
$(GIT_TAG_ANNOTATION_FLAGS) \
make-$(VERTAG) \
-F git-tag-announce-file.tmp
-F $<
else
git-tag:
git tag \

12
Master/source-distribution.make
View file

@ -409,16 +409,16 @@ git-tag:
-m "Release $(PACKAGE_VERSION)"
else
ifneq ($(GIT_TAG_ANNOUNCE_OMIT_PREFACE),yes)
.INTERMEDIATE += git-tag-announce-file.tmp
git-tag-announce-file.tmp:
printf "Release $(PACKAGE_VERSION).\n\n" > git-tag-announce-file.tmp
cat $(GIT_TAG_ANNOUNCE_FILE) >> git-tag-announce-file.tmp
.INTERMEDIATE += git-tag-announce-file-$(VERTAG).tmp
git-tag-announce-file-$(VERTAG).tmp: $(GIT_TAG_ANNOUNCE_FILE)
printf "Release $(PACKAGE_VERSION).\n\n" > $@
cat $(GIT_TAG_ANNOUNCE_FILE) >> $@
git-tag: git-tag-announce-file.tmp
git-tag: git-tag-announce-file-$(VERTAG).tmp
$(GIT) tag \
$(GIT_TAG_ANNOTATION_FLAGS) \
$(GIT_TAG_NAME)-$(VERTAG) \
-F git-tag-announce-file.tmp
-F $<
else
git-tag:
$(GIT) tag \