X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=d66e317a0c3c0346a219d37061306eae7bb04071;hb=refs%2Fheads%2Fgeni-v2;hp=df1d311b718630897780f5f621bd652a5fefb8f0;hpb=5f5f29e2bc00befe5b7b601806ef5a7e44349b75;p=sfa.git

diff --git a/Makefile b/Makefile
index df1d311b..d66e317a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,17 @@ uninstall: python-uninstall tests-uninstall
 .PHONY: all install clean uninstall
 
 ##########
-rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# in general overridden (set by the specfile); but can be called right away
+RPMVERSION:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
 # somehow %{taglevel} is empty, turns out %{release} has what we want
-rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
-VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
+RPMRELEASE:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
+VERSIONTAG=$(RPMVERSION)-$(RPMRELEASE)
 SCMURL=should-be-redefined-by-specfile
 
 python: version
 
-version: sfa/util/version.py
-sfa/util/version.py: sfa/util/version.py.in
+version: sfa/util/version.py 
+sfa/util/version.py: sfa/util/version.py.in force
 	sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 
 xmlbuilder-install:
@@ -61,11 +62,35 @@ wsdl-clean:
 
 .PHONY: wsdl wsdl-install wsdl-clean
 
-##########
-debian: version
-	$(MAKE) -f Makefile.debian debian
-debian.clean: 
-	$(MAKE) -f Makefile.debian clean
+######################################## debian packaging
+# The 'debian' target is called from the build with the following variables set 
+# (see build/Makefile and target_debian)
+# (.) RPMTARBALL
+# (.) RPMVERSION
+# (.) RPMRELEASE
+# (.) RPMNAME
+#
+PROJECT=$(RPMNAME)
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(PROJECT)_$(DEBVERSION).orig.tar.bz2
+
+DATE=$(shell date -u +"%a, %d %b %Y %T")
+
+debian: debian/changelog debian.source debian.package
+
+debian/changelog: debian/changelog.in
+	sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+
+debian.source: force 
+	rsync -a $(RPMTARBALL) $(DEBTARBALL)
+
+debian.package:
+	debuild -uc -us -b 
+
+debian.clean:
+	$(MAKE) -f debian/rules clean
+	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
+	find . -name '*.pyc' -delete
 
 ##########
 tests-install:
@@ -101,12 +126,12 @@ force:
 
 ##########
 # a lot of stuff in the working dir is just noise
-scan:
+files:
 	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' 
 tags:	
-	$(MAKE) scan | xargs etags
+	$(MAKE) files | xargs etags
 
-.PHONY: scan tags
+.PHONY: files tags
 
 signatures:
 	(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)