make dist and git

Alfred M. Szmidt ams@gnu.org
Wed May 6 14:40:00 GMT 2009


Here is a patch that makes `make dist' use GIT instead of CVS.  I'm
planning on making the 2.10 tarball from the git repository when it is
finialised and Ulrich has tagged 2.10.  Many thanks to Jim for the
hard work to get that done!

2009-05-06  Alfred M. Szmidt  <ams@gnu.org>

	* Makefile (.PHONY): Removed tag-for-dist from list.
	(tag-of-stem): Variable removed.
	(dist-selector): Variable removed.
	(glibc-%.tar $(dist-separate:%=glibc-%-%.tar)): Use GIT instead of
	CVS when creating an tar archive.
	(tag-for-dist, tag-%): Targets removed.

	* Makerules (%.lzma): New target.

diff --git a/Makefile b/Makefile
index cab5ff3..209a837 100644
--- a/Makefile
+++ b/Makefile
@@ -347,15 +347,12 @@ TAGS:
 	| $(ETAGS) -o $@ -
 
 # Make the distribution tarfile.
-.PHONY: dist tag-for-dist
+.PHONY: dist
 
 generated := $(generated) stubs.h
 
 files-for-dist := README FAQ INSTALL NOTES configure
 
-tag-of-stem = glibc-$(subst .,_,$*)
-dist-selector = -r $(tag-of-stem)
-
 # Add-ons in the main repository but distributed in their own tar files.
 dist-separate = libidn
 
@@ -365,7 +362,7 @@ glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
 	@rm -fr glibc-$*
 	$(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
 			 -name configure`
-	cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc
+	git archive --format=tar --prefix=glibc-$*/ glibc-$* | tar xf -
 # Touch all the configure scripts going into the tarball since cvs export
 # might have delivered configure.in newer than configure.
 	find glibc-$* -name configure -print | xargs touch
@@ -389,10 +386,6 @@ dist: $(foreach Z,.bz2 .gz,glibc-$(dist-version).tar$Z \
 				     glibc-$D-$(dist-version).tar$Z))
 	md5sum $^
 
-tag-for-dist: tag-$(dist-version)
-tag-%: $(files-for-dist)
-	cvs $(CVSOPTS) -Q tag -c $(tag-of-stem)
-
 define format-me
 @rm -f $@
 makeinfo --no-validate --plaintext --no-number-sections $< -o $@
diff --git a/Makerules b/Makerules
index ab36e2f..907beb1 100644
--- a/Makerules
+++ b/Makerules
@@ -1335,6 +1335,7 @@ echo-headers:
 
 %.bz2: %; bzip2 -9vk $<
 %.gz: %; gzip -9vnc $< > $@.new && mv -f $@.new $@
+%.lzma: %; lzma -9vk $<
 
 # Common cleaning targets.
 



More information about the Libc-alpha mailing list