diff options
| -rw-r--r-- | .vscode/settings.json | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | cmd-exec.go | 4 | ||||
| -rw-r--r-- | cmd-misc.go | 4 | ||||
| -rw-r--r-- | cmd-projects.go | 4 | ||||
| -rw-r--r-- | cmd-sdks.go | 4 | ||||
| -rw-r--r-- | conf.d/etc/profile.d/xds-cli.sh | 2 | ||||
| -rw-r--r-- | glide.yaml | 6 | ||||
| -rw-r--r-- | main.go | 9 | ||||
| -rwxr-xr-x | scripts/install.sh | 2 | ||||
| -rw-r--r-- | utils.go | 4 |
11 files changed, 27 insertions, 26 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 6afb506..ca53749 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,6 +24,6 @@ "cSpell.words": [ "apiv", "iosk", "zhouhui", "ldflags", "socketio", "xdsconfig", "sdkid", "godotenv", "crosssdk", "prjs", "xaapiv", "urfave", "sebd", "golib", - "joho", "XDSAGENT", "reflectme", "franciscocpg" + "joho", "XDSAGENT", "reflectme", "franciscocpg", "gerrit" ] } @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret <sebastien@iot.bzh> # @@ -42,7 +42,7 @@ endif HOST_GOOS=$(shell go env GOOS) HOST_GOARCH=$(shell go env GOARCH) ARCH=$(HOST_GOOS)-$(HOST_GOARCH) -REPOPATH=github.com/iotbzh/$(TARGET) +REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET) EXT= ifeq ($(HOST_GOOS), windows) @@ -51,7 +51,7 @@ endif mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path))) -ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..) +ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..) LOCAL_BINDIR := $(ROOT_SRCDIR)/bin LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS} PACKAGE_DIR := $(ROOT_SRCDIR)/package @@ -155,9 +155,9 @@ vendor: tools/glide glide.yaml $(LOCAL_TOOLSDIR)/glide install --strip-vendor vendor/debug: vendor - (cd vendor/github.com/iotbzh && \ - rm -rf xds-common && ln -s ../../../../xds-common && \ - rm -rf xds-agent && ln -s ../../../../xds-agent ) + (cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \ + rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \ + rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git) .PHONY: tools/glide tools/glide: diff --git a/cmd-exec.go b/cmd-exec.go index aebbeb2..83743a3 100644 --- a/cmd-exec.go +++ b/cmd-exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "os" "strings" - "github.com/iotbzh/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" "github.com/urfave/cli" ) diff --git a/cmd-misc.go b/cmd-misc.go index 450f4b5..5470dff 100644 --- a/cmd-misc.go +++ b/cmd-misc.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ package main import ( "fmt" - "github.com/iotbzh/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" "github.com/urfave/cli" ) diff --git a/cmd-projects.go b/cmd-projects.go index 713e3f8..fc4bc22 100644 --- a/cmd-projects.go +++ b/cmd-projects.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/iotbzh/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" "github.com/urfave/cli" ) diff --git a/cmd-sdks.go b/cmd-sdks.go index f34d8b1..4bc5a73 100644 --- a/cmd-sdks.go +++ b/cmd-sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "os" "regexp" - "github.com/iotbzh/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" "github.com/urfave/cli" ) diff --git a/conf.d/etc/profile.d/xds-cli.sh b/conf.d/etc/profile.d/xds-cli.sh index 9973c65..d0797a5 100644 --- a/conf.d/etc/profile.d/xds-cli.sh +++ b/conf.d/etc/profile.d/xds-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret <sebastien@iot.bzh> # @@ -1,4 +1,4 @@ -package: github.com/iotbzh/xds-cli +package: gerrit.automotivelinux.org/gerrit/src/xds/xds-cli license: Apache-2.0 owners: - name: Sebastien Douheret @@ -11,11 +11,11 @@ import: - package: github.com/zhouhui8915/engine.io-go - package: github.com/sebd71/go-socket.io-client version: 46defcb47f -- package: github.com/iotbzh/xds-agent +- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git version: v1.0.0-rc2 subpackages: - lib/xaapiv1 -- package: github.com/iotbzh/xds-common +- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git version: ^0.1.0 subpackages: - golib/common @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,9 +28,10 @@ import ( "strings" "text/tabwriter" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/Sirupsen/logrus" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" + "github.com/joho/godotenv" socketio_client "github.com/sebd71/go-socket.io-client" "github.com/urfave/cli" @@ -57,7 +58,7 @@ var AppSubVersion = "unknown-dev" // Application details const ( - appCopyright = "Copyright (C) 2017 IoT.bzh - Apache-2.0" + appCopyright = "Copyright (C) 2017-2018 IoT.bzh - Apache-2.0" defaultLogLevel = "error" ) diff --git a/scripts/install.sh b/scripts/install.sh index bd2df9e..63326e3 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,7 +1,7 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret <sebastien@iot.bzh> # @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "strconv" "strings" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" "github.com/franciscocpg/reflectme" - "github.com/iotbzh/xds-agent/lib/xaapiv1" "github.com/urfave/cli" ) |