[Cdd-commits] r585 - cdd/trunk/cdd/devtools

[CDD Subversion Commit]

Author: tille
Date: Mon Mar  3 15:20:45 2008
New Revision: 585

Modified:
   cdd/trunk/cdd/devtools/Makefile
   cdd/trunk/cdd/devtools/rules
Log:
Make sure that distribution file for CDD sources is really builded and clean up auto builded files from SVN afterwards


Modified: cdd/trunk/cdd/devtools/Makefile
==============================================================================
--- cdd/trunk/cdd/devtools/Makefile	(original)
+++ cdd/trunk/cdd/devtools/Makefile	Mon Mar  3 15:20:45 2008
@@ -49,5 +49,9 @@
 	rm -rf tasksel
 	rm -f packages.txt by_vote packages-sorted.txt
 
+distclean: clean
+	rm -f debian/control
+	rm -f $(CDD)-tasks.desc
+
 dist: $(CDD)-tasks.desc debian/control
-	make -f debian/rules dist
+	make -f debian/rules get-orig-source

Modified: cdd/trunk/cdd/devtools/rules
==============================================================================
--- cdd/trunk/cdd/devtools/rules	(original)
+++ cdd/trunk/cdd/devtools/rules	Mon Mar  3 15:20:45 2008
@@ -11,6 +11,10 @@
 CDDMKFILE := /usr/share/cdd-dev/Makefile
 CDD_INSTALL_HELPER := /usr/share/cdd-dev/cdd-install-helper
 
+TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
+CDD := $(shell /usr/share/cdd-dev/cdd-get-names cddname)
+GENCONTROL := /usr/share/cdd-dev/cdd-gen-control
+
 VERSION := $(shell grep '^$(CDDNAME) *(.\+)' debian/changelog | head -n 1 | sed 's/^$(CDDNAME) \+(\(.\+\)) .*/\1/' )
 DISTDIR := $(CDDNAME)-$(VERSION)
 
@@ -54,7 +58,7 @@
 
 	dh_clean build-stamp
 
-dist: $(CDD)-tasks.desc debian/control
+get-orig-source: $(CDD)-tasks.desc debian/control
 	if [ ! -f debian/changelog ] ; then \
 	    echo "File debian/changelog is missing. Something is wrong!" ; \
 	    exit -1 ; \
@@ -72,6 +76,8 @@
 	rm -f `find . -name "*~"`
 	GZIP=-9 tar -czf ../$(CDDNAME)_$(VERSION).tar.gz $(DISTDIR)
 	rm -rf $(DISTDIR)
+	# remove auto generated files from SVN dir where it should not be stored
+	rm -f debian/control $(CDD)-tasks.desc
 
 install: build
 	dh_testdir