[SCM] Packaging for getfem++ branch, experimental, updated. debian/4.2-1_exp1-1-g1d596c2
Sylvestre Ledru
sylvestre.ledru at scilab-enterprises.com
Sat Nov 17 16:03:00 UTC 2012
The following commit has been merged in the experimental branch:
commit 1d596c278c98989bd2893689802bb25b8a0143bf
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date: Sat Nov 17 17:02:52 2012 +0100
* Build again Scilab module
* Add a missing header for Scilab build
(interface/src/scilab/sci_gateway/c/stream_redirect.h)
diff --git a/debian/changelog b/debian/changelog
index 0f6af81..5ed08ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+getfem++ (4.2-1~exp2) experimental; urgency=low
+
+ * Build again Scilab module
+ * Add a missing header for Scilab build
+ (interface/src/scilab/sci_gateway/c/stream_redirect.h)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 17 Nov 2012 17:01:42 +0100
+
getfem++ (4.2-1~exp1) experimental; urgency=low
* [2cba162] Add libmumps-dev to Depends of libgmm++-dev. (Closes: #680549)
diff --git a/debian/patches/series b/debian/patches/series
index ebc704b..ef89a8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,6 @@ disableXaccess.diff
addgetfempath.diff
ld-no-add-needed.patch
fix_mumps_error.patch
+#inlineequation.diff
+
+stream_redirect.diff
diff --git a/debian/patches/stream_redirect.diff b/debian/patches/stream_redirect.diff
new file mode 100644
index 0000000..e753060
--- /dev/null
+++ b/debian/patches/stream_redirect.diff
@@ -0,0 +1,108 @@
+Index: getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h 2012-11-17 16:54:43.115859494 +0100
+@@ -0,0 +1,103 @@
++/* -*- c++ -*- (enables emacs c++ mode) */
++/*========================================================================
++
++ Copyright (C) 2009-2011 Yann Collette
++
++ This file is a part of GETFEM++
++
++ Getfem++ is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as
++ published by the Free Software Foundation; either version 2.1 of the
++ License, or (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
++ You should have received a copy of the GNU Lesser General Public
++ License along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
++ USA.
++
++ As a special exception, you may use this file as part of a free software
++ library without restriction. Specifically, if other files instantiate
++ templates or use macros or inline functions from this file, or you compile
++ this file and link it with other files to produce an executable, this
++ file does not by itself cause the resulting executable to be covered by
++ the GNU General Public License. This exception does not however
++ invalidate any other reasons why the executable file might be covered by
++ the GNU General Public License.
++
++ ========================================================================*/
++
++#ifndef STREAM_REDIRECT_H
++#define STREAM_REDIRECT_H
++
++#include <sciprint.h>
++
++#include <iostream>
++#include <streambuf>
++#include <string>
++
++//////////////////////////
++// For cout redirection //
++//////////////////////////
++
++class ScilabStream : public std::basic_streambuf<char>
++{
++public:
++ ScilabStream(std::ostream &stream) : m_stream(stream)
++ {
++ m_old_buf = stream.rdbuf();
++ stream.rdbuf(this);
++ }
++ ~ScilabStream()
++ {
++ // output anything that is left
++ if (!m_string.empty())
++ sciprint("symphony: %s\n",m_string.c_str());
++
++ m_stream.rdbuf(m_old_buf);
++ }
++
++protected:
++ virtual int_type overflow(int_type v)
++ {
++ if (v == EOF)
++ {
++ sciprint("symphony: %s\n",m_string.c_str());
++ m_string.clear();
++ }
++ else
++ m_string.push_back(v);
++
++ return v;
++ }
++
++ virtual std::streamsize xsputn(const char *p, std::streamsize n)
++ {
++ m_string.append(p, p + n);
++
++ int pos = 0;
++ while (pos != std::string::npos)
++ {
++ pos = m_string.find(EOF);
++ if (pos != std::string::npos)
++ {
++ std::string tmp(m_string.begin(), m_string.begin() + pos);
++ sciprint("symphony: %s\n",tmp.c_str());
++ m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
++ }
++ }
++
++ return n;
++ }
++
++private:
++ std::ostream &m_stream;
++ std::streambuf *m_old_buf;
++ std::string m_string;
++};
++#endif
++
++
diff --git a/debian/rules b/debian/rules
index cfa76c8..dae5183 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,18 +24,18 @@ export LD_LIBRARY_PATH :=$(LD_LIBRARY_PATH):$(CURDIR)/./src/.libs/
configure_flags= $(CROSS) --prefix=/usr \
--enable-boost --enable-shared --with-pic \
--enable-python \
- --disable-matlab --disable-superlu --disable-scilab\
+ --disable-matlab --disable-superlu --enable-scilab\
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS)"
-#disable_scilab_archs = mips kfreebsd-amd64 kfreebsd-i386 s390x hurd-i386
-#ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_scilab_archs)))
-# configure_flags += --disable-scilab
-#else
-# configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
-#endif
+disable_scilab_archs = mips kfreebsd-amd64 kfreebsd-i386 s390x hurd-i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_scilab_archs)))
+ configure_flags += --disable-scilab
+else
+ configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+endif
disable_muparser_archs = hurd-i386
ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_muparser_archs)))
--
Packaging for getfem++
More information about the debian-science-commits
mailing list