Renamed all packages

This commit is contained in:
kolaente 2018-07-25 16:26:32 +02:00 committed by konrad
parent 0df8881028
commit 01aa1910ef
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 11 additions and 10 deletions

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
.idea/ .idea/
config.ini config.ini
*.db *.db
Run Run
vikunja

View file

@ -1,12 +1,12 @@
DIST := dist DIST := dist
IMPORT := git.kolaente.de/konrad/list IMPORT := code.vikunja.io/api
SED_INPLACE := sed -i SED_INPLACE := sed -i
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
EXECUTABLE := list.exe EXECUTABLE := vikunja.exe
else else
EXECUTABLE := list EXECUTABLE := vikunja
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
SED_INPLACE := sed -i '' SED_INPLACE := sed -i ''
@ -21,7 +21,7 @@ EXTRA_GOFLAGS ?=
LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)"
PACKAGES ?= $(filter-out git.kolaente.de/konrad/list/integrations,$(shell go list ./... | grep -v /vendor/)) PACKAGES ?= $(filter-out code.vikunja.io/api/integrations,$(shell go vikunja ./... | grep -v /vendor/))
SOURCES ?= $(shell find . -name "*.go" -type f) SOURCES ?= $(shell find . -name "*.go" -type f)
TAGS ?= TAGS ?=
@ -29,9 +29,9 @@ TAGS ?=
TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'kasino-temp') TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'kasino-temp')
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
EXECUTABLE := list.exe EXECUTABLE := vikunja.exe
else else
EXECUTABLE := list EXECUTABLE := vikunja
endif endif
ifneq ($(DRONE_TAG),) ifneq ($(DRONE_TAG),)
@ -110,7 +110,7 @@ release-windows:
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/karalabe/xgo; \ go get -u github.com/karalabe/xgo; \
fi fi
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out list-$(VERSION) . xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out vikunja-$(VERSION) .
ifeq ($(CI),drone) ifeq ($(CI),drone)
mv /build/* $(DIST)/binaries mv /build/* $(DIST)/binaries
endif endif
@ -120,7 +120,7 @@ release-linux:
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/karalabe/xgo; \ go get -u github.com/karalabe/xgo; \
fi fi
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out list-$(VERSION) . xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out vikunja-$(VERSION) .
ifeq ($(CI),drone) ifeq ($(CI),drone)
mv /build/* $(DIST)/binaries mv /build/* $(DIST)/binaries
endif endif
@ -130,7 +130,7 @@ release-darwin:
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/karalabe/xgo; \ go get -u github.com/karalabe/xgo; \
fi fi
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out list-$(VERSION) . xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out vikunja-$(VERSION) .
ifeq ($(CI),drone) ifeq ($(CI),drone)
mv /build/* $(DIST)/binaries mv /build/* $(DIST)/binaries
endif endif