From f5c9e19cb9641cba39fc35e302293ab8a21fbd2b Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Fri, 24 Jun 2016 17:57:31 +0900 Subject: [PATCH] Differentiate public header files according to profile Signed-off-by: suhyung Eom Change-Id: I96ccf3c8c0ff2f5175a8a792f1b7ca5f5f8cdd50 --- adaptors/common/file.list | 2 -- adaptors/common/framework.h | 6 +++++- adaptors/public-api/file.list | 5 +---- adaptors/tizen/framework-tizen.cpp | 2 -- adaptors/wearable/dali-wearable.h | 2 +- adaptors/wearable/file.list | 11 ++++++++++- adaptors/{common => wearable}/watch-application-impl.cpp | 0 adaptors/{common => wearable}/watch-application-impl.h | 2 +- .../watch}/watch-application.cpp | 4 ++-- .../watch}/watch-application.h | 2 +- adaptors/{common => wearable/watch}/watch-time.cpp | 2 +- .../adaptor-framework => wearable/watch}/watch-time.h | 0 build/tizen/adaptor/Makefile.am | 13 +++++++++---- 13 files changed, 31 insertions(+), 20 deletions(-) rename adaptors/{common => wearable}/watch-application-impl.cpp (100%) rename adaptors/{common => wearable}/watch-application-impl.h (98%) rename adaptors/{public-api/adaptor-framework => wearable/watch}/watch-application.cpp (96%) rename adaptors/{public-api/adaptor-framework => wearable/watch}/watch-application.h (99%) rename adaptors/{common => wearable/watch}/watch-time.cpp (98%) rename adaptors/{public-api/adaptor-framework => wearable/watch}/watch-time.h (100%) diff --git a/adaptors/common/file.list b/adaptors/common/file.list index c9c39b7..af0bebe 100644 --- a/adaptors/common/file.list +++ b/adaptors/common/file.list @@ -28,8 +28,6 @@ adaptor_common_internal_src_files = \ $(adaptor_common_dir)/style-monitor-impl.cpp \ $(adaptor_common_dir)/trigger-event.cpp \ $(adaptor_common_dir)/trigger-event-factory.cpp \ - $(adaptor_common_dir)/watch-application-impl.cpp \ - $(adaptor_common_dir)/watch-time.cpp \ $(adaptor_common_dir)/key-impl.cpp \ $(adaptor_common_dir)/video-player-impl.cpp \ $(adaptor_common_dir)/events/gesture-manager.cpp \ diff --git a/adaptors/common/framework.h b/adaptors/common/framework.h index b0c88fd..4dacf5f 100644 --- a/adaptors/common/framework.h +++ b/adaptors/common/framework.h @@ -21,7 +21,9 @@ // EXTERNAL INCLUDES #include #include -#include +#ifdef APPCORE_WATCH_AVAILABLE +#include "wearable/watch/watch-application.h" +#endif // INTERNAL INCLUDES #include @@ -87,6 +89,7 @@ public: */ virtual void OnAppControl(void *) {} +#ifdef APPCORE_WATCH_AVAILABLE /** * Invoked at every second */ @@ -101,6 +104,7 @@ public: * Invoked when the device enters or exits ambient mode */ virtual void OnAmbientChanged(bool ambient) {} +#endif /** * Invoked when the language of the device is changed. diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list index febcab3..dbf643f 100644 --- a/adaptors/public-api/file.list +++ b/adaptors/public-api/file.list @@ -5,7 +5,6 @@ public_api_src_files = \ $(adaptor_public_api_dir)/adaptor-framework/timer.cpp \ $(adaptor_public_api_dir)/adaptor-framework/tts-player.cpp \ $(adaptor_public_api_dir)/adaptor-framework/native-image-source.cpp \ - $(adaptor_public_api_dir)/adaptor-framework/watch-application.cpp \ $(adaptor_public_api_dir)/dali-adaptor-version.cpp @@ -22,9 +21,7 @@ public_api_adaptor_framework_header_files = \ $(adaptor_public_api_dir)/adaptor-framework/timer.h \ $(adaptor_public_api_dir)/adaptor-framework/tts-player.h \ $(adaptor_public_api_dir)/adaptor-framework/native-image-source.h \ - $(adaptor_public_api_dir)/adaptor-framework/window.h \ - $(adaptor_public_api_dir)/adaptor-framework/watch-application.h \ - $(adaptor_public_api_dir)/adaptor-framework/watch-time.h + $(adaptor_public_api_dir)/adaptor-framework/window.h adaptor_dali_header_file = \ $(adaptor_public_api_dir)/dali.h diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp index 55edd29..7a4d64b 100644 --- a/adaptors/tizen/framework-tizen.cpp +++ b/adaptors/tizen/framework-tizen.cpp @@ -34,8 +34,6 @@ // INTERNAL INCLUDES #include -#include -#include namespace Dali { diff --git a/adaptors/wearable/dali-wearable.h b/adaptors/wearable/dali-wearable.h index c32eeb1..15deb81 100644 --- a/adaptors/wearable/dali-wearable.h +++ b/adaptors/wearable/dali-wearable.h @@ -19,6 +19,6 @@ */ // INTERNAL INCLUDES -#include +#include #endif // __DALI_WEARABLE_H__ \ No newline at end of file diff --git a/adaptors/wearable/file.list b/adaptors/wearable/file.list index 69498e7..0075500 100644 --- a/adaptors/wearable/file.list +++ b/adaptors/wearable/file.list @@ -1,4 +1,13 @@ # wearable profile public files -adaptor_dali_wearable_header_files = \ +adaptor_internal_wearable_profile_src_files = \ + $(adaptor_wearable_dir)/watch-application-impl.cpp \ + $(adaptor_wearable_dir)/watch/watch-application.cpp \ + $(adaptor_wearable_dir)/watch/watch-time.cpp + +adaptor_dali_wearable_header_file = \ $(adaptor_wearable_dir)/dali-wearable.h + +public_dali_watch_header_files = \ + $(adaptor_wearable_dir)/watch/watch-application.h \ + $(adaptor_wearable_dir)/watch/watch-time.h diff --git a/adaptors/common/watch-application-impl.cpp b/adaptors/wearable/watch-application-impl.cpp similarity index 100% rename from adaptors/common/watch-application-impl.cpp rename to adaptors/wearable/watch-application-impl.cpp diff --git a/adaptors/common/watch-application-impl.h b/adaptors/wearable/watch-application-impl.h similarity index 98% rename from adaptors/common/watch-application-impl.h rename to adaptors/wearable/watch-application-impl.h index 5466497..6617805 100644 --- a/adaptors/common/watch-application-impl.h +++ b/adaptors/wearable/watch-application-impl.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/adaptors/public-api/adaptor-framework/watch-application.cpp b/adaptors/wearable/watch/watch-application.cpp similarity index 96% rename from adaptors/public-api/adaptor-framework/watch-application.cpp rename to adaptors/wearable/watch/watch-application.cpp index 102b1b9..4a279f4 100644 --- a/adaptors/public-api/adaptor-framework/watch-application.cpp +++ b/adaptors/wearable/watch/watch-application.cpp @@ -16,13 +16,13 @@ */ // CLASS HEADER -#include +#include "watch-application.h" // EXTERNAL INCLUDES #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/adaptors/public-api/adaptor-framework/watch-application.h b/adaptors/wearable/watch/watch-application.h similarity index 99% rename from adaptors/public-api/adaptor-framework/watch-application.h rename to adaptors/wearable/watch/watch-application.h index 1ba7695..37fb62b 100644 --- a/adaptors/public-api/adaptor-framework/watch-application.h +++ b/adaptors/wearable/watch/watch-application.h @@ -24,7 +24,7 @@ #include // INTERNAL INCLUDES -#include "application.h" +#include #include "watch-time.h" namespace Dali diff --git a/adaptors/common/watch-time.cpp b/adaptors/wearable/watch/watch-time.cpp similarity index 98% rename from adaptors/common/watch-time.cpp rename to adaptors/wearable/watch/watch-time.cpp index 756b84e..34c4089 100644 --- a/adaptors/common/watch-time.cpp +++ b/adaptors/wearable/watch/watch-time.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #ifdef APPCORE_WATCH_AVAILABLE diff --git a/adaptors/public-api/adaptor-framework/watch-time.h b/adaptors/wearable/watch/watch-time.h similarity index 100% rename from adaptors/public-api/adaptor-framework/watch-time.h rename to adaptors/wearable/watch/watch-time.h diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index d23aec9..d2fcfbc 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -213,7 +213,8 @@ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) endif # USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ - $(adaptor_tizen_internal_native_image_src_files) + $(adaptor_tizen_internal_native_image_src_files) \ + $(adaptor_internal_wearable_profile_src_files) else adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ $(adaptor_common_internal_egl_extension_src_files) @@ -525,9 +526,6 @@ endif tizenadaptorpublicapidir = $(devincludepath)/dali/public-api tizenadaptorpublicapi_HEADERS = $(public_api_header_files) -if WEARABLE_PROFILE -tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_files) -endif tizenadaptordevelapidir= $(devincludepath)/dali/devel-api @@ -563,6 +561,13 @@ endif # NOT UBUNTU_PROFILE tizenadaptordaliheaderdir = $(devincludepath)/dali tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file) +if WEARABLE_PROFILE +tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file) + +tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch +tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files) +endif + install-data-local: $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir} -- 2.7.4