From 2a2f55670cea8d3bfcaf8a64640f3187ddc2b878 Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Thu, 7 Apr 2016 13:39:48 +0200 Subject: [PATCH] [DeviceMotion] Code structure changed to match cordova architecture. Change-Id: Ifa81b9b708b8c1abea9d71333776b4f8d565928f Signed-off-by: Pawel Andruszkiewicz --- src/cordova-api.gyp | 1 - src/devicemotion/cordova_devicemotion.gyp | 25 ------------ .../cordova_devicemotion_extension.cc | 39 ------------------- .../cordova_devicemotion_extension.h | 36 ----------------- src/lib/cordova_plugins.js | 5 +++ .../tizen/Accelerometer.js} | 4 -- 6 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 src/devicemotion/cordova_devicemotion.gyp delete mode 100755 src/devicemotion/cordova_devicemotion_extension.cc delete mode 100755 src/devicemotion/cordova_devicemotion_extension.h rename src/{devicemotion/cordova_devicemotion_api.js => lib/plugins/cordova-plugin-device-motion/tizen/Accelerometer.js} (93%) diff --git a/src/cordova-api.gyp b/src/cordova-api.gyp index e4e0e86..9741543 100644 --- a/src/cordova-api.gyp +++ b/src/cordova-api.gyp @@ -9,7 +9,6 @@ 'type': 'none', 'dependencies': [ 'cordova/cordova.gyp:*', - 'devicemotion/cordova_devicemotion.gyp:*', 'dialog/cordova_dialog.gyp:*', 'events/cordova_events.gyp:*', 'file/cordova_file.gyp:*', diff --git a/src/devicemotion/cordova_devicemotion.gyp b/src/devicemotion/cordova_devicemotion.gyp deleted file mode 100644 index 39990cf..0000000 --- a/src/devicemotion/cordova_devicemotion.gyp +++ /dev/null @@ -1,25 +0,0 @@ -{ - 'includes':[ - '/usr/include/webapi-plugins/src/common/common.gypi', - ], - 'targets': [ - { - 'target_name': 'tizen_cordova_devicemotion', - 'type': 'loadable_module', - 'sources': [ - 'cordova_devicemotion_api.js', - 'cordova_devicemotion_extension.cc', - 'cordova_devicemotion_extension.h', - ], - 'include_dirs': [ - '../', - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'variables': { - 'packages': [ - 'webapi-plugins', - ], - }, - }, - ], -} diff --git a/src/devicemotion/cordova_devicemotion_extension.cc b/src/devicemotion/cordova_devicemotion_extension.cc deleted file mode 100755 index 458e43b..0000000 --- a/src/devicemotion/cordova_devicemotion_extension.cc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * 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 "devicemotion/cordova_devicemotion_extension.h" - -// This will be generated from cordova_devicemotion_api.js -extern const char kSource_cordova_devicemotion_api[]; - -common::Extension* CreateExtension() { - return new extension::cordova::devicemotion::CordovaDevicemotionExtension(); -} - -namespace extension { -namespace cordova { -namespace devicemotion { - -CordovaDevicemotionExtension::CordovaDevicemotionExtension() { - SetExtensionName("tizen.cordova.devicemotion"); - SetJavaScriptAPI(kSource_cordova_devicemotion_api); -} - -CordovaDevicemotionExtension::~CordovaDevicemotionExtension() {} - -} // devicemotion -} // cordova -} // extension diff --git a/src/devicemotion/cordova_devicemotion_extension.h b/src/devicemotion/cordova_devicemotion_extension.h deleted file mode 100755 index 734f928..0000000 --- a/src/devicemotion/cordova_devicemotion_extension.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * 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. - */ - -#ifndef DEVICEMOTION_CORDOVA_DEVICEMOTION_EXTENSION_H_ -#define DEVICEMOTION_CORDOVA_DEVICEMOTION_EXTENSION_H_ - -#include - -namespace extension { -namespace cordova { -namespace devicemotion { - -class CordovaDevicemotionExtension : public common::Extension { - public: - CordovaDevicemotionExtension(); - virtual ~CordovaDevicemotionExtension(); -}; - -} // devicemotion -} // cordova -} // extension - -#endif // DEVICEMOTION_CORDOVA_DEVICEMOTION_EXTENSION_H_ diff --git a/src/lib/cordova_plugins.js b/src/lib/cordova_plugins.js index f85b712..7c2cb1d 100644 --- a/src/lib/cordova_plugins.js +++ b/src/lib/cordova_plugins.js @@ -40,6 +40,11 @@ module.exports = [ "navigator.Acceleration" ] }, + { + "file": "plugins/cordova-plugin-device-motion/tizen/Accelerometer.js", + "id": "cordova-plugin-device-motion.tizen.Accelerometer", + "runs": true + }, { "file": "plugins/cordova-plugin-dialogs/www/notification.js", "id": "cordova-plugin-dialogs.notification", diff --git a/src/devicemotion/cordova_devicemotion_api.js b/src/lib/plugins/cordova-plugin-device-motion/tizen/Accelerometer.js similarity index 93% rename from src/devicemotion/cordova_devicemotion_api.js rename to src/lib/plugins/cordova-plugin-device-motion/tizen/Accelerometer.js index 353d0ee..b4e12ea 100755 --- a/src/devicemotion/cordova_devicemotion_api.js +++ b/src/lib/plugins/cordova-plugin-device-motion/tizen/Accelerometer.js @@ -63,8 +63,4 @@ console.log('Loaded cordova.device-motion API'); // TODO: remove when added to public cordova repository -> begin }); - -exports = function(require) { - require('cordova-tizen').addPlugin('cordova-plugin-device-motion.Accelerometer', plugin_name, 'runs'); -}; // TODO: remove -> end -- 2.34.1