merge tizen 2.3/2.4 to xsd and related structure type for parsing manifest

Change-Id: I28fd3cbdfa625081364528684ef26dea25a74a62
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/include/pkgmgrinfo_basic.h b/include/pkgmgrinfo_basic.h
index a588126..f34b5f9 100644 (file)
--- a/include/pkgmgrinfo_basic.h
+++ b/include/pkgmgrinfo_basic.h
@@ -92,81 +92,90 @@ typedef struct datacontrol_x {
 } datacontrol_x;
 
 typedef struct application_x {
-       const char *appid;
-       const char *component;
-       const char *exec;
-       const char *nodisplay;
-       const char *type;
-       const char *onboot;
-       const char *multiple;
-       const char *autorestart;
-       const char *taskmanage;
-       const char *enabled;
-       const char *categories;
-       const char *extraid;
-       const char *hwacceleration;
-       const char *screenreader;
-       const char *mainapp;
-       const char *recentimage;
-       const char *launchcondition;
-       const char *indicatordisplay;
-       const char *portraitimg;
-       const char *landscapeimg;
-       const char *guestmode_visibility;
-       const char *permission_type;
-       const char *preload;
-       const char *submode;
-       const char *submode_mainid;
-       const char *launch_mode;
-       const char *ui_gadget;
-       const char *support_disable;
-       const char *component_type;
-       const char *package;
-       GList *label;
-       GList *icon;
-       GList *image;
-       GList *appcontrol;
-       GList *category;
-       GList *metadata;
-       GList *permission;
-       GList *launchconditions;
-       GList *notification;
-       GList *datashare;
-       GList *datacontrol;
+       const char *appid;      /*attr*/
+       const char *exec;       /*attr*/
+       const char *nodisplay;  /*attr, default: "false"*/
+       const char *multiple;   /*attr, default: "false"*/
+       const char *taskmanage; /*attr, default: "true"*/
+       const char *enabled;    /*attr, default: "true"*/
+       const char *type;       /*attr*/
+       const char *categories; /*attr*/
+       const char *extraid;    /*attr*/
+       const char *hwacceleration;     /*attr, default: "default"*/
+       const char *screenreader;       /*attr, default: "use-system-setting"*/
+       const char *mainapp;    /*attr, default: "false"*/
+       const char *package;    /*set from package_x*/
+       const char *recentimage;        /*attr, default: "false"*/
+       const char *launchcondition;    /*attr, default: "false"*/
+       const char *indicatordisplay;   /*attr, default: "true"*/
+       const char *portraitimg;        /*attr*/
+       const char *landscapeimg;       /*attr*/
+       const char *effectimage_type;   /*attr, default: "image"*/
+       const char *guestmode_visibility;       /*attr, default: "true"*/
+       const char *component;  /*no xml part*/
+       const char *permission_type;    /*attr, default: "normal"*/
+       const char *component_type;     /*attr, default: "uiapp"*/
+       const char *preload;    /*no xml part*/
+       const char *submode;    /*attr, default: "false"*/
+       const char *submode_mainid;     /*attr, default: "false"*/
+       const char *process_pool;       /*attr, default: "false"*/
+       const char *autorestart;        /*attr, default: "false"*/
+       const char *onboot;     /*attr, default: "false"*/
+       const char *multi_instance;     /*attr, default: "false"*/
+       const char *multi_instance_mainid;      /*attr*/
+       const char *support_disable;    /*set from package_x*/
+       const char *ui_gadget;  /*attr, default: "false"*/
+       const char *launch_mode;        /*attr, default: "single"*/
+       const char *ambient_support;    /*attr, default: "false"*/
+       GList *label;   /*element*/
+       GList *icon;    /*element*/
+       GList *image;   /*element*/
+       GList *category; /*element*/
+       GList *metadata;        /*element*/
+       GList *permission;      /*element*/
+       GList *launchconditions;        /*element*/
+       GList *notification;    /*element*/
+       GList *datashare;       /*element*/
+       GList *datacontrol; /*element*/
+       GList *background_category; /*element*/
+       GList *appcontrol; /*element*/
 } application_x;
 
 typedef struct package_x {
-       const char *for_all_users;              /**< Flag that indicates if the package is available for everyone or for current user only*/
-       const char *package;            /**< package name*/
-       const char *version;            /**< package version*/
-       const char *installlocation;            /**< package install location*/
-       const char *ns;         /**<name space*/
-       const char *removable;          /**< package removable flag*/
-       const char *preload;            /**< package preload flag*/
-       const char *readonly;           /**< package readonly flag*/
-       const char *update;                     /**< package update flag*/
-       const char *appsetting;         /**< package app setting flag*/
-       const char *system;             /**< package system flag*/
-       const char *type;               /**< package type*/
-       const char *package_size;               /**< package size for external installation*/
-       const char *installed_time;             /**< installed time after finishing of installation*/
-       const char *installed_storage;          /**< package currently installed storage*/
-       const char *storeclient_id;             /**< id of store client for installed package*/
-       const char *mainapp_id;         /**< app id of main application*/
-       const char *package_url;                /**< app id of main application*/
-       const char *root_path;          /**< package root path*/
-       const char *csc_path;           /**< package csc path*/
-       const char *nodisplay_setting;          /**< package no display setting menu*/
-       const char *api_version;                /**< minimum version of API package using*/
-       const char *support_disable;            /**< package support disable flag*/
-       GList *icon;            /**< package icon*/
-       GList *label;           /**< package label*/
-       GList *author;          /**< package author*/
-       GList *description;             /**< package description*/
-       GList *license;         /**< package license*/
-       GList *privileges;      /**< package privileges*/
-       GList *application;             /**< package's application*/
-       GList *compatibility;           /**< package compatibility*/
+       const char *for_all_users;              /**< Flag that indicates if the package is available for everyone or for current user only, no xml part*/
+       const char *package;            /**< package name, attr*/
+       const char *version;            /**< package version, attr*/
+       const char *installlocation;            /**< package install location, attr, default: "internal-only"*/
+       const char *ns;         /**<name space, attr*/
+       const char *removable;          /**< package removable flag, no xml part*/
+       const char *preload;            /**< package preload flag, no xml part*/
+       const char *readonly;           /**< package readonly flag, no xml part*/
+       const char *update;                     /**< package update flag, no xml part*/
+       const char *appsetting;         /**< package app setting flag, attr, default: "false"*/
+       const char *system;             /**< package system flag, no xml part*/
+       const char *type;               /**< package type, attr, default: "rpm"*/
+       const char *package_size;               /**< package size for external installation, attr*/
+       const char *installed_time;             /**< installed time after finishing of installation, no xml part*/
+       const char *installed_storage;          /**< package currently installed storage, no xml part*/
+       const char *storeclient_id;             /**< id of store client for installed package, attr*/
+       const char *mainapp_id;         /**< app id of main application, no xml part*/
+       const char *package_url;                /**< app id of main application, attr*/
+       const char *root_path;          /**< package root path, attr*/
+       const char *csc_path;           /**< package csc path, attr*/
+       const char *nodisplay_setting;          /**< package no display setting menu, attr, default: "false"*/
+       const char *support_disable;            /**< package support disable flag, attr, default: "false"*/
+       const char *api_version;                /**< minimum version of API package using, attr, default: patch_version trimmed version from tizen_full_version*/
+       const char *tep_name;   /*no xml part*/
+       const char *backend_installer;          /**< package backend installer, attr*/
+       GList *icon;            /**< package icon, element*/
+       GList *label;           /**< package label, element*/
+       GList *author;          /**< package author, element*/
+       GList *description;             /**< package description, element*/
+       GList *license;         /**< package license, no xml part*/
+       GList *privileges;      /**< package privileges, element*/
+       GList *application;             /**< package's application, element*/
+       GList *compatibility;           /**< package compatibility, element*/
+       GList *deviceprofile;           /**< package device profile, element*/
 } package_x;
 
 typedef struct package_x manifest_x;

diff --git a/parser/manifest.xsd.in b/parser/manifest.xsd.in
index 630f3b2..fc75b7f 100644 (file)
--- a/parser/manifest.xsd.in
+++ b/parser/manifest.xsd.in
@@ -12,38 +12,35 @@
           <xs:element ref="packages:description"/>
           <xs:element ref="packages:compatibility"/>
           <xs:element ref="packages:profile"/>
+          <xs:element ref="packages:watch-application"/>
+          <xs:element ref="packages:watchface"/> <!-- TBD -->
           <xs:element ref="packages:service-application"/>
           <xs:element ref="packages:ui-application"/>
-          <xs:element ref="packages:widget"/>
-          <xs:element ref="packages:widget-application"/>
-          <xs:element ref="packages:watch-application"/>
-          <xs:element ref="packages:watchface"/>
-          <xs:element ref="packages:ime-application"/>
-          <xs:element ref="packages:shortcut-list"/>
-          <xs:element ref="packages:livebox"/>
-          <xs:element ref="packages:account"/>
-          <xs:element ref="packages:notifications"/>
+          <xs:element ref="packages:ime-application"/> <!-- TBD -->
+          <xs:element ref="packages:shortcut-list"/> <!-- TBD -->
+          <xs:element ref="packages:widget"/> <!-- TBD -->
+          <xs:element ref="packages:widget-application"/> <!-- TBD -->
+          <xs:element ref="packages:account"/> <!-- TBD -->
+          <xs:element ref="packages:notifications"/> <!-- TBD -->
           <xs:element ref="packages:privileges"/>
-          <xs:element ref="packages:font"/>
-          <xs:element ref="packages:ime"/>
-          <xs:element ref="packages:feature"/>
+          <xs:element ref="packages:font"/> <!-- TBD -->
+          <xs:element ref="packages:ime"/> <!-- TBD -->
+          <xs:element ref="packages:feature"/> <!-- TBD -->
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="storeclient-id" type="xs:string"/>
       <xs:attribute name="install-location" type="packages:InstallLocationType"/>
       <xs:attribute name="package" use="required" type="xs:string"/>
       <xs:attribute name="type" type="packages:PackageType"/>
-      <xs:attribute name="version" use="required" type="xs:string"/>
+      <xs:attribute name="version" use="required" type="xs:NMTOKEN"/>
       <xs:attribute name="size" type="xs:NMTOKEN"/>
       <xs:attribute name="root_path" type="xs:string"/>
       <xs:attribute name="csc_path" type="xs:string"/>
       <xs:attribute name="appsetting" type="xs:boolean"/>
       <xs:attribute name="nodisplay-setting" type="xs:boolean"/>
       <xs:attribute name="url" type="xs:string"/>
-      <xs:attribute name="api-version" type="xs:string"/>
       <xs:attribute name="support-disable" type="xs:boolean"/>
-      <xs:attribute name="support-mode" type="xs:string"/>
-      <xs:attribute name="support-reset" type="xs:string"/>
+      <xs:attribute name="api-version" type="xs:string"/>
       <xs:attribute name="backend-installer" type="xs:string"/>
     </xs:complexType>
   </xs:element>
@@ -80,6 +77,9 @@
   </xs:simpleType>
   <xs:simpleType name="HwAccelerationType">
     <xs:restriction base="xs:string">
+      <xs:enumeration value="on"/>
+      <xs:enumeration value="off"/>
+      <xs:enumeration value="default"/>
       <xs:enumeration value="use-GL"/>
       <xs:enumeration value="not-use-GL"/>
       <xs:enumeration value="use-system-setting"/>
@@ -114,14 +114,26 @@
   <xs:element name="compatibility">
     <xs:complexType/>
   </xs:element>
-  <xs:element name="device-profile">
-    <xs:complexType/>
-  </xs:element>
   <xs:element name="profile">
     <xs:complexType>
-      <xs:attribute name="name" type="packages:ProfileType"/>
+      <xs:attribute name="name" use="required" type="packages:ProfileType"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="watch-application">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+          <xs:element ref="packages:label"/>
+          <xs:element ref="packages:icon"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="appid" use="required" type="xs:ID"/>
+      <xs:attribute name="exec" use="required"/>
+      <xs:attribute name="ambient-support" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
+  <xs:element name="watchface">
+  </xs:element>
   <xs:element name="service-application">
     <xs:complexType>
       <xs:sequence>
@@ -134,6 +146,7 @@
           <xs:element ref="packages:metadata"/>
           <xs:element ref="packages:permission"/>
           <xs:element ref="packages:datacontrol"/>
+          <xs:element ref="packages:background-category"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
@@ -164,7 +177,7 @@
           <xs:element ref="packages:background-category"/>
         </xs:choice>
       </xs:sequence>
-      <xs:attribute name="appid" use="required" type="xs:string"/>
+      <xs:attribute name="appid" use="required" type="xs:ID"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="nodisplay" type="xs:boolean"/>
@@ -178,32 +191,24 @@
       <xs:attribute name="recentimage" type="packages:RecentImage"/>
       <xs:attribute name="mainapp" type="xs:boolean"/>
       <xs:attribute name="indicatordisplay" type="xs:boolean"/>
-      <xs:attribute name="effectimage-type" type="xs:string"/>
       <xs:attribute name="portrait-effectimage" type="xs:string"/>
       <xs:attribute name="landscape-effectimage" type="xs:string"/>
+      <xs:attribute name="effectimage-type" type="xs:string"/>
       <xs:attribute name="guestmode-visibility" type="xs:string"/>
       <xs:attribute name="launchcondition" type="xs:boolean"/>
       <xs:attribute name="permission-type" type="xs:string"/>
       <xs:attribute name="component-type" type="xs:string"/>
       <xs:attribute name="submode" type="xs:boolean"/>
       <xs:attribute name="submode-mainid" type="xs:string"/>
-      <xs:attribute name="launch_mode" type="packages:LaunchType"/>
-      <xs:attribute name="on-boot" type="xs:boolean"/>
-      <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="process-pool" type="xs:boolean"/>
+      <xs:attribute name="auto-restart" type="xs:boolean"/>
+      <xs:attribute name="on-boot" type="xs:boolean"/>
       <xs:attribute name="multi-instance" type="xs:boolean"/>
       <xs:attribute name="multi-instance-mainid" type="xs:string"/>
       <xs:attribute name="ui-gadget" type="xs:boolean"/>
+      <xs:attribute name="launch_mode" type="packages:LaunchType"/>
     </xs:complexType>
   </xs:element>
-  <xs:element name="widget">
-  </xs:element>
-  <xs:element name="widget-application">
-  </xs:element>
-  <xs:element name="watch-application">
-  </xs:element>
-  <xs:element name="watchface">
-  </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>
       <xs:sequence>
@@ -212,7 +217,7 @@
           <xs:element ref="packages:icon"/>
         </xs:choice>
       </xs:sequence>
-      <xs:attribute name="appid" use="required" type="xs:string"/>
+      <xs:attribute name="appid" use="required" type="xs:ID"/>
       <xs:attribute name="exec" use="required" type="xs:NCName"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="nodisplay" type="xs:boolean"/>
@@ -221,7 +226,23 @@
   </xs:element>
   <xs:element name="shortcut-list">
   </xs:element>
-  <xs:element name="livebox">
+  <xs:element name="widget">
+  </xs:element>
+  <xs:element name="widget-application">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+          <xs:element ref="packages:label"/>
+          <xs:element ref="packages:icon"/>
+          <xs:element ref="packages:support-size"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="appid" use="required" type="xs:ID"/>
+      <xs:attribute name="exec" use="required"/>
+      <xs:attribute name="main" type="xs:boolean"/>
+      <xs:attribute name="update-period" type="xs:positiveInteger"/>
+      <xs:attribute name="preview" type="xs:string"/>
+    </xs:complexType>
   </xs:element>
   <xs:element name="account">
   </xs:element>
@@ -273,6 +294,7 @@
     <xs:enumeration value="caller"/>
     <xs:enumeration value="single"/>
     <xs:enumeration value="group"/>
+    <xs:enumeration value="singleton"/>
    </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="ResolutionType">
@@ -355,7 +377,20 @@
   </xs:element>
   <xs:element name="background-category">
     <xs:complexType mixed="true">
-      <xs:attribute name="value" type="xs:string"/>
+      <xs:attribute name="value" type="packages:BackgroundCategoryType"/>
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="BackgroundCategoryType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="media"/>
+      <xs:enumeration value="download"/>
+      <xs:enumeration value="background-network"/>
+      <xs:enumeration value="location"/>
+      <xs:enumeration value="sensor"/>
+      <xs:enumeration value="iot-communication"/>
+      <xs:enumeration value="system"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="support-size">
+  </xs:element>
 </xs:schema>