X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-exec.go;h=83743a3f5374035d8b4e3a46fc1947b386c69ce5;hb=2f718c72a51850f3ab1af8d93a381b594fb2c825;hp=d5b6466163e63ad45e997ff87cc19c5a864deb0a;hpb=0df439bb10fe1f178b32aff8467e9671888eac4b;p=src%2Fxds%2Fxds-cli.git

diff --git a/cmd-exec.go b/cmd-exec.go
index d5b6466..83743a3 100644
--- a/cmd-exec.go
+++ b/cmd-exec.go
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package main
 
 import (
@@ -5,7 +23,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/iotbzh/xds-agent/lib/apiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 	"github.com/urfave/cli"
 )
 
@@ -21,12 +39,12 @@ func initCmdExec(cmdDef *[]cli.Command) {
 				Usage:  "project ID you want to build (mandatory variable)",
 			},
 			cli.StringFlag{
-				Name:   "rpath",
+				Name:   "rpath, p",
 				EnvVar: "XDS_RPATH",
 				Usage:  "relative path into project",
 			},
 			cli.StringFlag{
-				Name:   "sdkid",
+				Name:   "sdkid, sdk",
 				EnvVar: "XDS_SDK_ID",
 				Usage:  "Cross Sdk ID to use to build project",
 			},
@@ -36,7 +54,7 @@ func initCmdExec(cmdDef *[]cli.Command) {
 
 func exec(ctx *cli.Context) error {
 	prjID := ctx.String("id")
-	rPath := ctx.String("rPath")
+	rPath := ctx.String("rpath")
 	sdkid := ctx.String("sdkid")
 
 	// Check mandatory args
@@ -49,7 +67,7 @@ func exec(ctx *cli.Context) error {
 	Log.Infof("Execute: /exec %v", argsCommand)
 
 	// Log useful info for debugging
-	ver := apiv1.XDSVersion{}
+	ver := xaapiv1.XDSVersion{}
 	XdsVersionGet(&ver)
 	Log.Infof("XDS version: %v", ver)
 
@@ -61,6 +79,7 @@ func exec(ctx *cli.Context) error {
 	exitChan := make(chan exitResult, 1)
 
 	IOsk.On("disconnection", func(err error) {
+		Log.Debugf("WS disconnection event with err: %v\n", err)
 		exitChan <- exitResult{err, 2}
 	})
 
@@ -77,16 +96,25 @@ func exec(ctx *cli.Context) error {
 		}
 	}
 
-	IOsk.On(apiv1.ExecOutEvent, func(ev apiv1.ExecOutMsg) {
+	IOsk.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) {
 		outFunc(ev.Timestamp, ev.Stdout, ev.Stderr)
 	})
 
-	IOsk.On(apiv1.ExecExitEvent, func(ev apiv1.ExecExitMsg) {
+	IOsk.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) {
 		exitChan <- exitResult{ev.Error, ev.Code}
 	})
 
+	IOsk.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) {
+		prj, _ := ev.DecodeProjectConfig()
+		Log.Infof("Event %v (%v): %v", ev.Type, ev.Time, prj)
+	})
+	evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTProjectChange}
+	if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil {
+		return cli.NewExitError(err, 1)
+	}
+
 	// Retrieve the project definition
-	prj := apiv1.ProjectConfig{}
+	prj := xaapiv1.ProjectConfig{}
 	if err := HTTPCli.Get("/projects/"+prjID, &prj); err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -115,7 +143,7 @@ func exec(ctx *cli.Context) error {
 	}
 
 	// Send build command
-	args := apiv1.ExecArgs{
+	args := xaapiv1.ExecArgs{
 		ID:         prjID,
 		SdkID:      sdkid,
 		Cmd:        strings.Trim(argsCommand[0], " "),