[Build] Add RIDs of Tizen.6.0.0 and Set RIDs to vconf automatically (#1420)

* [Build] Add RIDs of Tizen.6.0.0 and Set RIDs to vconf automatically

* Added to update RIDs with makerid.py

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 055f4426e0b34c3e287e8d0f8a7c2436039887cd..7ee6d8c5a2b844d641517ebe2aa095b08728a05b 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -10,6 +10,8 @@
 %define DOTNET_TOOLS_PATH /usr/share/dotnet.tizen/tools
 %define DOTNET_NUGET_SOURCE /nuget
 
+%define TIZEN_NET_RUNTIME_IDENTIFIERS 4.0.0:5.0.0:5.5.0:6.0.0
+
 Name:       csapi-tizenfx
 Summary:    Assemblies of Tizen .NET
 Version:    %{TIZEN_NET_RPM_VERSION}
@@ -182,6 +184,7 @@ install -p -m 644 tools/bin/* %{buildroot}%{DOTNET_TOOLS_PATH}
 %post
 /usr/bin/vconftool set -t int db/dotnet/tizen_api_version %{TIZEN_NET_API_VERSION} -f
 /usr/bin/vconftool set -t string db/dotnet/tizen_api_path %{DOTNET_ASSEMBLY_PATH} -f
+/usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f
 
 %files
 %license LICENSE

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
index 4a5761094c1613f0e63b7c6f6dd9b9c4c2fd31e8..2ea5198ec36bd26c551518f404de4eca2c414285 100644 (file)
--- a/packaging/csapi-tizenfx.spec.in
+++ b/packaging/csapi-tizenfx.spec.in
@@ -9,6 +9,8 @@
 %define DOTNET_TOOLS_PATH /usr/share/dotnet.tizen/tools
 %define DOTNET_NUGET_SOURCE /nuget
 
+%define TIZEN_NET_RUNTIME_IDENTIFIERS @rid_version@
+
 Name:       csapi-tizenfx
 Summary:    Assemblies of Tizen .NET
 Version:    %{TIZEN_NET_RPM_VERSION}
@@ -181,6 +183,7 @@ install -p -m 644 tools/bin/* %{buildroot}%{DOTNET_TOOLS_PATH}
 %post
 /usr/bin/vconftool set -t int db/dotnet/tizen_api_version %{TIZEN_NET_API_VERSION} -f
 /usr/bin/vconftool set -t string db/dotnet/tizen_api_path %{DOTNET_ASSEMBLY_PATH} -f
+/usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f
 
 %files
 %license LICENSE

diff --git a/packaging/makerid.py b/packaging/makerid.py
new file mode 100755 (executable)
index 0000000..d6a5dca
--- /dev/null
+++ b/packaging/makerid.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+
+import json
+import os
+
+scrpit_dir = os.path.dirname(os.path.abspath(__file__))
+runtime_dir = os.path.join(scrpit_dir, "../pkg/Tizen.NET/runtime.json")
+spec_dir = os.path.join(scrpit_dir, "csapi-tizenfx.spec")
+
+with open(runtime_dir) as json_file:
+    json_data = json.load(json_file)
+    json_string = json_data["runtimes"]
+
+    key_list = json_string.keys()
+    rid_list = []
+
+    for key in key_list:
+        key = key.replace("-armel", "")
+        key = key.replace("-x86", "")
+        key = key.replace("tizen.", "")
+        key = key.replace("tizen", "")
+        if key.strip():
+            rid_list.append(key)
+
+    rid_list = list(set(rid_list))
+    rid_list.sort()
+    
+    f = open(spec_dir,'r')
+    origin_data = f.read()
+    f.close()
+
+    new_data = origin_data.replace("@rid_version@", ':'.join(rid_list))
+
+    f = open(spec_dir, 'w')
+    f.write(new_data)
+    f.close()

diff --git a/packaging/makespec.sh b/packaging/makespec.sh
index 6a57f617f8d7fddf6e80ea9a4f957b66f99a7436..7afcedac4da57de847cdb538470bfb5e2453dcbb 100755 (executable)
--- a/packaging/makespec.sh
+++ b/packaging/makespec.sh
@@ -24,3 +24,6 @@ echo "# Auto-generated from $(basename $RPMSPEC_IN) by makespec.sh" | cat - $RPM
 sed -i -e "s/@api_version@/$API_VERSION/g" $RPMSPEC
 sed -i -e "s/@rpm_version@/$RPM_VERSION/g" $RPMSPEC
 sed -i -e "s/@nuget_version@/$NUGET_VERSION/g" $RPMSPEC
+
+# Update RID
+$SCRIPT_DIR/makerid.py

diff --git a/pkg/Tizen.NET/runtime.json b/pkg/Tizen.NET/runtime.json
index 8d5d3a00a6b6ce587c9e6ebfc7565c3943e1ad28..149925b855f36847b9696452fbd401c4c08aa7a5 100644 (file)
--- a/pkg/Tizen.NET/runtime.json
+++ b/pkg/Tizen.NET/runtime.json
@@ -68,5 +68,22 @@
         "tizen.5.0.0-x86"
       ]
     },
+    "tizen.6.0.0": {
+      "#import": [
+        "tizen.5.5.0"
+      ]
+    },
+    "tizen.6.0.0-armel": {
+      "#import": [
+        "tizen.6.0.0",
+        "tizen.5.5.0-armel"
+      ]
+    },
+    "tizen.6.0.0-x86": {
+      "#import": [
+        "tizen.6.0.0",
+        "tizen.5.5.0-x86"
+      ]
+    }
   }
 }