[Pkg-zenoss-commits] r363 - in /trunk/packages/wmi/debian: patches/wmi-build.dpatch rules

[bzed at users.alioth.debian.org]

Author: bzed
Date: Thu Mar 13 21:23:33 2008
New Revision: 363

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=363
Log:
build system updates

Modified:
    trunk/packages/wmi/debian/patches/wmi-build.dpatch
    trunk/packages/wmi/debian/rules

Modified: trunk/packages/wmi/debian/patches/wmi-build.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/patches/wmi-build.dpatch?rev=363&op=diff
==============================================================================
--- trunk/packages/wmi/debian/patches/wmi-build.dpatch (original)
+++ trunk/packages/wmi/debian/patches/wmi-build.dpatch Thu Mar 13 21:23:33 2008
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad wmi~/GNUmakefile wmi/GNUmakefile
 --- wmi~/GNUmakefile	2008-02-26 21:12:35.000000000 +0100
-+++ wmi/GNUmakefile	2008-03-13 21:33:33.000000000 +0100
++++ wmi/GNUmakefile	2008-03-13 22:06:31.000000000 +0100
 @@ -1,7 +1,7 @@
  all: install
  
@@ -16,7 +16,7 @@
  
  ifeq ($(PYTHON),)
  PYTHON=python
-@@ -17,42 +17,50 @@
+@@ -17,42 +17,49 @@
  LIBSUFFIX=dylib
  endif
  
@@ -41,16 +41,18 @@
 -	cp bin/winexe $(DESTDIR)$(ZENBIN) ; \
 -	cp bin/wmic $(DESTDIR)$(ZENBIN) ; \
 -	cp wmi/_pywmi.$(LIBSUFFIX) $(DESTDIR)$(PYLIBDIR)/_pywmi.so ; \
-+pywmi-installed: pywmi-build $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
++pywmi-installed: pywmi-build
++	mkdir -p $(DESTDIR)$(PYLIBDIR)
++	mkdir -p $(DESTDIR)$(ZENBIN)
 +	cd Samba/source && 						\
 +	cp bin/winexe $(DESTDIR)$(ZENBIN) &&				\
 +	cp bin/wmic $(DESTDIR)$(ZENBIN) &&				\
 +	cp wmi/_pywmi.$(LIBSUFFIX) $(DESTDIR)$(PYLIBDIR) &&			\
  	cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
  
- $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
- 	mkdir -p $@
- 
+-$(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
+-	mkdir -p $@
+-
 -clean:
 -	cd pycom && rm -rf build
 -	cd Samba/source && make clean
@@ -87,7 +89,7 @@
  tarball:
  	-svn rm -m 'cleanup' http://dev.zenoss.org/svn/tags/wmi-$(VERSION)
  	svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/trunk/wmi http://dev.zenoss.org/svn/tags/wmi-$(VERSION)
-@@ -60,4 +68,5 @@
+@@ -60,4 +67,5 @@
  	tar -cjf ../wmi-$(VERSION).tar.bz2 wmi-$(VERSION)
  	rm -rf wmi-$(VERSION)
  

Modified: trunk/packages/wmi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/rules?rev=363&op=diff
==============================================================================
--- trunk/packages/wmi/debian/rules (original)
+++ trunk/packages/wmi/debian/rules Thu Mar 13 21:23:33 2008
@@ -16,9 +16,9 @@
 
 PYVERS=$(shell pyversions -s)
 
-build: build-stamp
+build: build-mingw-stamp build-python-stamp
 
-build-stamp: patch
+build-mingw-stamp: patch
 	dh_testdir
 
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
@@ -29,31 +29,27 @@
 	#we don't want to use the delivered binary blob, rebuild it
 	cd Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
 
-	make
+	touch $@
 
-
+build-python-stamp: build-mingw-stamp
+	dh_testdir
+	set -e ;\
 	for pyvers in $(PYVERS); do \
-	    mkdir -p mkdir -p $(CURDIR)/debian/tmp/usr/lib/python-support/python-wmi/$$pyvers ;\
-	    make pywmi-build PYTHON=$$pyvers \
-	               PYLIBDIR=/usr/lib/ \
-	               ZENBIN=/usr/bin && \
-	    \
-            make pywmi-installed PYTHON=$$pyvers \
-                                 ZENBIN=/usr/bin \
-                                 DESTDIR=$(CURDIR)/debian/tmp \
-                                 PYLIBDIR=/usr/lib/python-support/python-wmi/$$pyvers && \
+	    mkdir -p $(CURDIR)/debian/tmp/usr/lib/python-support/python-wmi/$$pyvers ;\
+	    make pywmi-build PYTHON=$$pyvers PYLIBDIR=/usr/lib/  ZENBIN=/usr/bin  ;\
+            make pywmi-installed PYTHON=$$pyvers ZENBIN=/usr/bin DESTDIR=$(CURDIR)/debian/tmp \
+                                 PYLIBDIR=/usr/lib/python-support/python-wmi/$$pyvers ;\
 	    make clean ;\
 	done
 
 	cd pycom; python setup.py build
-
 	touch $@
 
 clean: clean1 unpatch
 clean1:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp build-mingw-stamp build-python-stamp
 
 	#restoring original winexesvc_exe.c_orig if we need to do so
 	-mv winexesvc_exe.c_orig Samba/source/winexe/winexesvc/winexesvc_exe.c