Skip to content

Commit f672712

Browse files
authored
Merge branch 'develop' into feature/action-deploy-for/develop
2 parents b4b917c + fdec4fb commit f672712

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

apis/LifecycleManager/ILifecycleManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ struct EXTERNAL ILifecycleManager : virtual public Core::IUnknown {
105105
// @json:omit
106106
// @text spawnApp
107107
// @brief Perform launching of application with window and runtime manager
108-
virtual Core::hresult SpawnApp(const string& appId /* @in */, const string& appPath /* @in */, const string& appConfig /* @in */, const string& runtimeAppId /* @in */, const string& runtimePath /* @in */, const string& runtimeConfig /* @in */, const string& launchIntent /* @in */, const string& environmentVars /* @in */, const bool enableDebugger /* @in */, const LifecycleState targetLifecycleState /* @in */, const RuntimeConfig& runtimeConfigObject /* @in */, const string& launchArgs /* @in */, string& appInstanceId /* @out */, string& errorReason /* @out */, bool& success /* @out */) = 0;
108+
virtual Core::hresult SpawnApp(const string& appId /* @in */, const string& launchIntent /* @in */, const LifecycleState targetLifecycleState /* @in */, const RuntimeConfig& runtimeConfigObject /* @in */, const string& launchArgs /* @in */, string& appInstanceId /* @out */, string& errorReason /* @out */, bool& success /* @out */) = 0;
109109

110110
/** Get the list of loaded applications */
111111
// @json:omit

apis/RuntimeManager/IRuntimeManager.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,12 @@ struct EXTERNAL IRuntimeManager : virtual public Core::IUnknown {
115115
// @text run
116116
// @param appId App identifier for the application/container
117117
// @param appInstanceId App identifier for the application/container
118-
// @param appPath path of the container/application
119-
// @param runtimePath(optional) run time path of the container/application
120-
// @param envVars The tokens from the Firebolt Gateway will be passed as part of the environmentVars
121118
// @param userId userId used to identify the user
122119
// @param userId groupid used to represent a group
123120
// @param ports(optional) array of socket ports to allow
124121
// @param paths(optional) paths contains an additional set of files and directories to map into the container
125122
// @param debugSettings(optional) can include additional ports to open for gdb and other settings for debugging
126-
virtual Core::hresult Run(const string& appId, const string& appInstanceId, const string& appPath, const string& runtimePath, IStringIterator* const& envVars, const uint32_t userId, const uint32_t groupId, IValueIterator* const& ports, IStringIterator* const& paths, IStringIterator* const& debugSettings, const RuntimeConfig& runtimeConfigObject) = 0;
123+
virtual Core::hresult Run(const string& appId, const string& appInstanceId, const uint32_t userId, const uint32_t groupId, IValueIterator* const& ports, IStringIterator* const& paths, IStringIterator* const& debugSettings, const RuntimeConfig& runtimeConfigObject) = 0;
127124

128125
/** @brief Hibernate the application */
129126
// @text hibernate

0 commit comments

Comments
 (0)