projects
/
framework
/
web
/
wrt-installer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Release] wrt-installer_0.1.39
[framework/web/wrt-installer.git]
/
src
/
jobs
/
widget_install
/
widget_install_context.h
diff --git
a/src/jobs/widget_install/widget_install_context.h
b/src/jobs/widget_install/widget_install_context.h
index
510926c
..
7d3eec2
100644
(file)
--- a/
src/jobs/widget_install/widget_install_context.h
+++ b/
src/jobs/widget_install/widget_install_context.h
@@
-47,38
+47,36
@@
struct InstallerContext
{
INSTALL_START = 0,
INSTALL_CHECK_FILE,
{
INSTALL_START = 0,
INSTALL_CHECK_FILE,
- INSTALL_CREATE_TEMPDIR,
+
+ INSTALL_RDS_DELTA_CHECK,
+ INSTALL_RDS_PREPARE,
+
INSTALL_UNZIP_FILES,
INSTALL_WIDGET_CONFIG1,
INSTALL_WIDGET_CONFIG2,
INSTALL_UNZIP_FILES,
INSTALL_WIDGET_CONFIG1,
INSTALL_WIDGET_CONFIG2,
- INSTALL_WIDGET_CONFIG3,
- INSTALL_WIDGET_CONFIG4,
- INSTALL_WIDGET_CONFIG5,
INSTALL_DIGSIG_CHECK,
INSTALL_CERT_CHECK,
INSTALL_DIGSIG_CHECK,
INSTALL_CERT_CHECK,
- INSTALL_
DB_UPDATE
,
+ INSTALL_
ECRYPTION_FILES
,
INSTALL_DIR_CREATE,
INSTALL_RENAME_PATH,
INSTALL_DIR_CREATE,
INSTALL_RENAME_PATH,
- INSTALL_CREATE_BACKUP_DIR
= INSTALL_DB_UPDATE,
/* For Update */
+ INSTALL_CREATE_BACKUP_DIR
,
/* For Update */
INSTALL_BACKUP_RES_FILES, /* For Update */
INSTALL_BACKUP_EXEC, /* For Update */
INSTALL_BACKUP_RES_FILES, /* For Update */
INSTALL_BACKUP_EXEC, /* For Update */
- INSTALL_NEW_DB_INSERT, /* For Update */
- INSTALL_ACE_PREPARE,
- INSTALL_ACE_CHECK,
- INSTALL_SMACK_ENABLE,
INSTALL_BACKUP_ICONFILE, /* For Update */
INSTALL_COPY_ICONFILE,
INSTALL_CREATE_EXECFILE,
INSTALL_CREATE_MANIFEST,
INSTALL_BACKUP_ICONFILE, /* For Update */
INSTALL_COPY_ICONFILE,
INSTALL_CREATE_EXECFILE,
INSTALL_CREATE_MANIFEST,
- INSTALL_CREATE_DESKTOP,
INSTALL_CREATE_SHORTCUT,
INSTALL_CREATE_SHORTCUT,
+ INSTALL_SET_CERTINFO,
INSTALL_INSTALL_OSPSVC,
INSTALL_INSTALL_OSPSVC,
-
- INSTALL_UPDATE_DESKTOP = INSTALL_CREATE_DESKTOP, /* For Update */
- INSTALL_DELETE_OLD_DB, /* For Update */
INSTALL_REMOVE_BACKUP_FILE,
INSTALL_REMOVE_BACKUP_FILE,
+ INSTALL_PLUGINS_COPY,
+ INSTALL_NEW_DB_INSERT,
+ INSTALL_ACE_PREPARE,
+ INSTALL_ACE_CHECK,
+ INSTALL_SMACK_ENABLE,
INSTALL_END
} InstallStep;
INSTALL_END
} InstallStep;
@@
-90,9
+88,7
@@
struct InstallerContext
// information.
InstallStep installStep; ///< current step of installation
Jobs::WidgetInstall::JobWidgetInstall *job;
// information.
InstallStep installStep; ///< current step of installation
Jobs::WidgetInstall::JobWidgetInstall *job;
- ///< pointer of instance of JobWidgetInstall
- WidgetUpdateInfo::ExistingWidgetInfo existingWidgetInfo;
- ///< Whether this is an update or normal installation
+ ///< Whether this is an update or normal installation
Jobs::WidgetInstall::FeatureLogicPtr featureLogic;
/** List of dev-caps that are requested in widget config file.
* Additional flag tells whether dev cap gets "static" permission
Jobs::WidgetInstall::FeatureLogicPtr featureLogic;
/** List of dev-caps that are requested in widget config file.
* Additional flag tells whether dev cap gets "static" permission
@@
-104,6
+100,7
@@
struct InstallerContext
std::string installInfo; ///<For recovery>
bool m_quiet;
InstallLocationType locationType;
std::string installInfo; ///<For recovery>
bool m_quiet;
InstallLocationType locationType;
+ bool isUpdateMode;
};
#endif // INSTALLER_CONTEXT_H
};
#endif // INSTALLER_CONTEXT_H