From: jusung son Date: Fri, 30 May 2025 02:06:55 +0000 (+0900) Subject: Merge branch 'tizen_9.0 version 2.3.6' into tizen_8.0 X-Git-Tag: accepted/tizen/8.0/unified/20250602.170543^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_8.0_unified;p=platform%2Fcore%2Fappfw%2Ftidl.git Merge branch 'tizen_9.0 version 2.3.6' into tizen_8.0 Change-Id: I674b7c4643c72b7ed3a2df89963fd665b5ec15fa Signed-off-by: jusung son --- 1bde129f14658ce387077d99805aee58a560b3b8 diff --cc README.md index 7ec13aa2,a61eeb7f..4185f77d --- a/README.md +++ b/README.md @@@ -1141,7 -1144,125 +1141,6 @@@ namespace Prox } ``` -**Rust** -```Rust -pub struct RemoteException { - pub cause: i32, - pub message: String, -} - -impl RemoteException { - pub fn new() -> Self; - pub fn with_message(message: &str) -> Self; - pub fn with_cause_and_message(cause: i32, message: &str) -> Self; - pub fn get_cause(&self) -> i32; - pub fn get_message(&self) -> &String; -} - -pub mod message_base { - pub struct MessageBase { - pub id: i32, - pub name: String, - pub msg: String, - } -} - -pub mod message_derived { - pub struct MessageDerived { - pub id: i32, - pub name: String, - pub msg: String, - pub address: String, - } -} - -pub mod message { - pub struct OnReceived<'a> { - base: DelegateBase, - callback: Box - } - - impl<'b> OnReceived<'b> { - pub fn new(once: bool) -> OnReceived<'b>; - pub fn on_received(&mut self, handler: F) where F: Fn(String, message_base::MessageBase) + Send + 'b; - } - - pub struct Message<'a> { - proxy: Arc>>, - delegate_list: Vec>, - } - - impl<'b> Message<'b> { - /// - /// Constructor for this struct - /// - pub fn new() -> Arc>>; - - /// - /// Connects to the service app. - /// - /// http://tizen.org/privilege/appmanager.launch - /// http://tizen.org/privilege/datasharing - /// The service app ID to connect - /// - /// Returns when the appid to connect is invalid. - /// - /// - /// Returns when internal I/O error happen. - /// - /// - /// Returns when the permission is denied. - /// - /// If you want to use this method, you must add privileges. - pub fn try_connect(&self, appid: &str) -> Result<(), ErrorId>; - - - /// - /// Connects to the service app synchornously. - /// - /// http://tizen.org/privilege/appmanager.launch - /// http://tizen.org/privilege/datasharing - /// The service app ID to connect - /// - /// Returns when the appid to connect is invalid. - /// - /// - /// Returns when internal I/O error happen. - /// - /// - /// Returns when the permission is denied. - /// - /// If you want to use this method, you must add privileges. - pub fn try_connect_sync(&self, appid: &str) -> Result<(), ErrorId>; - - - /// - /// This method will be invoked when the client app is connected to the service app. - /// - /// The handler to be invoked when the client app is connected - pub fn on_connected(&mut self, handler: F) where F: Fn(&str, &str, Port) + 'b; - - /// - /// This method will be invoked after the client app was disconnected from the service app. - /// - /// The handler to be invoked when the client app is disconnected - pub fn on_disconnected(&mut self, handler: F) where F: Fn(&str, &str) + 'b; - - /// - /// This method will be invoked when the service app rejects the client app. - /// - /// The handler to be invoked when the service app rejects the client app - pub fn on_rejected(&mut self, handler: F) where F: Fn(&str, &str) + 'b; - - pub fn register(&mut self, sender: String, callback: OnReceived<'b>) -> Result; - - pub fn unregister(&mut self, ) -> Result<(), Exception>; - - pub fn send(&mut self, message: message_base::MessageBase) -> Result; - } -} -``` -- #### Stub interface diff --cc idlc/gen/version2/c_stub_body_generator_cb.hh index 86a66314,66039fe6..ecdb1c86 --- a/idlc/gen/version2/c_stub_body_generator_cb.hh +++ b/idlc/gen/version2/c_stub_body_generator_cb.hh @@@ -1447,6 -1448,6 +1448,9 @@@ static int ____received_e rpc_port_parcel_destroy(parcel); #endif /* TIDL_THREAD_ENABLE */ ++ if (ret == RPC_PORT_ERROR_PERMISSION_DENIED) ++ return RPC_PORT_ERROR_NONE; ++ return ret; } diff --cc package/pkginfo.manifest index fa436cbd,e26f0cc6..8700e12d --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -1,4 -1,4 +1,4 @@@ - Version:2.0.13 -Version:2.3.5 ++Version:2.3.6 Source:tidlc Maintainer:JungHoon Park , Hwankyu Jhun , Inkyun Kil , Ju-Sung Son , Hyunho Kang diff --cc packaging/tidl.spec index 608cb9bb,6740039d..2d31ab10 --- a/packaging/tidl.spec +++ b/packaging/tidl.spec @@@ -1,6 -1,6 +1,6 @@@ Name: tidl Summary: Tizen Interface Definition Language - Version: 2.0.13 -Version: 2.3.5 ++Version: 2.3.6 Release: 1 Group: Application Framework/Building License: Apache-2.0 diff --cc release/windows-32/tidlc.exe index 5e673394,1b605f20..23113ee1 Binary files differ diff --cc release/windows-64/tidlc.exe index 3e59b645,d6b8f2f6..fae8ec27 Binary files differ diff --cc tests/build_tests/CMakeLists.txt index 8d9fe6a7,00000000..8d9fe6a7 mode 100644,000000..100755 --- a/tests/build_tests/CMakeLists.txt +++ b/tests/build_tests/CMakeLists.txt diff --cc tests/build_tests/main.cc index f24580cf,00000000..f24580cf mode 100644,000000..100755 --- a/tests/build_tests/main.cc +++ b/tests/build_tests/main.cc diff --cc tests/build_tests/tidl/Buffer.tidl index c1525baa,00000000..c1525baa mode 100644,000000..100755 --- a/tests/build_tests/tidl/Buffer.tidl +++ b/tests/build_tests/tidl/Buffer.tidl diff --cc tests/build_tests/tidl/Buffer_v2.tidl index 0bb31382,00000000..0bb31382 mode 100644,000000..100755 --- a/tests/build_tests/tidl/Buffer_v2.tidl +++ b/tests/build_tests/tidl/Buffer_v2.tidl diff --cc tests/build_tests/tidl/DataPort.tidl index 643d66d3,00000000..643d66d3 mode 100644,000000..100755 --- a/tests/build_tests/tidl/DataPort.tidl +++ b/tests/build_tests/tidl/DataPort.tidl diff --cc tests/build_tests/tidl/DataPort_v2.tidl index 7d711629,00000000..7d711629 mode 100644,000000..100755 --- a/tests/build_tests/tidl/DataPort_v2.tidl +++ b/tests/build_tests/tidl/DataPort_v2.tidl diff --cc tests/build_tests/tidl/Ex.tidl index 6ef07333,00000000..6ef07333 mode 100644,000000..100755 --- a/tests/build_tests/tidl/Ex.tidl +++ b/tests/build_tests/tidl/Ex.tidl diff --cc tests/build_tests/tidl/ExCion.tidl index d3401db6,00000000..d3401db6 mode 100644,000000..100755 --- a/tests/build_tests/tidl/ExCion.tidl +++ b/tests/build_tests/tidl/ExCion.tidl diff --cc tests/build_tests/tidl/Ex_v2.tidl index a05e9a0e,00000000..a05e9a0e mode 100644,000000..100755 --- a/tests/build_tests/tidl/Ex_v2.tidl +++ b/tests/build_tests/tidl/Ex_v2.tidl diff --cc tests/build_tests/tidl/Foo.tidl index 03ac041e,00000000..03ac041e mode 100644,000000..100755 --- a/tests/build_tests/tidl/Foo.tidl +++ b/tests/build_tests/tidl/Foo.tidl diff --cc tests/build_tests/tidl/Foo_v2.tidl index 145f2a56,00000000..145f2a56 mode 100644,000000..100755 --- a/tests/build_tests/tidl/Foo_v2.tidl +++ b/tests/build_tests/tidl/Foo_v2.tidl diff --cc tests/build_tests/tidl/Message.tidl index 28f45adc,00000000..28f45adc mode 100644,000000..100755 --- a/tests/build_tests/tidl/Message.tidl +++ b/tests/build_tests/tidl/Message.tidl diff --cc tests/build_tests/tidl/Message_v2.tidl index 1db26ca8,00000000..5026a2bb mode 100644,000000..100755 --- a/tests/build_tests/tidl/Message_v2.tidl +++ b/tests/build_tests/tidl/Message_v2.tidl @@@ -1,38 -1,0 +1,38 @@@ +protocol 2 + +struct Envelope { + enum peer { + client, + server + } + + map string_map; - set double_set; ++ set int_set; + list string_list; + array bundle_array; +} + +struct BeginEnvelope : Envelope { + Envelope.peer peer_info; + string message; +} + +struct EndEnvelope : Envelope { + Envelope.peer peer_info; + string message; +} + +struct DerivedEnvelope : BeginEnvelope { + int id; +} + +interface Message { + void NotifyCB(string sender, string msg) delegate; + + int Register(string name, NotifyCB cb); + void Unregister() async; + int Send(string msg); + [privilege = "http://tizen.org/privilege/alarm.set"] + int SendEnvelope(string name, map envelope_map); + int SendEnvelopeType(string name, Envelope envelope); +} diff --cc tests/build_tests/tidl/Message_v2test.tidl index c3136329,00000000..c3136329 mode 100644,000000..100755 --- a/tests/build_tests/tidl/Message_v2test.tidl +++ b/tests/build_tests/tidl/Message_v2test.tidl diff --cc tests/build_tests/tidl/Struct_v2.tidl index 3aacc54e,00000000..e0d66a6f mode 100755,000000..100755 --- a/tests/build_tests/tidl/Struct_v2.tidl +++ b/tests/build_tests/tidl/Struct_v2.tidl @@@ -1,9 -1,0 +1,9 @@@ +protocol 2 + +struct Envelope { + map string_map; - set double_set; ++ set int_set; + list string_list; + array bundle_array; +} +