Enable local build with libaurum_only option

Change-Id: I6489ab135bf1a9fa568befb89b97b99a9f0bc07b

diff --git a/README.md b/README.md
index 75fc7a6de744616c35053eafd6be787880cfcd94..83e348012cd182deacd9c72ee017136b2f429b0a 100644 (file)
--- 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 a4aed59e6eafe7e8f7604197470b23dbed674dd2..9b8caf8f361351bee5be53d8c8c8b1cde1d41dd8 100644 (file)
--- 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 <atspi/atspi.h>
 
 #include <memory>
 #include <vector>

diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h
index d3089e33e26d3cbe5956acc388313c128380e542..58f85f885022bf11ff9259e16ab4336a5649574a 100644 (file)
--- a/libaurum/inc/Aurum.h
+++ b/libaurum/inc/Aurum.h
@@ -18,6 +18,7 @@
 #ifndef _AURUM_H_
 #define _AURUM_H_
 
+#ifdef TIZEN
 #include <dlog.h>
 
 #ifdef LOG_TAG
@@ -43,6 +44,11 @@
                    __FILE__, __func__, __LINE__, ##arg); \
     } while (0); })
 #endif
+#else
+#include <cstdio>
+#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 296b409787fec13fc9c285118d4cb92e69763fd4..a80c348a67ebf1b48980e8b3e9b6da3ee170f598 100644 (file)
--- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h
+++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h
@@ -67,7 +67,6 @@ public:
 
 private:
 
-    std::map<AtspiAccessible *, std::shared_ptr<AccessibleApplication>> mActiveAppMap;
     std::map<std::pair<std::string, int>, std::shared_ptr<AurumXML>> mXMLDocMap;
 };
 

diff --git a/libaurum/meson.build b/libaurum/meson.build
index 05db20e4f88f5b0a2192b4d4a99117fd635668df..daa56488c88705dbd4607fe40e2dbb82e03e0e13 100644 (file)
--- 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 48df80e5a2a08e677f29fa6077f7220fd88ae52b..eb6b74b5d90e6519cff996a97cbc5a86e61fabbc 100644 (file)
--- 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 23006731ab8a56551edc01de95c9b056f2de8b09..eb488697fb78d76c8fff9fe249efa50c09d4ecc6 100644 (file)
--- 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 <string.h>
 #include <iostream>
@@ -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 b80cd8e20a8f66a3535414064c782deb50b84ce9..ddbf17f57c341488768b821f9d5da801de21a8de 100644 (file)
--- 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 ff3f57cc1befe538df42e00702bd0c911a74c92b..c55aa37840f130d896fb8ce50a95fa9025651f8d 100644 (file)
--- 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 <unistd.h>
 #include <utility>
 #include <vector>
@@ -144,7 +145,7 @@ std::shared_ptr<UiDevice> 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 1022f82ba59a394be96644b6475468e003d0a456..9054985a883e3f1f58bd5d86cd3cc82f08d93202 100644 (file)
--- 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 726ed1dee58e1e3e5941509091fe3cd4b4092a68..3ca0306f182f59ce75a5c9ace0bfe78785baa143 100644 (file)
--- 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'
+)