X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=Makefile;h=ae9e7a6999f182d331f0d8acc55a1fba5bb3675f;hp=df1d311b718630897780f5f621bd652a5fefb8f0;hb=4838efd24781da409452897511a8dd5f01dbe6bd;hpb=a49c0e1ae9001aa0ff22cc7262e5669db0739df5

diff --git a/Makefile b/Makefile
index df1d311b..ae9e7a69 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ 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 +61,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 +125,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)
@@ -125,7 +149,7 @@ SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/rootfs
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 else
 ifdef PLCHOSTVS