Preset Revised. New UI Introduced.

TDC Demo Preparation

Change-Id: I49c72d7528b1fa4781e64cdfd7234e85c79285f1
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/RULES b/RULES
index e0af6bd..daa7e35 100644 (file)
--- a/RULES
+++ b/RULES
@@ -124,6 +124,8 @@ or packages, but is used to provide UI elements in TIC.
             SD or sd: shaded blank line
             SM or sm: summary text is shown (HTML tags works)
             HT or ht: HTML tags from summary text is used. (same with SM/sm...)
+            HF or hf: blank line with half height
+            QT or qt: blank line with quarter height
 
 5.6. Blocks in TIC are placed sorted by package name. (ascending order)
 
@@ -149,4 +151,3 @@ expanded in TIC as default
     5.8.2. Using __EXPAND__ option requires consulting with building-block maintainers
     5.8.3. Using __EXPAND__ is allowed only for root blocks
 
-

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index f40b2a1..be50d3f 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -150,7 +150,24 @@ end}}
                elseif (string.sub(line, 1, 4) == 'boot') then \
                elseif (prefix == rpm.expand("%{2}")) then \
                        line = string.gsub(line, "-", "_")
-                       print("Suggests: "..rpm.expand("%{3}").."zblock_"..line) \
+                       print("Suggests: %{name}-"..rpm.expand("%{3}").."zblock_"..line) \
+                       print("\\n") \
+               end \
+       end \
+end}}
+
+
+# Requires the created suggests list of blocks with yaml file list
+# DIRECTORY, Prefix-To-Be-Removed, Prefix-for-block-name
+%define list_suggest_linkreq() %{expand:%{lua:if posix.access(rpm.expand("%{SOURCE1200}"), "f") then \
+       for f in posix.files(rpm.expand("%{1}")) do \
+               local line =  string.sub(f, string.len(rpm.expand("%{2}"))+2) \
+               local prefix = string.sub(f, 1, string.len(rpm.expand("%{2}"))) \
+               if (string.sub(line, 1, 10) == 'adaptation') then \
+               elseif (string.sub(line, 1, 4) == 'boot') then \
+               elseif (prefix == rpm.expand("%{2}")) then \
+                       line = string.gsub(line, "-", "_")
+                       print("Requires: %{name}-"..rpm.expand("%{3}").."zblock_"..line) \
                        print("\\n") \
                end \
        end \
@@ -170,7 +187,7 @@ end}}
                        local summary_available = 0 \
                        local filename = rpm.expand("%{1}").."/"..f \
                        print("\\n") \
-                       print("%%package "..pkg.."\\n") \
+                       print("%package "..pkg.."\\n") \
                        if posix.access(filename) then \
                                for tag in io.lines(filename) do \
                                        if (string.sub(tag, 1, 8) == "Summary:") then \
@@ -203,9 +220,9 @@ end}}
                        else \
                                print("Requires: CANNOT_FIND_REQUIRED_FILES\\n") \
                        end \
-                       print("%%description "..pkg.."\\n") \
+                       print("%description "..pkg.."\\n") \
                        print("Auto Generated Block (zblock) of "..f.."\\n") \
-                       print("%%files "..pkg.."\\n") \
+                       print("%files "..pkg.."\\n") \
                        print("\\n\\n\\n") \
                end \
        end \

diff --git a/packaging/domain-webapis.inc b/packaging/domain-webapis.inc
index 3560d82..3439903 100644 (file)
--- a/packaging/domain-webapis.inc
+++ b/packaging/domain-webapis.inc
@@ -4,11 +4,11 @@
 %package root-domain_WebAPI
 Summary:       Tizen Web API Sets
 Requires:      webapi-plugins
-Suggests:      webapi-pluging-common
-Suggests:      webapi-pluging-mobile
-Suggests:      webapi-pluging-ivi
-Suggests:      webapi-pluging-wearable
-Suggests:      webapi-pluging-tv
+Suggests:      webapi-plugins-profile_common
+Suggests:      webapi-plugins-profile_mobile
+Suggests:      webapi-plugins-profile_ivi
+Suggests:      webapi-plugins-profile_wearable
+Suggests:      webapi-plugins-profile_tv
 %description root-domain_WebAPI
 WebAPI Plugins
 %files root-domain_WebAPI

diff --git a/packaging/platform-preset-common.inc b/packaging/platform-preset-common.inc
index 7d9a9b5..b00da2f 100644 (file)
--- a/packaging/platform-preset-common.inc
+++ b/packaging/platform-preset-common.inc
@@ -11,6 +11,18 @@ Conflicts:   %{name}-sub1-Preset_sd-home_appliance
 Conflicts:     %{name}-root-Preset-iot
 Conflicts:     %{name}-sub1-Preset_sd-ivi
 
+%ifarch armv7l
+Suggests:      %{name}-sub2-Preset_sd-common-wayland_armv7l
+
+%endif
+%ifarch aarch64
+Suggests:      %{name}-sub2-Preset_sd-common-wayland_aarch64
+%endif
+
+%ifarch armv7l aarch64
+Suggests:      %{name}-sub2-Preset_sd-common-zAA__UI__QT
+%endif
+
 %list_suggest /usr/share/package-groups/common/ common sub2-Preset_sd-common-
 
 %description sub1-Preset_sd-common
@@ -18,3 +30,29 @@ Tizen Platform Presets for "Common Profile"
 %files sub1-Preset_sd-common
 
 %list_require %{_datadir}/package-groups/common/ common sub2-Preset_sd-common-
+
+
+
+%ifarch armv7l
+%package sub2-Preset_sd-common-wayland_armv7l
+Summary:       Example Image of "wayland-2parts-armv7l"
+%list_with_require %{_datadir}/image-configurations/common-wayland-2parts-armv7l.ks
+%description sub2-Preset_sd-common-wayland_armv7l
+Example of Tizen snapshot image, "common-wayland-2parts-armv7l"
+%files sub2-Preset_sd-common-wayland_armv7l
+%endif
+
+%ifarch aarch64
+%package sub2-Preset_sd-common-wayland_aarch64
+%list_with_require %{_datadir}/image-configurations/common-wayland-3parts-arm64.ks
+Summary:       Example Image of "wayland-3parts-arm654"
+%description sub2-Preset_sd-common-wayland_aarch64
+Example of Tizen snapshot image, "common-wayland-3parts-arm64"
+%files sub2-Preset_sd-common-wayland_aarch64
+%endif
+
+
+%package sub2-Preset_sd-common-zAA__UI__QT
+Summary:       Quarter Line
+%description sub2-Preset_sd-common-zAA__UI__QT
+%files sub2-Preset_sd-common-zAA__UI__QT

diff --git a/packaging/platform-preset-home_appliance.inc b/packaging/platform-preset-home_appliance.inc
index 8b40056..d8fddce 100644 (file)
--- a/packaging/platform-preset-home_appliance.inc
+++ b/packaging/platform-preset-home_appliance.inc
@@ -10,6 +10,45 @@ Conflicts:   %{name}-sub1-Preset_sd-wearable
 Conflicts:     %{name}-root-Preset-iot
 Conflicts:     %{name}-sub1-Preset_sd-ivi
 Conflicts:     %{name}-sub1-Preset_sd-common
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-refrigerator
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-air_purifier
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-robotic_vacuum
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-smart_oven
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-air_conditioner
+Suggests:      %{name}-sub2-Preset_sd-home_appliance-washer
 %description sub1-Preset_sd-home_appliance
 Tizen Platform Presets for "Home Appliances"
 %files sub1-Preset_sd-home_appliance
+
+
+
+%package sub2-Preset_sd-home_appliance-refrigerator
+Summary:       (Prototype) Refridgerator
+%description sub2-Preset_sd-home_appliance-refrigerator
+%files sub2-Preset_sd-home_appliance-refrigerator
+
+%package sub2-Preset_sd-home_appliance-air_purifier
+Summary:       (Prototype) Air Purifier
+%description sub2-Preset_sd-home_appliance-air_purifier
+%files sub2-Preset_sd-home_appliance-air_purifier
+
+%package sub2-Preset_sd-home_appliance-robotic_vacuum
+Summary:       (Prototype) Robotic Vacuum
+%description sub2-Preset_sd-home_appliance-robotic_vacuum
+%files sub2-Preset_sd-home_appliance-robotic_vacuum
+
+%package sub2-Preset_sd-home_appliance-smart_oven
+Summary:       (Prototype) Smart Oven
+%description sub2-Preset_sd-home_appliance-smart_oven
+%files sub2-Preset_sd-home_appliance-smart_oven
+
+%package sub2-Preset_sd-home_appliance-air_conditioner
+Summary:       (Prototype) Air Conditioner
+%description sub2-Preset_sd-home_appliance-air_conditioner
+%files sub2-Preset_sd-home_appliance-air_conditioner
+
+%package sub2-Preset_sd-home_appliance-washer
+Summary:       (Prototype) Washer and Dryer
+%description sub2-Preset_sd-home_appliance-washer
+%files sub2-Preset_sd-home_appliance-washer
+

diff --git a/packaging/platform-preset-ivi.inc b/packaging/platform-preset-ivi.inc
index 8b070e8..4c12af0 100644 (file)
--- a/packaging/platform-preset-ivi.inc
+++ b/packaging/platform-preset-ivi.inc
@@ -9,14 +9,20 @@ Conflicts:    %{name}-sub1-Preset_sd-wearable
 Conflicts:     %{name}-sub1-Preset_sd-home_appliance
 Conflicts:     %{name}-root-Preset-iot
 Suggests:      %{name}-sub2-Preset_sd-ivi-proto
+Suggests:      %{name}-sub2-Preset_sd-ivi-zAA__UI__QT
 %list_suggest /usr/share/package-groups/ivi/ ivi sub2-Preset_sd-ivi-
 %description sub1-Preset_sd-ivi
 Tizen IVI Platform Presets
 %files sub1-Preset_sd-ivi
 
+%package sub2-Preset_sd-ivi-zAA__UI__QT
+Summary:       Quarter Line
+%description sub2-Preset_sd-ivi-zAA__UI__QT
+%files sub2-Preset_sd-ivi-zAA__UI__QT
+
 
 %package sub2-Preset_sd-ivi-proto
-Summary:       IVI OdroidXU3 Prototype
+Summary:       Tizen IVI Reference Image of OdroidXU3
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/ivi-target-odroidxu3.ks
 %description sub2-Preset_sd-ivi-proto

diff --git a/packaging/platform-preset-mobile.inc b/packaging/platform-preset-mobile.inc
index 1a83d2a..ec350d9 100644 (file)
--- a/packaging/platform-preset-mobile.inc
+++ b/packaging/platform-preset-mobile.inc
@@ -7,18 +7,25 @@ Conflicts:    %{name}-sub1-Preset_sd-tv
 Conflicts:     %{name}-sub1-Preset_sd-wearable
 Conflicts:     %{name}-sub1-Preset_sd-ivi
 Conflicts:     %{name}-root-Preset_iot
+Suggests:      %{name}-sub2-Preset_sd-mobile-minimal
+Suggests:      %{name}-sub2-Preset_sd-mobile-general
 Suggests:      %{name}-sub2-Preset_sd-mobile-tm1
 Suggests:      %{name}-sub2-Preset_sd-mobile-tm2_aarch64
 Suggests:      %{name}-sub2-Preset_sd-mobile-tm2_armv7l
-Suggests:      %{name}-sub2-Preset_sd-mobile-minimal
+Suggests:      %{name}-sub2-Preset_sd-mobile-zAA__UI__QT
 %list_suggest /usr/share/package-groups/mobile/ mobile sub2-Preset_sd-mobile-
 %description sub1-Preset_sd-mobile
 Tizen Mobile Platform Presets
 %files sub1-Preset_sd-mobile
 
+%package sub2-Preset_sd-mobile-zAA__UI__QT
+Summary:       Quarter Line
+%description sub2-Preset_sd-mobile-zAA__UI__QT
+%files sub2-Preset_sd-mobile-zAA__UI__QT
+
 
 %package sub2-Preset_sd-mobile-tm1
-Summary:       Mobile-TM1
+Summary:       Tizen Reference TM1 (armv7l, mobile phone)
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_aarch64
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_armv7l
 Conflicts:     %{name}-sub2-Preset_sd-mobile-minimal
@@ -35,10 +42,11 @@ You may need mobile + tm1 MIC post script as well.
 %files sub2-Preset_sd-mobile-tm1
 
 %package sub2-Preset_sd-mobile-tm2_aarch64
-Summary:       Mobile-TM2 (aarch64. 64bit)
+Summary:       Tizen Reference TM2 (aarch64. 64bit, mobile phone)
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm1
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_armv7l
 Conflicts:     %{name}-sub2-Preset_sd-mobile-minimal
+Conflicts:     %{name}-sub2-Preset_sd-mobile-general
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-arm64-tm2.ks
 %description sub2-Preset_sd-mobile-tm2_aarch64
@@ -47,10 +55,11 @@ For architectural/post-script note, please refer to tm1 twin.
 %files sub2-Preset_sd-mobile-tm2_aarch64
 
 %package sub2-Preset_sd-mobile-tm2_armv7l
-Summary:       Mobile-TM2 (armv7l. 32bit)
+Summary:       Tizen Reference TM2 (armv7l. 32bit, mobile phone)
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm1
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_aarch64
 Conflicts:     %{name}-sub2-Preset_sd-mobile-minimal
+Conflicts:     %{name}-sub2-Preset_sd-mobile-general
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm2.ks
 %description sub2-Preset_sd-mobile-tm2_armv7l
@@ -63,10 +72,97 @@ For architectural/post-script note, please refer to tm1 twin.
 Summary:       Mobile Minimal Preset
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm1
 Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2
+Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_aarch64
+Conflicts:     %{name}-sub2-Preset_sd-mobile-general
+Requires:      %{name}-sub1-domain_API-Account
+Requires:      %{name}-sub1-domain_API-AppFramework
+Requires:      %{name}-sub1-domain_API-Base
+Requires:      %{name}-sub1-domain_API-Content
+Requires:      %{name}-sub1-domain_API-Context
+Requires:      %{name}-sub1-domain_API-Location
+Requires:      %{name}-sub1-domain_API-Messaging
+Requires:      %{name}-sub1-domain_API-Multimedia
+Requires:      %{name}-sub1-domain_API-Network
+Requires:      %{name}-sub1-domain_API-Security
+Requires:      %{name}-sub1-domain_API-Social
+Requires:      %{name}-sub1-domain_API-System
+Requires:      %{name}-sub1-domain_API-Telephony
+Requires:      %{name}-sub1-domain_API-UI
+Requires:      %{name}-sub1-domain_API-UIX
+Requires:      %{name}-sub1-domain_API-Web
+
+Suggests:      %{name}-root-domain_WebAPI
+Suggests:      webapi-plugins-profile_mobile
+
+Suggests:      csapi-account-fido-client
+Suggests:      csapi-account-manager
+Suggests:      csapi-account-oauth2
+Suggests:      csapi-application
+Suggests:      csapi-application-alarm
+Suggests:      csapi-application-common
+Suggests:      csapi-application-message-port
+Suggests:      csapi-application-notification
+Suggests:      csapi-application-package-manager
+Suggests:      csapi-application-preference
+Suggests:      csapi-application-service
+Suggests:      csapi-application-toastmessage
+Suggests:      csapi-application-ui
+Suggests:      csapi-badge
+Suggests:      csapi-calendar-service
+Suggests:      csapi-contacts-service
+Suggests:      csapi-data-control
+Suggests:      csapi-download
+Suggests:      csapi-feedback
+Suggests:      csapi-geofence
+Suggests:      csapi-information
+Suggests:      csapi-location
+Suggests:      csapi-maps
+Suggests:      csapi-media-content
+Suggests:      csapi-media-key
+Suggests:      csapi-messaging
+Suggests:      csapi-mime-type
+Suggests:      csapi-multimedia
+Suggests:      csapi-network-bluetooth
+Suggests:      csapi-network-connection
+Suggests:      csapi-network-iotconnectivity
+Suggests:      csapi-network-nfc
+Suggests:      csapi-network-smartcard
+Suggests:      csapi-network-wifi
+Suggests:      csapi-network-wifi-direct
+Suggests:      csapi-nui
+Suggests:      csapi-phonenumber-utils
+Suggests:      csapi-push
+Suggests:      csapi-security
+Suggests:      csapi-sensor
+Suggests:      csapi-storage
+Suggests:      csapi-system
+Suggests:      csapi-system-settings
+Suggests:      csapi-telephony
+Suggests:      csapi-tizen
+Suggests:      csapi-trace
+Suggests:      csapi-uix-inputmethod-manager
+Suggests:      csapi-uix-stt
+Suggests:      csapi-uix-tts
+Suggests:      csapi-uix-voicecontrol
+Suggests:      csapi-webview
+Suggests:      csapi-widget-application
+Suggests:      csapi-widget-control
+Suggests:      csapi-widget-viewer
+
 %description sub2-Preset_sd-mobile-minimal
-Tizen Mobile Minimal Platform Preset
+Tizen Mobile Minimal Platform Preset (Adds mobile native APIs only)
 
-Mobile-PM: fill in minimal API sets for mobile profile.
+%files sub2-Preset_sd-mobile-minimal
+
+%package sub2-Preset_sd-mobile-general
+Summary:       Mobile Minimal Preset
+Conflicts:     %{name}-sub2-Preset_sd-mobile-tm1
+Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2
+Conflicts:     %{name}-sub2-Preset_sd-mobile-tm2_aarch64
+Conflicts:     %{name}-sub2-Preset_sd-mobile-minimal
+%list_suggest_linkreq /usr/share/package-groups/mobile/ mobile sub2-Preset_sd-mobile-
+%description sub2-Preset_sd-mobile-general
+Tizen Mobile General Platform Preset (Adds all mobile's non adaptation packages)
 
 %files sub2-Preset_sd-mobile-minimal
 

diff --git a/packaging/platform-preset-tv.inc b/packaging/platform-preset-tv.inc
index 55796d9..44c8171 100644 (file)
--- a/packaging/platform-preset-tv.inc
+++ b/packaging/platform-preset-tv.inc
@@ -9,14 +9,21 @@ Conflicts:    %{name}-sub1-Preset_sd-ivi
 Conflicts:     %{name}-sub1-Preset_sd-home_appliance
 Conflicts:     %{name}-root-Preset-iot
 Suggests:      %{name}-sub2-Preset_sd-tv-odroid
+Suggests:      %{name}-sub2-Preset_sd-tv-zAA__UI__QT
 %list_suggest /usr/share/package-groups/tv/ tv sub2-Preset_sd-tv-
 %description sub1-Preset_sd-tv
 Tizen TV Platform Presets
 %files sub1-Preset_sd-tv
 
+%package sub2-Preset_sd-tv-zAA__UI__QT
+Summary:       Quarter Line
+%description sub2-Preset_sd-tv-zAA__UI__QT
+%files sub2-Preset_sd-tv-zAA__UI__QT
+
+
 
 %package sub2-Preset_sd-tv-odroid
-Summary:       TV-Odroid
+Summary:       Tizen TV Reference Image with Odroid
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/tv-wayland-armv7l-odroidu3.ks
 %description sub2-Preset_sd-tv-odroid

diff --git a/packaging/platform-preset-wearable.inc b/packaging/platform-preset-wearable.inc
index 7e9aab8..99b633a 100644 (file)
--- a/packaging/platform-preset-wearable.inc
+++ b/packaging/platform-preset-wearable.inc
@@ -8,19 +8,34 @@ Conflicts:    %{name}-sub1-Preset_sd-tv
 Conflicts:     %{name}-sub1-Preset_sd-ivi
 Conflicts:     %{name}-sub1-Preset_sd-home_appliance
 Conflicts:     %{name}-root-Preset-iot
+Suggests:      %{name}-sub2-Preset_sd-wearable-tw1
 Suggests:      %{name}-sub2-Preset_sd-wearable-tw2
+Suggests:      %{name}-sub2-Preset_sd-wearable-zAA__UI__QT
 %list_suggest /usr/share/package-groups/wearable/ wearable sub2-Preset_sd-wearable-
 %description sub1-Preset_sd-wearable
 Tizen Wearable Platform Presets
 %files sub1-Preset_sd-wearable
 
+%package sub2-Preset_sd-wearable-zAA__UI__QT
+Summary:       Quarter Line
+%description sub2-Preset_sd-wearable-zAA__UI__QT
+%files sub2-Preset_sd-wearable-zAA__UI__QT
+
+
+%package sub2-Preset_sd-wearable-tw1
+Summary:       Tizen Wearable Reference TW1
+# image-configuration must have this file supplied.
+%list_with_require %{_datadir}/image-configurations/wearable-wayland-armv7l-tw1.ks
+%description sub2-Preset_sd-wearable-tw1
+Tizen Wearable TW1 (Gear 2) Preset
+%files sub2-Preset_sd-wearable-tw1
 
 %package sub2-Preset_sd-wearable-tw2
-Summary:       Wearable-TW2
+Summary:       Tizen Wearable Reference TW2
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/wearable-wayland-armv7l-tw2.ks
 %description sub2-Preset_sd-wearable-tw2
-Tizen Wearable TW1 (Gear 2) Preset
+Tizen Wearable TW2 (Gear S2) Preset
 %files sub2-Preset_sd-wearable-tw2
 
 %list_require /usr/share/package-groups/wearable/ wearable sub2-Preset_sd-wearable-