git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/3] Refresh VERSION file when building distribution tarball in "make dist"

From
Jakub Narebski <jnareb@gmail.com>
Date
Jun 1, 2007, 16:34 UTC
Message-ID
<200706011834.28911.jnareb@gmail.com>
In-Reply-To
<20070531131615.GA27044@diku.dk>

Overwrite contents of VERSION file from the HEAD revision with the current version (at the time of building), so VERSION file in the tarball generated by "make dist" (and which follows also rpm package generated by "make rpm") is up to date.

Otherwise for example when building rpm it will be compiled with wrong version string.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
On Thu, 31 May 2007, Jonas Fonseca wrote:
> Maybe you can test the newly released tig 0.7 tarball?
> 
> Your patch was added as commit 8cdf56913e7e486bb3f527c24ee4a4d19f2a4f61,
> with a few minor adjustments.

One of those changes was using HEAD version of VERSION file in "make dist", instead of regenerating it and replacing it with the one containing _current_ version in the tar file.

$ make rpm sed -e 's/@@VERSION@@/0.7.4.g1995120/g' < tig.spec.in > tig.spec git-archive --format=tar --prefix=tig-0.7.4.g1995120/ HEAD > tig-0.7.4.g1995120.tar tar rf tig-0.7.4.g1995120.tar tig-0.7.4.g1995120/tig.spec gzip -f -9 tig-0.7.4.g1995120.tar rpmbuild -ta tig-0.7.4.g1995120.tar.gz Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.72336 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.72336 make[1]: Entering directory `/home/local/builddir/BUILD/tig-0.7.4.g1995120' cc -Wall -O2 '-DVERSION="0.7.git"' tig.c -lcurses -o tig asciidoc -b docbook -d manpage -aversion=0.7.git tig.1.txt xmlto -m manpage.xsl man tig.1.xml [...]

Note the mismatch in the versions: 0.7.4.g1995120 vs 0.7.git (by the way, shouldn't it be 0.7.tig?), even when building from live repo, and not from tarball.

This is 3rd patch in the series, but it is actually independent on the rest, and can be applied in any order.

 Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 0e42de6..bc8086f 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,10 @@ dist: tig.spec
 	git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar
 	@mkdir -p $(TARNAME)
 	@cp tig.spec $(TARNAME)
-	tar rf $(TARNAME).tar $(TARNAME)/tig.spec
+	echo $(VERSION) > $(TARNAME)/VERSION
+	tar rf $(TARNAME).tar \
+	       $(TARNAME)/tig.spec \
+	       $(TARNAME)/VERSION
 	@rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar
 
-- 
1.5.2
Previous: Jakub NarebskiNext: Jonas Fonseca
Message 8 of 12 in “Infrastructure for tig rpm builds.”
  1. Infrastructure for tig rpm builds.Jakub Narebski, May 28, 2007
  2. Jonas FonsecaMay 29, 2007
  3. Jakub NarebskiMay 29, 2007
  4. Jonas FonsecaMay 31, 2007
  5. 1/3 Remove PDF version of manual from being build and installedJakub Narebski, Jun 1, 2007
  6. Jonas FonsecaJun 2, 2007
  7. 2/3 Include documentation sources for rpmbuild with '--without docs'Jakub Narebski, Jun 1, 2007
  8. 3/3 Refresh VERSION file when building distribution tarball in "make dist"Jakub Narebski, Jun 1, 2007
  9. Jonas FonsecaJun 2, 2007
  10. 4/3 Simplify naming (versioning) of non-release tig tarball and rpm fileJakub Narebski, Jun 2, 2007
  11. Jonas FonsecaJun 3, 2007
  12. Jakub NarebskiJun 3, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.