[ufo-core] 02/04: Imported Upstream version 0.6.0.932
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Dec 2 19:08:46 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository ufo-core.
commit 9f65c2353058db8ece6d154063458cbcbe1fae97
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Mon Dec 2 19:31:58 2013 +0100
Imported Upstream version 0.6.0.932
---
ChangeLog | 15 +++
Makefile.in | 4 +-
configure | 22 ++--
docs/html/annotation-glossary.html | 38 +++---
docs/html/index.sgml | 10 +-
tools/Makefile.am | 16 ++-
tools/Makefile.in | 80 +++++++++----
tools/templates/ufo-cpu-task.c.in | 174 +++++++++++++++++++++++++++
tools/templates/ufo-cpu-task.h.in | 66 +++++++++++
tools/templates/ufo-gpu-task.c.in | 181 +++++++++++++++++++++++++++++
tools/templates/ufo-gpu-task.h.in | 66 +++++++++++
tools/{ufo-mkfilter.py => ufo-mkfilter.in} | 0
12 files changed, 613 insertions(+), 59 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6c4e97c..09b5836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
# Generated by Makefile. Do not edit.
+commit 0709f774738cb21b296047a7a5689aa0bf98121f
+Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
+Date: Mon Dec 2 14:48:43 2013 +0100
+
+ install also templates with the autotools
+
+ - install the templates under $(pkgdatadir)/templates
+ - rename ufo-mkfilter.py -> ufo-mkfilter.in
+
+ tools/CMakeLists.txt | 2 +-
+ tools/Makefile.am | 16 ++++++++-
+ tools/ufo-mkfilter.in | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tools/ufo-mkfilter.py | 94 ---------------------------------------------------
+ 4 files changed, 110 insertions(+), 96 deletions(-)
+
commit f82f47533cec80853211b559e96476bc4ffc594e
Author: Matthias Vogelgesang <matthias.vogelgesang at kit.edu>
Date: Mon Nov 25 09:39:40 2013 +0100
diff --git a/Makefile.in b/Makefile.in
index 6292d39..938f3db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,8 +81,8 @@ subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) AUTHORS COPYING \
ChangeLog NEWS config/compile config/config.guess \
- config/config.sub config/depcomp config/install-sh \
- config/missing config/ltmain.sh $(top_srcdir)/config/compile \
+ config/config.sub config/install-sh config/missing \
+ config/ltmain.sh $(top_srcdir)/config/compile \
$(top_srcdir)/config/config.guess \
$(top_srcdir)/config/config.sub \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
diff --git a/configure b/configure
index d59a151..ca4f5ce 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ufo 0.6.0.931.
+# Generated by GNU Autoconf 2.69 for ufo 0.6.0.932.
#
# Report bugs to <http://ufo.kit.edu/ufo/newticket>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ufo'
PACKAGE_TARNAME='ufo'
-PACKAGE_VERSION='0.6.0.931'
-PACKAGE_STRING='ufo 0.6.0.931'
+PACKAGE_VERSION='0.6.0.932'
+PACKAGE_STRING='ufo 0.6.0.932'
PACKAGE_BUGREPORT='http://ufo.kit.edu/ufo/newticket'
PACKAGE_URL=''
@@ -1392,7 +1392,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ufo 0.6.0.931 to adapt to many kinds of systems.
+\`configure' configures ufo 0.6.0.932 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1462,7 +1462,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ufo 0.6.0.931:";;
+ short | recursive ) echo "Configuration of ufo 0.6.0.932:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1600,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ufo configure 0.6.0.931
+ufo configure 0.6.0.932
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2023,7 +2023,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ufo $as_me 0.6.0.931, which was
+It was created by ufo $as_me 0.6.0.932, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2890,7 +2890,7 @@ fi
# Define the identity of the package.
PACKAGE='ufo'
- VERSION='0.6.0.931'
+ VERSION='0.6.0.932'
cat >>confdefs.h <<_ACEOF
@@ -3043,7 +3043,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define VREV 931
+#define VREV 932
_ACEOF
version_info="6:0:6"
@@ -14107,7 +14107,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ufo $as_me 0.6.0.931, which was
+This file was extended by ufo $as_me 0.6.0.932, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14173,7 +14173,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ufo config.status 0.6.0.931
+ufo config.status 0.6.0.932
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/docs/html/annotation-glossary.html b/docs/html/annotation-glossary.html
index c162695..a553bc6 100644
--- a/docs/html/annotation-glossary.html
+++ b/docs/html/annotation-glossary.html
@@ -20,44 +20,44 @@
<td> </td>
</tr>
<tr><td colspan="5" class="shortcuts">
-<a class="shortcut" href="#glsA">A</a>
+<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsT">T</a>
- |
- <a class="shortcut" href="#glsE">E</a>
+ <a class="shortcut" href="#glsI">I</a>
|
<a class="shortcut" href="#glsO">O</a>
|
- <a class="shortcut" href="#glsI">I</a>
- |
<a class="shortcut" href="#glsT">T</a>
|
+ <a class="shortcut" href="#glsE">E</a>
+ |
+ <a class="shortcut" href="#glsA">A</a>
+ |
<a class="shortcut" href="#glsS">S</a>
</td></tr>
</table>
<div class="glossary">
<div class="titlepage"><div><div><h1 class="title">
<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
-<a name="glsA"></a><h3 class="title">A</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
-<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
-<dd class="glossdef"><p>Free data after the code is done.</p></dd>
-<a name="glsE"></a><h3 class="title">E</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
-<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
-<a name="glsO"></a><h3 class="title">O</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
-<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
+<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
<a name="glsI"></a><h3 class="title">I</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-in"></a>in</span></dt>
<dd class="glossdef"><p>Parameter for input. Default is <acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>.</p></dd>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
-<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
-<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
+<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
<a name="glsS"></a><h3 class="title">S</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
diff --git a/docs/html/index.sgml b/docs/html/index.sgml
index 38d556e..d2f3240 100644
--- a/docs/html/index.sgml
+++ b/docs/html/index.sgml
@@ -495,11 +495,11 @@
<ANCHOR id="zmq-msg-send" href="Ufo/Ufo-zmq-shim.html#zmq-msg-send">
<ANCHOR id="zmq-msg-recv" href="Ufo/Ufo-zmq-shim.html#zmq-msg-recv">
<ANCHOR id="ZMQ-POLL-MSEC:CAPS" href="Ufo/Ufo-zmq-shim.html#ZMQ-POLL-MSEC:CAPS">
-<ANCHOR id="annotation-glossterm-allow-none" href="Ufo/annotation-glossary.html#annotation-glossterm-allow-none">
-<ANCHOR id="annotation-glossterm-transfer full" href="Ufo/annotation-glossary.html#annotation-glossterm-transfer full">
-<ANCHOR id="annotation-glossterm-element-type" href="Ufo/annotation-glossary.html#annotation-glossterm-element-type">
-<ANCHOR id="annotation-glossterm-out" href="Ufo/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-transfer none" href="Ufo/annotation-glossary.html#annotation-glossterm-transfer none">
<ANCHOR id="annotation-glossterm-in" href="Ufo/annotation-glossary.html#annotation-glossterm-in">
+<ANCHOR id="annotation-glossterm-out" href="Ufo/annotation-glossary.html#annotation-glossterm-out">
<ANCHOR id="annotation-glossterm-transfer container" href="Ufo/annotation-glossary.html#annotation-glossterm-transfer container">
-<ANCHOR id="annotation-glossterm-transfer none" href="Ufo/annotation-glossary.html#annotation-glossterm-transfer none">
+<ANCHOR id="annotation-glossterm-transfer full" href="Ufo/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-element-type" href="Ufo/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-allow-none" href="Ufo/annotation-glossary.html#annotation-glossterm-allow-none">
<ANCHOR id="annotation-glossterm-scope call" href="Ufo/annotation-glossary.html#annotation-glossterm-scope call">
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b40111..136708d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,7 +7,21 @@ bin_PROGRAMS=ufo-runjson ufod
ufo_runjson_SOURCES = runjson.c
-dist_bin_SCRIPTS = ufo-mkfilter.py
+ufotemplatesdir=$(pkgdatadir)/templates
+
+dist_ufotemplates_DATA=\
+ templates/ufo-cpu-task.c.in \
+ templates/ufo-cpu-task.h.in \
+ templates/ufo-gpu-task.c.in \
+ templates/ufo-gpu-task.h.in
+
+nodist_bin_SCRIPTS = ufo-mkfilter
+ufo-mkfilter: ufo-mkfilter.in
+ sed -e 's![@]UFO_FILTER_TEMPLATE_DIR[@]!$(ufotemplatesdir)!g' $(srcdir)/ufo-mkfilter.in > $@
+
+EXTRA_DIST = ufo-mkfilter.in
+
+CLEANFILES = ufo-mkfilter
# Support for GNU Flymake, in Emacs.
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6261e87..70620bb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,6 +15,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -82,7 +83,7 @@ host_triplet = @host@
bin_PROGRAMS = ufo-runjson$(EXEEXT) ufod$(EXEEXT)
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_bin_SCRIPTS) $(top_srcdir)/config/depcomp
+ $(top_srcdir)/config/depcomp $(dist_ufotemplates_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -94,7 +95,8 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/autotools/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(ufotemplatesdir)"
PROGRAMS = $(bin_PROGRAMS)
am_ufo_runjson_OBJECTS = runjson.$(OBJEXT)
ufo_runjson_OBJECTS = $(am_ufo_runjson_OBJECTS)
@@ -140,7 +142,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-SCRIPTS = $(dist_bin_SCRIPTS)
+SCRIPTS = $(nodist_bin_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -182,6 +184,7 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+DATA = $(dist_ufotemplates_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -367,7 +370,16 @@ LDADD = $(top_builddir)/ufo/libufo.la \
$(GLIB_LIBS) $(JSON_GLIB_LIBS) $(ZMQ3_LIBS) $(OPENCL_LIBS)
ufo_runjson_SOURCES = runjson.c
-dist_bin_SCRIPTS = ufo-mkfilter.py
+ufotemplatesdir = $(pkgdatadir)/templates
+dist_ufotemplates_DATA = \
+ templates/ufo-cpu-task.c.in \
+ templates/ufo-cpu-task.h.in \
+ templates/ufo-gpu-task.c.in \
+ templates/ufo-gpu-task.h.in
+
+nodist_bin_SCRIPTS = ufo-mkfilter
+EXTRA_DIST = ufo-mkfilter.in
+CLEANFILES = ufo-mkfilter
all: all-am
.SUFFIXES:
@@ -459,9 +471,9 @@ ufo-runjson$(EXEEXT): $(ufo_runjson_OBJECTS) $(ufo_runjson_DEPENDENCIES) $(EXTRA
ufod$(EXEEXT): $(ufod_OBJECTS) $(ufod_DEPENDENCIES) $(EXTRA_ufod_DEPENDENCIES)
@rm -f ufod$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ufod_OBJECTS) $(ufod_LDADD) $(LIBS)
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
@$(NORMAL_INSTALL)
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
@@ -488,9 +500,9 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
} \
; done
-uninstall-dist_binSCRIPTS:
+uninstall-nodist_binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
@@ -530,6 +542,27 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-dist_ufotemplatesDATA: $(dist_ufotemplates_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_ufotemplates_DATA)'; test -n "$(ufotemplatesdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(ufotemplatesdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(ufotemplatesdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ufotemplatesdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(ufotemplatesdir)" || exit $$?; \
+ done
+
+uninstall-dist_ufotemplatesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_ufotemplates_DATA)'; test -n "$(ufotemplatesdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(ufotemplatesdir)'; $(am__uninstall_files_from_dir)
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -615,9 +648,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(ufotemplatesdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -642,6 +675,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -672,13 +706,13 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-dist_ufotemplatesDATA
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS
+install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
install-html: install-html-am
@@ -718,7 +752,8 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_ufotemplatesDATA \
+ uninstall-nodist_binSCRIPTS
.MAKE: install-am install-strip
@@ -727,16 +762,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dist_binSCRIPTS \
+ install-data install-data-am install-dist_ufotemplatesDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
-
+ install-man install-nodist_binSCRIPTS install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-dist_ufotemplatesDATA uninstall-nodist_binSCRIPTS
+
+ufo-mkfilter: ufo-mkfilter.in
+ sed -e 's![@]UFO_FILTER_TEMPLATE_DIR[@]!$(ufotemplatesdir)!g' $(srcdir)/ufo-mkfilter.in > $@
# Support for GNU Flymake, in Emacs.
diff --git a/tools/templates/ufo-cpu-task.c.in b/tools/templates/ufo-cpu-task.c.in
new file mode 100644
index 0000000..1007dd5
--- /dev/null
+++ b/tools/templates/ufo-cpu-task.c.in
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2011-2013 Karlsruhe Institute of Technology
+ *
+ * This file is part of Ufo.
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ufo-{{hyphenated}}-task.h"
+
+/**
+ * SECTION:ufo-{{hyphenated}}-task
+ * @Short_description: Write TIFF files
+ * @Title: {{underscored}}
+ *
+ */
+
+struct _Ufo{{camelcased}}TaskPrivate {
+ gboolean foo;
+};
+
+static void ufo_task_interface_init (UfoTaskIface *iface);
+static void ufo_cpu_task_interface_init (UfoCpuTaskIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (Ufo{{camelcased}}Task, ufo_{{underscored}}_task, UFO_TYPE_TASK_NODE,
+ G_IMPLEMENT_INTERFACE (UFO_TYPE_TASK,
+ ufo_task_interface_init)
+ G_IMPLEMENT_INTERFACE (UFO_TYPE_CPU_TASK,
+ ufo_cpu_task_interface_init))
+
+#define UFO_{{uppercased}}_TASK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskPrivate))
+
+enum {
+ PROP_0,
+ PROP_TEST,
+ N_PROPERTIES
+};
+
+static GParamSpec *properties[N_PROPERTIES] = { NULL, };
+
+UfoNode *
+ufo_{{underscored}}_task_new (void)
+{
+ return UFO_NODE (g_object_new (UFO_TYPE_{{uppercased}}_TASK, NULL));
+}
+
+static void
+ufo_{{underscored}}_task_setup (UfoTask *task,
+ UfoResources *resources,
+ GError **error)
+{
+}
+
+static void
+ufo_{{underscored}}_task_get_requisition (UfoTask *task,
+ UfoBuffer **inputs,
+ UfoRequisition *requisition)
+{
+ requisition->n_dims = 0;
+}
+
+static void
+ufo_{{underscored}}_task_get_structure (UfoTask *task,
+ guint *n_inputs,
+ UfoInputParam **in_params,
+ UfoTaskMode *mode)
+{
+ *mode = UFO_TASK_MODE_SINGLE;
+ *n_inputs = 1;
+ *in_params = g_new0 (UfoInputParam, 1);
+ (*in_params)[0].n_dims = 2;
+}
+
+static gboolean
+ufo_{{underscored}}_task_process (UfoCpuTask *task,
+ UfoBuffer **inputs,
+ UfoBuffer *output,
+ UfoRequisition *requisition)
+{
+ return TRUE;
+}
+
+static void
+ufo_{{underscored}}_task_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ Ufo{{camelcased}}TaskPrivate *priv = UFO_{{uppercased}}_TASK_GET_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_TEST:
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+ufo_{{underscored}}_task_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ Ufo{{camelcased}}TaskPrivate *priv = UFO_{{uppercased}}_TASK_GET_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_TEST:
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+ufo_{{underscored}}_task_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (ufo_{{underscored}}_task_parent_class)->finalize (object);
+}
+
+static void
+ufo_task_interface_init (UfoTaskIface *iface)
+{
+ iface->setup = ufo_{{underscored}}_task_setup;
+ iface->get_structure = ufo_{{underscored}}_task_get_structure;
+ iface->get_requisition = ufo_{{underscored}}_task_get_requisition;
+}
+
+static void
+ufo_cpu_task_interface_init (UfoCpuTaskIface *iface)
+{
+ iface->process = ufo_{{underscored}}_task_process;
+}
+
+static void
+ufo_{{underscored}}_task_class_init (Ufo{{camelcased}}TaskClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->set_property = ufo_{{underscored}}_task_set_property;
+ gobject_class->get_property = ufo_{{underscored}}_task_get_property;
+ gobject_class->finalize = ufo_{{underscored}}_task_finalize;
+
+ properties[PROP_TEST] =
+ g_param_spec_string ("test",
+ "Test property nick",
+ "Test property description blurb",
+ "",
+ G_PARAM_READWRITE);
+
+ for (guint i = PROP_0 + 1; i < N_PROPERTIES; i++)
+ g_object_class_install_property (gobject_class, i, properties[i]);
+
+ g_type_class_add_private (gobject_class, sizeof(Ufo{{camelcased}}TaskPrivate));
+}
+
+static void
+ufo_{{underscored}}_task_init(Ufo{{camelcased}}Task *self)
+{
+ self->priv = UFO_{{uppercased}}_TASK_GET_PRIVATE(self);
+}
diff --git a/tools/templates/ufo-cpu-task.h.in b/tools/templates/ufo-cpu-task.h.in
new file mode 100644
index 0000000..5102ca2
--- /dev/null
+++ b/tools/templates/ufo-cpu-task.h.in
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011-2013 Karlsruhe Institute of Technology
+ *
+ * This file is part of Ufo.
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __UFO_{{uppercased}}_TASK_H
+#define __UFO_{{uppercased}}_TASK_H
+
+#include <ufo/ufo.h>
+
+G_BEGIN_DECLS
+
+#define UFO_TYPE_{{uppercased}}_TASK (ufo_{{underscored}}_task_get_type())
+#define UFO_{{uppercased}}_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}Task))
+#define UFO_IS_{{uppercased}}_TASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UFO_TYPE_{{uppercased}}_TASK))
+#define UFO_{{uppercased}}_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskClass))
+#define UFO_IS_{{uppercased}}_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), UFO_TYPE_{{uppercased}}_TASK))
+#define UFO_{{uppercased}}_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskClass))
+
+typedef struct _Ufo{{camelcased}}Task Ufo{{camelcased}}Task;
+typedef struct _Ufo{{camelcased}}TaskClass Ufo{{camelcased}}TaskClass;
+typedef struct _Ufo{{camelcased}}TaskPrivate Ufo{{camelcased}}TaskPrivate;
+
+/**
+ * Ufo{{camelcased}}Task:
+ *
+ * [ADD DESCRIPTION HERE]. The contents of the #Ufo{{camelcased}}Task structure
+ * are private and should only be accessed via the provided API.
+ */
+struct _Ufo{{camelcased}}Task {
+ /*< private >*/
+ UfoTaskNode parent_instance;
+
+ Ufo{{camelcased}}TaskPrivate *priv;
+};
+
+/**
+ * Ufo{{camelcased}}TaskClass:
+ *
+ * #Ufo{{camelcased}}Task class
+ */
+struct _Ufo{{camelcased}}TaskClass {
+ /*< private >*/
+ UfoTaskNodeClass parent_class;
+};
+
+UfoNode *ufo_{{underscored}}_task_new (void);
+GType ufo_{{underscored}}_task_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/tools/templates/ufo-gpu-task.c.in b/tools/templates/ufo-gpu-task.c.in
new file mode 100644
index 0000000..c5593df
--- /dev/null
+++ b/tools/templates/ufo-gpu-task.c.in
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2011-2013 Karlsruhe Institute of Technology
+ *
+ * This file is part of Ufo.
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
+#include <CL/cl.h>
+#endif
+
+#include "ufo-{{hyphenated}}-task.h"
+
+/**
+ * SECTION:ufo-{{hyphenated}}-task
+ * @Short_description: Write TIFF files
+ * @Title: {{underscored}}
+ *
+ */
+
+struct _Ufo{{camelcased}}TaskPrivate {
+ gboolean foo;
+};
+
+static void ufo_task_interface_init (UfoTaskIface *iface);
+static void ufo_gpu_task_interface_init (UfoGpuTaskIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (Ufo{{camelcased}}Task, ufo_{{underscored}}_task, UFO_TYPE_TASK_NODE,
+ G_IMPLEMENT_INTERFACE (UFO_TYPE_TASK,
+ ufo_task_interface_init)
+ G_IMPLEMENT_INTERFACE (UFO_TYPE_GPU_TASK,
+ ufo_gpu_task_interface_init))
+
+#define UFO_{{uppercased}}_TASK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskPrivate))
+
+enum {
+ PROP_0,
+ PROP_TEST,
+ N_PROPERTIES
+};
+
+static GParamSpec *properties[N_PROPERTIES] = { NULL, };
+
+UfoNode *
+ufo_{{underscored}}_task_new (void)
+{
+ return UFO_NODE (g_object_new (UFO_TYPE_{{uppercased}}_TASK, NULL));
+}
+
+static void
+ufo_{{underscored}}_task_setup (UfoTask *task,
+ UfoResources *resources,
+ GError **error)
+{
+}
+
+static void
+ufo_{{underscored}}_task_get_requisition (UfoTask *task,
+ UfoBuffer **inputs,
+ UfoRequisition *requisition)
+{
+ requisition->n_dims = 0;
+}
+
+static void
+ufo_{{underscored}}_task_get_structure (UfoTask *task,
+ guint *n_inputs,
+ UfoInputParam **in_params,
+ UfoTaskMode *mode)
+{
+ *mode = UFO_TASK_MODE_SINGLE;
+ *n_inputs = 1;
+ *in_params = g_new0 (UfoInputParam, 1);
+ (*in_params)[0].n_dims = 2;
+}
+
+static gboolean
+ufo_{{underscored}}_task_process (UfoGpuTask *task,
+ UfoBuffer **inputs,
+ UfoBuffer *output,
+ UfoRequisition *requisition,
+ UfoGpuNode *node)
+{
+ return TRUE;
+}
+
+static void
+ufo_{{underscored}}_task_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ Ufo{{camelcased}}TaskPrivate *priv = UFO_{{uppercased}}_TASK_GET_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_TEST:
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+ufo_{{underscored}}_task_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ Ufo{{camelcased}}TaskPrivate *priv = UFO_{{uppercased}}_TASK_GET_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_TEST:
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+ufo_{{underscored}}_task_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (ufo_{{underscored}}_task_parent_class)->finalize (object);
+}
+
+static void
+ufo_task_interface_init (UfoTaskIface *iface)
+{
+ iface->setup = ufo_{{underscored}}_task_setup;
+ iface->get_structure = ufo_{{underscored}}_task_get_structure;
+ iface->get_requisition = ufo_{{underscored}}_task_get_requisition;
+}
+
+static void
+ufo_gpu_task_interface_init (UfoGpuTaskIface *iface)
+{
+ iface->process = ufo_{{underscored}}_task_process;
+}
+
+static void
+ufo_{{underscored}}_task_class_init (Ufo{{camelcased}}TaskClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->set_property = ufo_{{underscored}}_task_set_property;
+ gobject_class->get_property = ufo_{{underscored}}_task_get_property;
+ gobject_class->finalize = ufo_{{underscored}}_task_finalize;
+
+ properties[PROP_TEST] =
+ g_param_spec_string ("test",
+ "Test property nick",
+ "Test property description blurb",
+ "",
+ G_PARAM_READWRITE);
+
+ for (guint i = PROP_0 + 1; i < N_PROPERTIES; i++)
+ g_object_class_install_property (gobject_class, i, properties[i]);
+
+ g_type_class_add_private (gobject_class, sizeof(Ufo{{camelcased}}TaskPrivate));
+}
+
+static void
+ufo_{{underscored}}_task_init(Ufo{{camelcased}}Task *self)
+{
+ self->priv = UFO_{{uppercased}}_TASK_GET_PRIVATE(self);
+}
diff --git a/tools/templates/ufo-gpu-task.h.in b/tools/templates/ufo-gpu-task.h.in
new file mode 100644
index 0000000..5102ca2
--- /dev/null
+++ b/tools/templates/ufo-gpu-task.h.in
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011-2013 Karlsruhe Institute of Technology
+ *
+ * This file is part of Ufo.
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __UFO_{{uppercased}}_TASK_H
+#define __UFO_{{uppercased}}_TASK_H
+
+#include <ufo/ufo.h>
+
+G_BEGIN_DECLS
+
+#define UFO_TYPE_{{uppercased}}_TASK (ufo_{{underscored}}_task_get_type())
+#define UFO_{{uppercased}}_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}Task))
+#define UFO_IS_{{uppercased}}_TASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UFO_TYPE_{{uppercased}}_TASK))
+#define UFO_{{uppercased}}_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskClass))
+#define UFO_IS_{{uppercased}}_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), UFO_TYPE_{{uppercased}}_TASK))
+#define UFO_{{uppercased}}_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), UFO_TYPE_{{uppercased}}_TASK, Ufo{{camelcased}}TaskClass))
+
+typedef struct _Ufo{{camelcased}}Task Ufo{{camelcased}}Task;
+typedef struct _Ufo{{camelcased}}TaskClass Ufo{{camelcased}}TaskClass;
+typedef struct _Ufo{{camelcased}}TaskPrivate Ufo{{camelcased}}TaskPrivate;
+
+/**
+ * Ufo{{camelcased}}Task:
+ *
+ * [ADD DESCRIPTION HERE]. The contents of the #Ufo{{camelcased}}Task structure
+ * are private and should only be accessed via the provided API.
+ */
+struct _Ufo{{camelcased}}Task {
+ /*< private >*/
+ UfoTaskNode parent_instance;
+
+ Ufo{{camelcased}}TaskPrivate *priv;
+};
+
+/**
+ * Ufo{{camelcased}}TaskClass:
+ *
+ * #Ufo{{camelcased}}Task class
+ */
+struct _Ufo{{camelcased}}TaskClass {
+ /*< private >*/
+ UfoTaskNodeClass parent_class;
+};
+
+UfoNode *ufo_{{underscored}}_task_new (void);
+GType ufo_{{underscored}}_task_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/tools/ufo-mkfilter.py b/tools/ufo-mkfilter.in
similarity index 100%
rename from tools/ufo-mkfilter.py
rename to tools/ufo-mkfilter.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ufo-core.git
More information about the debian-science-commits
mailing list