Re-namespacing stuff, but not quite going the whole way with "correct" go layout
since I don't really want the overhead of separate repos for silly crap like this.
This commit is contained in:
parent
b8d83c830c
commit
42b7abccc0
@ -1,4 +1,7 @@
|
||||
export PATH="$HOME/src/box-o-sand/src/gotime/.installation/go/bin:$PATH"
|
||||
export GOROOT="$HOME/src/box-o-sand/src/gotime/.installation/go"
|
||||
export GOPATH="$GOROOT:$HOME/src/box-o-sand/src/gotime"
|
||||
source "$GOROOT/misc/bash/go"
|
||||
if [ -z "$_GOTIME_DID_SETUP" ] ; then
|
||||
export PATH="$HOME/src/box-o-sand/src/gotime/.installation/go/bin:$PATH"
|
||||
export GOROOT="$HOME/src/box-o-sand/src/gotime/.installation/go"
|
||||
export GOPATH="$HOME/src/box-o-sand/src/gotime:$GOROOT"
|
||||
source "$GOROOT/misc/bash/go"
|
||||
export _GOTIME_DID_SETUP=1
|
||||
fi
|
||||
|
@ -1,36 +1,32 @@
|
||||
CLEAN_GOPATH := $(shell echo $(GOPATH) | tr ":" "\n" | grep -v '^$$' | grep -v $(PWD) | tr "\n" ":")
|
||||
GOPATH := $(PWD):$(CLEAN_GOPATH)
|
||||
PACKAGES := $(foreach pkg,\
|
||||
$(shell ls src/meatballhat.com/gotour-artifacts),\
|
||||
$(patsubst %,meatballhat.com/gotour-artifacts/%,$(pkg))\
|
||||
$(shell ls src/gotime.example.org/gotour-artifacts),\
|
||||
$(patsubst %,gotime.example.org/gotour-artifacts/%,$(pkg))\
|
||||
)
|
||||
PACKAGES += $(foreach pkg,\
|
||||
$(shell ls src/meatballhat.com/junkdrawer),\
|
||||
$(patsubst %,meatballhat.com/junkdrawer/%,$(pkg))\
|
||||
$(shell ls src/gotime.example.org/junkdrawer),\
|
||||
$(patsubst %,gotime.example.org/junkdrawer/%,$(pkg))\
|
||||
)
|
||||
PACKAGES += meatballhat.com/amqpfun-runner
|
||||
PACKAGES += gotime.example.org/amqpfun-runner
|
||||
|
||||
test: build
|
||||
go test $(PACKAGES)
|
||||
go test -x -v $(PACKAGES)
|
||||
|
||||
build: deps
|
||||
go install $(PACKAGES)
|
||||
go install -x $(PACKAGES)
|
||||
|
||||
fmt:
|
||||
go fmt $(PACKAGES)
|
||||
go fmt -x $(PACKAGES)
|
||||
|
||||
deps:
|
||||
go get $(PACKAGES)
|
||||
go get -x $(PACKAGES)
|
||||
|
||||
clean:
|
||||
rm -v bin/*
|
||||
|
||||
publish:
|
||||
rsync -avz src/meatballhat.com/gotour-artifacts mbh:meatballhat.com/docroot/
|
||||
ssh mbh "find meatballhat.com/docroot/gotour-artifacts -type d -exec chmod 755 {} \; && find meatballhat.com/docroot/gotour-artifacts/ -type f -exec chmod 644 {} \;"
|
||||
|
||||
env:
|
||||
@echo GOPATH=$(GOPATH)
|
||||
@echo PACKAGES=$(PACKAGES)
|
||||
|
||||
.PHONY: test build clean publish env fmt
|
||||
.PHONY: test build clean env fmt
|
||||
|
@ -6,7 +6,7 @@ import (
|
||||
)
|
||||
|
||||
import (
|
||||
"meatballhat.com/amqpfun"
|
||||
"gotime.example.org/amqpfun"
|
||||
)
|
||||
|
||||
const USAGE = "Usage: amqpfun-runner (publish|consume)"
|
Loading…
Reference in New Issue
Block a user