From 295f6a51457153c04be00754836094fb116756de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Tue, 3 Jan 2017 16:21:51 +0100 Subject: [PATCH] cleanup: removes legacy-named file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The file include/afb/afb-plugin.h was kept for compatibility with previous versions. Change-Id: If144803b5f56e9828ec78de5279520319bbc3342 Signed-off-by: José Bollo --- CMakeLists.txt | 18 ++++++++++++++++ bindings/CMakeLists.txt | 18 ++++++++++++++++ bindings/intrinsics/CMakeLists.txt | 18 ++++++++++++++++ bindings/samples/CMakeLists.txt | 18 ++++++++++++++++ include/CMakeLists.txt | 18 ++++++++++++++++ include/afb/afb-plugin.h | 43 -------------------------------------- src/CMakeLists.txt | 18 ++++++++++++++++ 7 files changed, 108 insertions(+), 43 deletions(-) delete mode 100644 include/afb/afb-plugin.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ec58293..8f4b9919 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + PROJECT(afb-daemon C) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 8dbb9180..490e29aa 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,2 +1,20 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + ADD_SUBDIRECTORY(samples) ADD_SUBDIRECTORY(intrinsics) diff --git a/bindings/intrinsics/CMakeLists.txt b/bindings/intrinsics/CMakeLists.txt index c6ff8ef4..f6fc17b3 100644 --- a/bindings/intrinsics/CMakeLists.txt +++ b/bindings/intrinsics/CMakeLists.txt @@ -1,3 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + INCLUDE_DIRECTORIES(${include_dirs}) diff --git a/bindings/samples/CMakeLists.txt b/bindings/samples/CMakeLists.txt index 59a9a449..5662ac12 100644 --- a/bindings/samples/CMakeLists.txt +++ b/bindings/samples/CMakeLists.txt @@ -1,3 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + INCLUDE_DIRECTORIES(${include_dirs}) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 5b0114de..863e704d 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,19 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + INSTALL(DIRECTORY afb DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}) diff --git a/include/afb/afb-plugin.h b/include/afb/afb-plugin.h deleted file mode 100644 index 02d53143..00000000 --- a/include/afb/afb-plugin.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2016, 2017 "IoT.bzh" - * Author: José Bollo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#pragma GCC warning "\n\n This header file is OBSOLETE.\n\ - It is provided for COMPATIBILITY ONLY.\n\n\ - Please USE and ADAPT YOUR CODE to new names.\n" - -#if defined(NO_PLUGIN_VERBOSE_MACRO) -# define NO_BINDING_VERBOSE_MACRO -#endif - -#if defined(NO_PLUGIN_FILE_LINE_INDICATION) -# define NO_BINDING_FILE_LINE_INDICATION -#endif - -#include "afb-binding.h" - -#define AFB_plugin_version afb_binding_type -#define AFB_PLUGIN_VERSION_1 AFB_BINDING_VERSION_1 -#define AFB_plugin_desc_v1 afb_binding_desc_v1 -#define AFB_plugin afb_binding -#define AFB_interface afb_binding_interface -#define pluginAfbV1Register afbBindingV1Register -#define AFB_Mode afb_mode -#define AFB_session_v1 afb_session_v1 -#define AFB_verb_desc_v1 afb_verb_desc_v1 - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d396aef9..80d09bfe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: José Bollo +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) message(FATAL_ERROR "Require at least gcc-4.9") endif(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) -- 2.16.6