r43869 - in /packages/fenics/syfi/trunk/debian: cdbs/1/class/ changelog control rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Mon Sep  5 10:41:21 2011
New Revision: 43869

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43869
Log:
Switch to cmake.

Removed:
    packages/fenics/syfi/trunk/debian/cdbs/1/class/
Modified:
    packages/fenics/syfi/trunk/debian/changelog
    packages/fenics/syfi/trunk/debian/control
    packages/fenics/syfi/trunk/debian/rules

Modified: packages/fenics/syfi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/changelog?rev=43869&op=diff
==============================================================================
--- packages/fenics/syfi/trunk/debian/changelog (original)
+++ packages/fenics/syfi/trunk/debian/changelog Mon Sep  5 10:41:21 2011
@@ -15,6 +15,10 @@
   * Build for all supported Python versions.
   * Rename binary package syfi-bin to sfc.
   * Rename binary package python-syfi0 to python-syfi.
+  * Switch from SCons to CMake:
+    - Replace scons with cmake in Build-Depends in debian/control.
+    - Remove custom cdbs class for SCons.
+    - Update debian/rules to build with CMake.
 
  -- Johannes Ring <johannr at simula.no>  Fri, 02 Sep 2011 13:40:57 +0200
 

Modified: packages/fenics/syfi/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/control?rev=43869&op=diff
==============================================================================
--- packages/fenics/syfi/trunk/debian/control (original)
+++ packages/fenics/syfi/trunk/debian/control Mon Sep  5 10:41:21 2011
@@ -6,7 +6,7 @@
 Build-Depends: cdbs (>= 0.4.90~),
  debhelper (>= 7),
  python-all-dev (>= 2.6.6-3~),
- scons,
+ cmake,
  swig,
  libginac-dev,
  pkg-config,

Modified: packages/fenics/syfi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/rules?rev=43869&op=diff
==============================================================================
--- packages/fenics/syfi/trunk/debian/rules (original)
+++ packages/fenics/syfi/trunk/debian/rules Mon Sep  5 10:41:21 2011
@@ -6,33 +6,26 @@
   DEB_COPYRIGHT_CHECK_STRICT = yes
 endif
 
-include debian/cdbs/1/rules/copyright-check.mk
-include debian/cdbs/1/class/scons.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_COMPRESS_EXCLUDE := .py .cpp .h .pdf
 DEB_INSTALL_DOCS_ALL += AUTHORS README TODO
-DEB_SCONS_OPTIONS = prefix=/usr
 
-# Enable parallel building
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
-    PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
-        sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
-NJOBS := -j$(PARALLEL_JOBS)
-endif
-
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-
-DEB_SCONS_BUILD_OPTIONS = $(NJOBS)
-
-DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
+DEB_CMAKE_EXTRA_FLAGS= \
+	-D BUILD_SHARED_LIBS:BOOL=ON \
+	-D CMAKE_SKIP_RPATH:BOOL=ON \
+	-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
+	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
+	..
 
 USCAN_DESTDIR := $(CURDIR)
 
 PY_VERSIONS = $(shell pyversions --requested debian/control | tac -s' ')
 
 install-stamp-%:
-	cd $(DEB_BUILDDIR); rm -rf scons/{options.cache,pkgconfig} && \
+	cd $(DEB_BUILDDIR) && rm CMakeCache.txt && \
 	  cmake -D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$* \
 	    -D PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$*.so \
 	    -D PYTHON_INCLUDE_DIR:PATH=/usr/include/$* \
@@ -40,44 +33,16 @@
 	make -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
 
-install/python-dolfin:: $(addprefix install-stamp-, $(PY_VERSIONS))
-
-clean::
-	find syfi -name "*.os" | xargs rm -f
-	find syfi -name "*.so*" | xargs rm -f
-	find scons -name "*.pyc" | xargs rm -f
-	rm -rf .sconf_temp
-	rm -f scons/.sconsign.dblite
-	rm -f scons/configure.log
-	rm -f scons/options.cache
-	rm -rf scons/pkgconfig
-	rm -f simula_scons.log
-	rm -f syfi.conf
-	rm -f syfi/scons.cfg
-	rm -f syfi/swig/SyFi.i
-	rm -f syfi/swig/SyFi.py
-	rm -f syfi/swig/SyFi_wrap.cc
-	rm -f syfi/syfi_version.h
-
-# Generate pkg-config file for SyFi based on pkg-config files 
-# in scons/pkgconfig:
-install/libsyfi0-dev::
-	cd $(DEB_DESTDIR)/usr/lib/pkgconfig && \
-	for req in `grep "^Requires:" syfi.pc | cut -d':' -f2`; \
-	do \
-	  if [ -e $$req.pc ]; \
-	  then \
-	    sed -i "/^Libs/s|$$|`PKG_CONFIG_PATH=$$PWD pkg-config $$req --libs` |" syfi.pc; \
-	    sed -i "/^Cflags/s|$$|`PKG_CONFIG_PATH=$$PWD pkg-config $$req --cflags` |" syfi.pc; \
-	    sed -i "/^Requires:/s/$$req//g" syfi.pc; \
-	  fi; \
-	done
+install/python-syfi:: $(addprefix install-stamp-, $(PY_VERSIONS))
 
 binary-install/python-syfi::
 	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/sfc::
 	dh_python2 -p$(cdbs_curpkg)
+
+clean::
+	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
 
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')