4 files changed, 18 insertions, 137 deletions
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
deleted file mode 100755
index 759f6be..0000000
--- a/conf.d/autobuild/agl/autobuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015, 2016 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# 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.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
-DEST      := ${BUILD_DIR}/target
-
-.PHONY: all clean distclean configure build package help
-
-all: help
-
-help:
-	@echo "List of targets available:"
-	@echo ""
-	@echo "- all"
-	@echo "- clean"
-	@echo "- distclean"
-	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
-	@echo ""
-	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
-	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
-
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
-
-distclean:
-	@rm -rf ${BUILD_DIR}
-
-configure: ${BUILD_DIR}/Makefile
-
-build: configure
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
-
-package: build
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/data
-	@cmake --build ${BUILD_DIR} --target widget
-	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
-
-${BUILD_DIR}/Makefile:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
deleted file mode 100755
index 759f6be..0000000
--- a/conf.d/autobuild/linux/autobuild
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015, 2016 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# 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.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
-DEST      := ${BUILD_DIR}/target
-
-.PHONY: all clean distclean configure build package help
-
-all: help
-
-help:
-	@echo "List of targets available:"
-	@echo ""
-	@echo "- all"
-	@echo "- clean"
-	@echo "- distclean"
-	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
-	@echo ""
-	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
-	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
-
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
-
-distclean:
-	@rm -rf ${BUILD_DIR}
-
-configure: ${BUILD_DIR}/Makefile
-
-build: configure
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
-
-package: build
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/data
-	@cmake --build ${BUILD_DIR} --target widget
-	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
-
-${BUILD_DIR}/Makefile:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 6d7ace7..0b9515b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -19,17 +19,17 @@
 # Project Info
 # ------------------
 set(PROJECT_NAME agl-service-bluetooth)
-set(PROJECT_VERSION "1.0")
-set(PROJECT_PRETTY_NAME "Bluetooth binding service")
-set(PROJECT_DESCRIPTION "Expose Bluetooth Low Level APIs through AGL Framework")
+set(PROJECT_VERSION "2.0")
+set(PROJECT_PRETTY_NAME "Bluetooth-Manager service")
+set(PROJECT_DESCRIPTION "Interface BlueZ through AGL Framework service")
 set(PROJECT_ICON "icon.png")
-set(PROJECT_AUTHOR "Tasuku Suzuki")
-set(PROJECT_AUTHOR_MAIL "tasuku.suzuki@qt.io")
+set(PROJECT_AUTHOR "Matt Ranostay")
+set(PROJECT_AUTHOR_MAIL "matt.ranostay@konsulko.com")
 set(PROJECT_LICENSE "APL2.0")
 set(PROJECT_LANGUAGES,"C")
+set(API_NAME "Bluetooth-Manager")
 
-# Where are stored the project configuration files
-# relative to the root project directory
+# Where the project configuration files are stored
 set(PROJECT_CMAKE_CONF_DIR "conf.d")
 
 # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 393bd68..feab37b 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -8,17 +8,18 @@
 	<license>@PROJECT_LICENSE@</license>
 
 	<feature name="urn:AGL:widget:required-permission">
-        <param name="urn:AGL:permission::public:hidden" value="required" />
-        <param name="urn:AGL:permission::system:run-by-default" value="required" />
-        <param name="http://tizen.org/privilege/internal/dbus" value="required" />
+		<param name="urn:AGL:permission::public:hidden" value="required" />
+		<param name="urn:AGL:permission::public:no-htdocs" value="required" />
+		<param name="urn:AGL:permission::system:run-by-default" value="required" />
+		<param name="http://tizen.org/privilege/internal/dbus" value="required" />
 	</feature>
 
-    <feature name="urn:AGL:widget:provided-api">
-        <param name="Bluetooth-Manager" value="ws" />
-    </feature>
-
-    <feature name="urn:AGL:widget:required-binding">
-        <param name="@WIDGET_ENTRY_POINT@" value="local" />
-    </feature>
+	<feature name="urn:AGL:widget:provided-api">
+		<param name="Bluetooth-Manager" value="ws" />
+	</feature>
 
+	<feature name="urn:AGL:widget:required-api">
+		<param name="persistence" value="ws" />
+		<param name="@WIDGET_ENTRY_POINT@" value="local" />
+	</feature>
 </widget>