[Freeipa-devel] [PATCH] local dist

[Karl MacMillan]

Committed the patch below to add a new local-dist target to the
makefile. Normally distribution tarballs and rpms are made by using hg
archive (so they are the latest _committed_ versions). This is good to
catch missed adds and so that releases are made from exactly what is
under version control.

However, it sucks for testing because testing the rpms requires a commit
of all changes. The local-dist target takes your current local version
including changes that haven't been committed and makes tarballs and
rpms.

Karl

[?1034hdiff -r d3e1dc5f6584 Makefile
--- a/Makefile	Wed Aug 01 11:09:12 2007 -0400
+++ b/Makefile	Wed Aug 01 11:42:42 2007 -0400
@@ -53,10 +53,20 @@ version-update:
 		> ipa-python/freeipa-python.spec
 
 
-tarballs:
+archive:
 	-mkdir -p dist
 	hg archive -t files dist/freeipa
 
+local-archive:
+	-mkdir -p dist/freeipa
+	@for subdir in $(SUBDIRS); do \
+		cp -pr $$subdir dist/freeipa/.; \
+	done
+
+archive-cleanup:
+	rm -fr dist/freeipa
+
+tarballs:
         # ipa-server
 	mv dist/freeipa/ipa-server dist/$(SERV_TARBALL_PREFIX)
 	rm -f dist/$(SERV_TARBALL)
@@ -74,9 +84,6 @@ tarballs:
 	rm -f dist/$(PYTHON_TARBALL)
 	cd dist; tar cfz $(PYTHON_TARBALL) $(PYTHON_TARBALL_PREFIX)
 	rm -fr dist/$(PYTHON_TARBALL_PREFIX)
-
-        # cleanup
-	rm -fr dist/freeipa
 
 rpm-ipa-server:
 	cp dist/$(SERV_TARBALL) ~/rpmbuild/SOURCES/.
@@ -98,7 +105,9 @@ rpm-ipa-python:
 
 rpms: rpm-ipa-server rpm-ipa-admin rpm-ipa-python
 
-dist: version-update tarballs rpms
+dist: version-update archive tarballs archive-cleanup rpms
+
+local-dist: clean version-update local-archive tarballs archive-cleanup rpms
 
 dist-clean: clean
 	rm -fr dist