From e6f766e38f483d8de1a64ef64736785388c4a90d Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Tue, 7 Jan 2025 11:11:32 +0900 Subject: [PATCH] [Build] modified the TFM sorted in descending order --- packaging/csapi-tizenfx.spec | 2 +- packaging/maketfm.py | 18 +++++++----------- pkg/Tizen.NET/Tizen.NET.nuspec | 12 ++++++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 69df670fdcb..4e75c771e04 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -13,7 +13,7 @@ %define DOTNET_NUGET_SOURCE /nuget %define TIZEN_NET_RUNTIME_IDENTIFIERS 10.0.0:9.0.0:8.0.0:7.0.0:6.5.0:6.0.0:5.5.0:5.0.0:4.0.0 -%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS net8.0-tizen10.0:net6.0-tizen9.0:net6.0-tizen8.0:net6.0-tizen:net6.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40 +%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS net8.0-tizen10.0:net8.0-tizen:net8.0:net6.0-tizen9.0:net6.0-tizen8.0:net6.0-tizen:net6.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40 %define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts diff --git a/packaging/maketfm.py b/packaging/maketfm.py index 8364ed11f13..80b58244dd9 100755 --- a/packaging/maketfm.py +++ b/packaging/maketfm.py @@ -9,7 +9,12 @@ tfm_list1 = [] #tizen90, tizen80, tizen70, tizen60, tizen50, tizen40 tfm_list2 = [] #tizen10.0 -tfm_list3 = [] #net6.0-tizen9.0, net6.0-tizen8.0, net6.0-tizen, net6.0 +tfm_list3 = [] #net8.0-tizen10.0, net8.0-tizen, net8.0, net6.0-tizen9.0, net6.0-tizen8.0, net6.0-tizen, net6.0 + +def sort_tfm(tfm): + tfm = list(set(tfm)) + return sorted(tfm, reverse=True) + for meta_child in root.iter(): if meta_child.tag == "{http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd}metadata": for depen_child in meta_child: @@ -26,16 +31,7 @@ tfm_list3.append(tfm.strip() + "-tizen") tfm_list3.append(tfm.strip()) - -tfm_list1 = list(set(tfm_list1)) -tfm_list1.sort(reverse=True) -tfm_list2 = list(set(tfm_list2)) -tfm_list2.sort(reverse=True) -tfm_list3 = list(set(tfm_list3)) -tfm_list3.sort(key=len) -tfm_list3.sort(key=lambda s: float(re.search(r'(\d+)\.', s).group()[0])) -tfm_list3.reverse() -tfm_list = tfm_list3 + tfm_list2 + tfm_list1 +tfm_list = sort_tfm(tfm_list3) + sort_tfm(tfm_list2) + sort_tfm(tfm_list1) f = open(spec_dir,'r') origin_data = f.read() diff --git a/pkg/Tizen.NET/Tizen.NET.nuspec b/pkg/Tizen.NET/Tizen.NET.nuspec index 7ddde653d41..f64c6253d16 100644 --- a/pkg/Tizen.NET/Tizen.NET.nuspec +++ b/pkg/Tizen.NET/Tizen.NET.nuspec @@ -52,14 +52,18 @@ - - - - + + + + + + + +