[SCM] ardour3/master: Drop CDBS's waf class

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed Mar 20 00:38:06 UTC 2013


The following commit has been merged in the master branch:
commit e54d68dc70c00b7ae3be40d343adc9c4afffd281
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Mar 20 00:26:27 2013 +0100

    Drop CDBS's waf class
    
    Since we use waf-light now, the CDBS class doesn't work anymore.
    Let's borrow the code from jackd2 which manually invokes waf-light.

diff --git a/debian/rules b/debian/rules
index edaabf1..847ce0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,12 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-include /usr/share/cdbs/1/class/langcore.mk
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/utils.mk
+-include /usr/share/cdbs/1/rules/upstream-tarball.mk
+-include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/waf.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+
 
 DEB_CLEAN_EXCLUDE=debian/tmp
 DEB_DESTDIR = $(CURDIR)/debian/tmp/
@@ -33,12 +34,41 @@ endif
 
 LD_LIBRARY_PATH += :$(DEB_DESTDIR)/usr/lib/ardour3/
 
-clean::
-	rm -f autowaf.pyc
+waf_configure_options = --lv2 --lxvst --freedesktop --configdir=/etc/ --noconfirm --prefix=/usr/
 
-cdbs_waf_configure_options = --lv2 --lxvst --freedesktop --configdir=/etc/ --noconfirm
+DEB_MAKE_INVOKE = ./waf-light -v --destdir=$(CURDIR)/debian/tmp
+DEB_MAKE_INSTALL_TARGET = install
 
 
+clean::
+	rm -f autowaf.pyc
+	rm -f .lock-wscript .lock-waf_linux2_build
+	find waflib -name "*.pyc" -delete || true
+	rm -rf build
+	rm -f \
+		gtk2_ardour/version.cc\
+		gtk2_ardour/version.h\
+		libs/ardour/ardour/version.h\
+		libs/ardour/config_text.cc\
+		libs/ardour/svn_revision.cc\
+		libs/ardour/version.cc\
+		libs/gtkmm2ext/gtkmm2ext/version.h\
+		libs/gtkmm2ext/version.cc\
+		libs/midi++2/midi++/version.h\
+		libs/midi++2/version.cc\
+		libs/pbd/pbd/version.h\
+		libs/pbd/version.cc
+
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: debian/stamp-waf-configure
+debian/stamp-waf-configure:
+	chmod +x ./waf-light
+	./waf-light configure $(waf-configure-options)
+	touch $@
+clean::
+	rm -f debian/stamp-waf-configure
+
 # Needed at build time
 # (separated in build tools, core, Glib/GTK and audio dependencies)
 CDBS_BUILD_DEPENDS += , gettext,\

-- 
ardour3 packaging



More information about the pkg-multimedia-commits mailing list