From 3a7293fba745d6e7ac0e4dfd70fbada61564fccd Mon Sep 17 00:00:00 2001 From: "SukHyung, Kang" Date: Wed, 14 Dec 2016 15:03:17 +0900 Subject: [PATCH] merge application code from spin Change-Id: Iec3dfa90e35ac0c21a61f8f71d15c7d4a0020947 Signed-off-by: SukHyung, Kang --- Tizen.Applications/Interop/Interop.Alarm.cs | 4 ++-- Tizen.Applications/Tizen.Applications.Net45.project.json | 2 +- Tizen.Applications/Tizen.Applications.nuspec | 4 ++-- Tizen.Applications/Tizen.Applications.project.json | 2 +- Tizen.Applications/Tizen.Applications/AlarmManager.cs | 4 ++-- packaging/csapi-application.spec | 16 ++++++++++++++++ 6 files changed, 24 insertions(+), 8 deletions(-) mode change 100644 => 100755 Tizen.Applications/Tizen.Applications.Net45.project.json mode change 100644 => 100755 Tizen.Applications/Tizen.Applications.nuspec mode change 100644 => 100755 Tizen.Applications/Tizen.Applications.project.json diff --git a/Tizen.Applications/Interop/Interop.Alarm.cs b/Tizen.Applications/Interop/Interop.Alarm.cs index 429b99c..4c3e331 100755 --- a/Tizen.Applications/Interop/Interop.Alarm.cs +++ b/Tizen.Applications/Interop/Interop.Alarm.cs @@ -45,10 +45,10 @@ internal static partial class Interop internal static extern int CreateAlarmOnceAfterDelay(SafeAppControlHandle appControl, int delay, out int alarmId); [DllImport(Libraries.Alarm, EntryPoint = "alarm_schedule_once_at_date")] - internal static extern int CreateAlarmOnceAtDate(SafeAppControlHandle appControl, DateTime date, out int alarmId); + internal static extern int CreateAlarmOnceAtDate(SafeAppControlHandle appControl, ref DateTime date, out int alarmId); [DllImport(Libraries.Alarm, EntryPoint = "alarm_schedule_with_recurrence_week_flag")] - internal static extern int CreateAlarmRecurWeek(SafeAppControlHandle appControl, DateTime date, int week, out int alarmId); + internal static extern int CreateAlarmRecurWeek(SafeAppControlHandle appControl, ref DateTime date, int week, out int alarmId); [DllImport(Libraries.Alarm, EntryPoint = "alarm_get_scheduled_recurrence_week_flag")] internal static extern int GetAlarmWeekFlag(int alarmId, out int weekFlag); diff --git a/Tizen.Applications/Tizen.Applications.Net45.project.json b/Tizen.Applications/Tizen.Applications.Net45.project.json old mode 100644 new mode 100755 index ab1a0ee..1ec1af2 --- a/Tizen.Applications/Tizen.Applications.Net45.project.json +++ b/Tizen.Applications/Tizen.Applications.Net45.project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Tizen": "1.0.1" + "Tizen": "1.0.2" }, "frameworks": { "net45": {} diff --git a/Tizen.Applications/Tizen.Applications.nuspec b/Tizen.Applications/Tizen.Applications.nuspec old mode 100644 new mode 100755 index 0293ab7..a23383a --- a/Tizen.Applications/Tizen.Applications.nuspec +++ b/Tizen.Applications/Tizen.Applications.nuspec @@ -3,7 +3,7 @@ Tizen.Applications $version$ - tizen + Samsung Electronics false https://www.apache.org/licenses/LICENSE-2.0 https://www.tizen.org/ @@ -11,7 +11,7 @@ © Samsung Electronics Co., Ltd All Rights Reserved Provides the Application Frameworks API for Tizen.Net - + diff --git a/Tizen.Applications/Tizen.Applications.project.json b/Tizen.Applications/Tizen.Applications.project.json old mode 100644 new mode 100755 index db7436c..55ec093 --- a/Tizen.Applications/Tizen.Applications.project.json +++ b/Tizen.Applications/Tizen.Applications.project.json @@ -1,7 +1,7 @@ { "dependencies": { "NETStandard.Library": "1.6.0", - "Tizen": "1.0.1" + "Tizen": "1.0.2" }, "frameworks": { "netstandard1.3": {} diff --git a/Tizen.Applications/Tizen.Applications/AlarmManager.cs b/Tizen.Applications/Tizen.Applications/AlarmManager.cs index ad030e4..01f5a8a 100755 --- a/Tizen.Applications/Tizen.Applications/AlarmManager.cs +++ b/Tizen.Applications/Tizen.Applications/AlarmManager.cs @@ -185,7 +185,7 @@ namespace Tizen.Applications Alarm alarm = null; int alarmId; Interop.Alarm.DateTime time = ConvertDateTimeToStruct(value); - AlarmError ret = (AlarmError)Interop.Alarm.CreateAlarmOnceAtDate(appControl.SafeAppControlHandle, time, out alarmId); + AlarmError ret = (AlarmError)Interop.Alarm.CreateAlarmOnceAtDate(appControl.SafeAppControlHandle, ref time, out alarmId); alarm = new Alarm(alarmId); if (ret != AlarmError.None) { @@ -215,7 +215,7 @@ namespace Tizen.Applications Alarm alarm = null; int alarmId; Interop.Alarm.DateTime time = ConvertDateTimeToStruct(value); - AlarmError ret = (AlarmError)Interop.Alarm.CreateAlarmRecurWeek(appControl.SafeAppControlHandle, time, (int)weekFlag, out alarmId); + AlarmError ret = (AlarmError)Interop.Alarm.CreateAlarmRecurWeek(appControl.SafeAppControlHandle, ref time, (int)weekFlag, out alarmId); alarm = new Alarm(alarmId); if (ret != AlarmError.None) { diff --git a/packaging/csapi-application.spec b/packaging/csapi-application.spec index f07bcaf..1ec8935 100755 --- a/packaging/csapi-application.spec +++ b/packaging/csapi-application.spec @@ -1,4 +1,5 @@ %{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework} +%{!?mono_assembly_path: %define mono_assembly_path /opt/usr/lib/assembly} %if 0%{?tizen_build_devel_mode} %define BUILDCONF Debug @@ -17,6 +18,7 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest AutoReqProv: no +ExcludeArch: %{ix86} aarch64 BuildRequires: mono-compiler BuildRequires: mono-devel @@ -49,12 +51,14 @@ done %install # Runtime Binary mkdir -p %{buildroot}%{dotnet_assembly_path} +mkdir -p %{buildroot}%{mono_assembly_path} for ASM in %{Assemblies}; do %if 0%{?_with_corefx} install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path} %else install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{dotnet_assembly_path} %endif +install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{mono_assembly_path} done # NuGet mkdir -p %{buildroot}/nuget @@ -74,3 +78,15 @@ NuGet package for %{name} %files nuget /nuget/*.nupkg + +%package mono +Summary: %{name} for Mono Runtime +Group: Development/Libraries + +%description mono +%{name} for Mono Runtime + +%files mono +%manifest %{name}.manifest +%license LICENSE +%attr(644,root,root) %{mono_assembly_path}/*.dll -- 2.7.4