From 27bb4e3044b2e8983a6938936baf658b629a443d Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 5 Jan 2018 17:57:49 +0100 Subject: [PATCH] Migration to AGL gerrit (update go import) Signed-off-by: Sebastien Douheret --- Makefile | 12 ++++++------ conf.d/etc/profile.d/xds-gdb.sh | 2 +- gdb-common.go | 2 +- gdb-common_darwin.go | 2 +- gdb-common_linux.go | 2 +- gdb-common_windows.go | 2 +- gdb-native.go | 2 +- gdb-xds.go | 6 +++--- glide.yaml | 6 +++--- main.go | 6 +++--- scripts/install.sh | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 118a80b..37b64ba 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # @@ -41,7 +41,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) @@ -50,7 +50,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 @@ -153,9 +153,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/conf.d/etc/profile.d/xds-gdb.sh b/conf.d/etc/profile.d/xds-gdb.sh index 5777adf..f71fb6c 100644 --- a/conf.d/etc/profile.d/xds-gdb.sh +++ b/conf.d/etc/profile.d/xds-gdb.sh @@ -1,6 +1,6 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # diff --git a/gdb-common.go b/gdb-common.go index b655f09..5a6d862 100644 --- a/gdb-common.go +++ b/gdb-common.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gdb-common_darwin.go b/gdb-common_darwin.go index 8cdb734..ee98867 100644 --- a/gdb-common_darwin.go +++ b/gdb-common_darwin.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gdb-common_linux.go b/gdb-common_linux.go index a8aa92b..06ee1ce 100644 --- a/gdb-common_linux.go +++ b/gdb-common_linux.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gdb-common_windows.go b/gdb-common_windows.go index 17d7643..66cd034 100644 --- a/gdb-common_windows.go +++ b/gdb-common_windows.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gdb-native.go b/gdb-native.go index ea4001f..4102690 100644 --- a/gdb-native.go +++ b/gdb-native.go @@ -1,7 +1,7 @@ // +build !windows /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gdb-xds.go b/gdb-xds.go index e9c74e3..f1216ce 100644 --- a/gdb-xds.go +++ b/gdb-xds.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,9 +29,9 @@ import ( "syscall" "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" sio_client "github.com/sebd71/go-socket.io-client" ) diff --git a/glide.yaml b/glide.yaml index 1fde7b8..898e5b7 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/iotbzh/xds-gdb +package: gerrit.automotivelinux.org/gerrit/src/xds/xds-gdb license: Apache-2.0 owners: - name: Sebastien Douheret @@ -10,11 +10,11 @@ import: version: ^0.11.5 - 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: 1.0.0-rc1 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 diff --git a/main.go b/main.go index 8d9865b..b193676 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,9 +34,9 @@ import ( "path" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - common "github.com/iotbzh/xds-common/golib" "github.com/joho/godotenv" ) @@ -62,7 +62,7 @@ var logFileInitial = path.Join(os.TempDir(), "xds-gdb.log") // Application details const ( - appCopyright = "Copyright (C) 2017 IoT.bzh - Apache-2.0" + appCopyright = "Copyright (C) 2017-2018 IoT.bzh - Apache-2.0" defaultLogLevel = "warning" ) diff --git a/scripts/install.sh b/scripts/install.sh index b601d12..6e901e6 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # -- 2.16.6