Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rework development page: Pre-build, Build, Populate.
[src/xds/xds-server.git]
/
webapp
/
src
/
app
/
services
/
xdsserver.service.ts
diff --git
a/webapp/src/app/common/xdsserver.service.ts
b/webapp/src/app/services/xdsserver.service.ts
similarity index 88%
rename from
webapp/src/app/common/xdsserver.service.ts
rename to
webapp/src/app/services/xdsserver.service.ts
index
49c2d37
..
22e4ac9
100644
(file)
--- a/
webapp/src/app/common/xdsserver.service.ts
+++ b/
webapp/src/app/services/xdsserver.service.ts
@@
-147,6
+147,14
@@
export class XDSServerService {
this.CmdExit$.next(Object.assign({}, <ICmdExit>data));
});
this.CmdExit$.next(Object.assign({}, <ICmdExit>data));
});
+ this.socket.on('exec:output', data => {
+ this.CmdOutput$.next(Object.assign({}, <ICmdOutput>data));
+ });
+
+ this.socket.on('exec:exit', data => {
+ this.CmdExit$.next(Object.assign({}, <ICmdExit>data));
+ });
+
}
getSdks(): Observable<ISdk[]> {
}
getSdks(): Observable<ISdk[]> {
@@
-177,16
+185,27
@@
export class XDSServerService {
return this._delete('/folder/' + id);
}
return this._delete('/folder/' + id);
}
- exec(
cmd: string, args?: string[], options?: any
): Observable<any> {
+ exec(
prjID: string, dir: string, cmd: string, sdkid?: string, args?: string[], env?: string[]
): Observable<any> {
return this._post('/exec',
{
return this._post('/exec',
{
+ id: prjID,
+ rpath: dir,
cmd: cmd,
cmd: cmd,
- args: args || []
+ sdkid: sdkid || "",
+ args: args || [],
+ env: env || [],
});
}
});
}
- make(prjID: string, dir: string, args: string, sdkid?: string): Observable<any> {
- return this._post('/make', { id: prjID, rpath: dir, args: args, sdkid: sdkid });
+ make(prjID: string, dir: string, sdkid?: string, args?: string[], env?: string[]): Observable<any> {
+ return this._post('/make',
+ {
+ id: prjID,
+ rpath: dir,
+ sdkid: sdkid,
+ args: args || [],
+ env: env || [],
+ });
}
}