* demo/xml2doc/image_crop.cc,
* demo/xml2doc/image_crop.hh,
* demo/xml2doc/loader.cc,
* demo/xml2doc/loader.hh,
* demo/xml2doc/xml_transform.cc,
* demo/xml2doc/xml_transform.hh: Here.
---
scribo/ChangeLog | 11 +++++++++++
scribo/demo/xml2doc/image_crop.cc | 9 ---------
scribo/demo/xml2doc/image_crop.hh | 17 ++++-------------
scribo/demo/xml2doc/loader.cc | 9 ---------
scribo/demo/xml2doc/loader.hh | 15 +++------------
scribo/demo/xml2doc/xml_transform.cc | 9 ---------
scribo/demo/xml2doc/xml_transform.hh | 17 ++++-------------
7 files changed, 22 insertions(+), 65 deletions(-)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 25eee44..579f31e 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,5 +1,16 @@
2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Fix guards and license in xml2doc.
+
+ * demo/xml2doc/image_crop.cc,
+ * demo/xml2doc/image_crop.hh,
+ * demo/xml2doc/loader.cc,
+ * demo/xml2doc/loader.hh,
+ * demo/xml2doc/xml_transform.cc,
+ * demo/xml2doc/xml_transform.hh: Here.
+
+2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Get rid of xml_transform.sh and handle xsl files location after
installation.
diff --git a/scribo/demo/xml2doc/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc
index f439d8e..29a93d8 100644
--- a/scribo/demo/xml2doc/image_crop.cc
+++ b/scribo/demo/xml2doc/image_crop.cc
@@ -13,15 +13,6 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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.
#include <limits.h>
diff --git a/scribo/demo/xml2doc/image_crop.hh b/scribo/demo/xml2doc/image_crop.hh
index ec2f9a2..2856c35 100644
--- a/scribo/demo/xml2doc/image_crop.hh
+++ b/scribo/demo/xml2doc/image_crop.hh
@@ -13,18 +13,9 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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 IMAGE_CROP_HH
-# define IMAGE_CROP_HH
+
+#ifndef SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH
+# define SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH
# include <QDomDocument>
# include <QtCore>
@@ -60,4 +51,4 @@ private:
mln::image2d<mln::value::rgb8> ima_;
};
-#endif /* !IMAGE_CROP_HH */
+#endif // ! SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH
diff --git a/scribo/demo/xml2doc/loader.cc b/scribo/demo/xml2doc/loader.cc
index c5527fd..91caad6 100644
--- a/scribo/demo/xml2doc/loader.cc
+++ b/scribo/demo/xml2doc/loader.cc
@@ -13,15 +13,6 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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.
# include "loader.hh"
diff --git a/scribo/demo/xml2doc/loader.hh b/scribo/demo/xml2doc/loader.hh
index a66af2d..6547a0d 100644
--- a/scribo/demo/xml2doc/loader.hh
+++ b/scribo/demo/xml2doc/loader.hh
@@ -13,18 +13,9 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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 LOADER_HH
-# define LOADER_HH
+#ifndef SCRIBO_DEMO_XML2DOC_LOADER_HH
+# define SCRIBO_DEMO_XML2DOC_LOADER_HH
# include <QtCore>
# include <QDomDocument>
@@ -48,4 +39,4 @@ class Loader : public QObject
void add_html_templates(bool base64, const QString& output);
};
-#endif /* !LOADER_HH */
+#endif // ! SCRIBO_DEMO_XML2DOC_LOADER_HH
diff --git a/scribo/demo/xml2doc/xml_transform.cc b/scribo/demo/xml2doc/xml_transform.cc
index be5c1e4..366b435 100644
--- a/scribo/demo/xml2doc/xml_transform.cc
+++ b/scribo/demo/xml2doc/xml_transform.cc
@@ -13,15 +13,6 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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.
# include "xml_transform.hh"
# include "image_crop.hh"
diff --git a/scribo/demo/xml2doc/xml_transform.hh b/scribo/demo/xml2doc/xml_transform.hh
index fa22c07..2a73480 100644
--- a/scribo/demo/xml2doc/xml_transform.hh
+++ b/scribo/demo/xml2doc/xml_transform.hh
@@ -13,18 +13,9 @@
//
// You should have received a copy of the GNU General Public License
// along with Olena. If not, see <http://www.gnu.org/licenses/>.
-//
-// As a special exception, you may use this file as part of a free
-// software project 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 XML_TRANFORM_HH
-# define XML_TRANFORM_HH
+
+#ifndef SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH
+# define SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH
# include <QtCore>
@@ -59,5 +50,5 @@ private:
bool tmp_;
};
-#endif // !XML_TRANFORM_HH
+#endif // ! SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH
--
1.5.6.5
#240: Use the installcheck target to run post-installation tests
-------------------------+--------------------------------------------------
Reporter: levill_r | Owner: levill_r
Type: enhancement | Status: new
Priority: major | Milestone: Olena 1.1
Component: Olena | Version: 1.0
Keywords: |
-------------------------+--------------------------------------------------
Automake's `installcheck` target runs install tests (to be executed after
the `install` target). See
http://www.gnu.org/software/automake/manual/html_node/Install-Tests.html.
Such tests are useful, and maybe more relevant than `check` tests, since
they exercise the package in its ''installed'' form, that is, the one seen
by end users.
We should adjust the test suite so that the `installcheck` target runs the
same tests as the `check` target (where applicable), and possibly extra
tests. Every component of Olena should be updated.
--
Ticket URL: <https://trac.lrde.org/olena/ticket/240>
Olena <http://olena.lrde.epita.fr>
Olena, a generic and efficient C++ image processing library.
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch next has been updated
via db3466e6f12fca8d9c92ae661ae0b5d053b8e4ba (commit)
from 47737dc394d2bb22742e7bd2f964bed0cd950648 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
db3466e Clean up Swilena Makefiles.
-----------------------------------------------------------------------
Summary of changes:
swilena/ChangeLog | 9 +++++++++
swilena/python/Makefile.am | 12 +++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform