From 700738c1203724058cd0924ea7750da54b6f8aa6 Mon Sep 17 00:00:00 2001 From: Youngsun Suh Date: Thu, 9 Jan 2025 09:25:21 +0900 Subject: [PATCH] Enable local build with libaurum_only option Change-Id: I6489ab135bf1a9fa568befb89b97b99a9f0bc07b --- README.md | 6 ++++++ libaurum/inc/Accessibility/AccessibleWatcher.h | 1 - libaurum/inc/Aurum.h | 6 ++++++ .../Impl/Accessibility/MockAccessibleWatcher.h | 1 - libaurum/meson.build | 2 +- .../src/Accessibility/AccessibleAppManager.cc | 5 +++-- libaurum/src/Accessibility/AccessibleWatcher.cc | 5 +++-- libaurum/src/Impl/Accessibility/meson.build | 16 +++++++++------- libaurum/src/UiDevice.cc | 7 ++++--- meson.build | 8 +++++--- meson_options.txt | 6 ++++++ 11 files changed, 43 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 75fc7a6..83e3480 100644 --- a/README.md +++ b/README.md @@ -26,3 +26,9 @@ Please refer [grpc](https://grpc.io/) and [proto buffers](https://developers.goo - [Automation application(C++) in target](https://github.sec.samsung.net/TizenUIFW/aurum-test-sample) - [UI Analyzer](https://github.sec.samsung.net/TizenNativeUI/ui-analyzer) * Aurum API is not public. we dont recommand direct calling aurum API in target. + +### Local Build (Ubuntu) +```bash +meson setup builddir -Dlibaurum_only=true +meson compile -C builddir/ +``` diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index a4aed59..9b8caf8 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -25,7 +25,6 @@ #include "A11yEvent.h" #include "A11yEventHandler.h" #include "AurumXML.h" -#include #include #include diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index d3089e3..58f85f8 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -18,6 +18,7 @@ #ifndef _AURUM_H_ #define _AURUM_H_ +#ifdef TIZEN #include #ifdef LOG_TAG @@ -43,6 +44,11 @@ __FILE__, __func__, __LINE__, ##arg); \ } while (0); }) #endif +#else +#include +#define LOGI(fmt, ...) printf("[INFO]" fmt "\n", ##__VA_ARGS__) +#define LOGE(fmt, ...) fprintf(stderr, "[ERROR]" fmt "\n", ##__VA_ARGS__) +#endif #include "UiDevice.h" #include "UiObject.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index 296b409..a80c348 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -67,7 +67,6 @@ public: private: - std::map> mActiveAppMap; std::map, std::shared_ptr> mXMLDocMap; }; diff --git a/libaurum/meson.build b/libaurum/meson.build index 05db20e..daa5648 100644 --- a/libaurum/meson.build +++ b/libaurum/meson.build @@ -49,7 +49,6 @@ libaurum_src = [] subdir('src') libaurum_dep = [ - dependency('atspi-2'), dependency('gio-2.0'), dependency('threads'), libpugixml_dep, @@ -57,6 +56,7 @@ libaurum_dep = [ if get_option('tizen') == true libaurum_dep += [ + dependency('atspi-2'), dependency('capi-system-info'), dependency('capi-ui-efl-util'), dependency('dlog'), diff --git a/libaurum/src/Accessibility/AccessibleAppManager.cc b/libaurum/src/Accessibility/AccessibleAppManager.cc index 48df80e..eb6b74b 100644 --- a/libaurum/src/Accessibility/AccessibleAppManager.cc +++ b/libaurum/src/Accessibility/AccessibleAppManager.cc @@ -20,8 +20,9 @@ #ifdef TIZEN #include "AtspiAccessibleAppManager.h" -#endif +#else #include "MockAccessibleAppManager.h" +#endif using namespace Aurum; using namespace AurumInternal; @@ -47,7 +48,7 @@ AccessibleAppManager *AccessibleAppManager::getInstance(AccessibleAppManager *ap #ifdef TIZEN mInstance = new AtspiAccessibleAppManager(); #else - mInstance = new MockAccessibleAppManager(); + mInstance = new Mock::MockAccessibleAppManager(); #endif } } diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index 2300673..eb48869 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -19,8 +19,9 @@ #ifdef TIZEN #include "AtspiAccessibleWatcher.h" -#endif +#else #include "MockAccessibleWatcher.h" +#endif #include #include @@ -52,7 +53,7 @@ AccessibleWatcher *AccessibleWatcher::getInstance(AccessibleWatcher *watcherImpl #ifdef TIZEN mInstance = new AtspiAccessibleWatcher(); #else - mInstance = new MockAccessibleWatcher(); + mInstance = new Mock::MockAccessibleWatcher(); #endif } } diff --git a/libaurum/src/Impl/Accessibility/meson.build b/libaurum/src/Impl/Accessibility/meson.build index b80cd8e..ddbf17f 100644 --- a/libaurum/src/Impl/Accessibility/meson.build +++ b/libaurum/src/Impl/Accessibility/meson.build @@ -1,3 +1,4 @@ +if get_option('tizen') == true libaurum_src += [ files('AtspiAccessibleApplication.cc'), files('AtspiAccessibleWindow.cc'), @@ -7,11 +8,12 @@ files('AtspiWrapper.cc'), files('AtspiMatchRuleConvertor.cc'), ] +endif - libaurum_src += [ - files('MockAccessibleApplication.cc'), - files('MockAccessibleWindow.cc'), - files('MockAccessibleNode.cc'), - files('MockAccessibleWatcher.cc'), - files('MockAccessibleAppManager.cc'), - ] +libaurum_src += [ + files('MockAccessibleApplication.cc'), + files('MockAccessibleWindow.cc'), + files('MockAccessibleNode.cc'), + files('MockAccessibleWatcher.cc'), + files('MockAccessibleAppManager.cc'), +] diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index ff3f57c..c55aa37 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -19,9 +19,10 @@ #ifdef TIZEN #include "TizenDeviceImpl.h" -#endif -#include "MockDeviceImpl.h" #include "AtspiAccessibleWatcher.h" +#else +#include "MockDeviceImpl.h" +#endif #include #include #include @@ -144,7 +145,7 @@ std::shared_ptr UiDevice::getInstance(IDevice *deviceImpl) #ifdef TIZEN device.reset(new UiDevice(new TizenDeviceImpl())); #else - device.reset(new UiDevice(new MockDeviceImpl())); + device.reset(new UiDevice(new Mock::MockDeviceImpl())); #endif } }); diff --git a/meson.build b/meson.build index 1022f82..9054985 100644 --- a/meson.build +++ b/meson.build @@ -20,10 +20,12 @@ endif root_inc = include_directories('./') subdir('pugixml') -subdir('protocol') subdir('libaurum') -if get_option('tizen') == true - subdir('org.tizen.aurum-bootstrap') +if get_option('libaurum_only') == false + subdir('protocol') + if get_option('tizen') == true + subdir('org.tizen.aurum-bootstrap') + endif endif subdir('tests') diff --git a/meson_options.txt b/meson_options.txt index 726ed1d..3ca0306 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,3 +26,9 @@ option('enable_documentation', value: false, description: 'enable generating documentation by using doxygen' ) + +option('libaurum_only', + type: 'boolean', + value: false, + description: 'skip building grpc and protobuf protocol' +) -- 2.34.1