diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1137f14..0000000 --- a/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Dockerfile for cross-platform Pomo builds -FROM golang:1.12-stretch - -ENV OSXCROSS_REPO="https://github.com/tpoechtrager/osxcross.git" -ENV OSX_SDK_TARBALL="https://s3.dockerproject.org/darwin/v2/MacOSX10.11.sdk.tar.xz" - -RUN \ - apt-get update -yyq \ - && apt-get install -yyq \ - clang \ - libxml2 \ - patch \ - xz-utils - -RUN \ - mkdir /build \ - && cd /build \ - && git clone --depth=1 "$OSXCROSS_REPO" \ - && cd osxcross/tarballs \ - && wget "$OSX_SDK_TARBALL" \ - && cd .. \ - && UNATTENDED=1 ./build.sh - -ENV PATH="$PATH:/build/osxcross/target/bin" diff --git a/Makefile b/Makefile index eb7a2e5..66c420b 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,7 @@ LDFLAGS=\ test \ docs \ pomo-build \ - readme \ - release \ - release-linux \ - release-darwin + readme default: cd cmd/pomo && \ @@ -33,36 +30,8 @@ test: go test ./... go vet ./... -pomo-build: - docker build -t $(DOCKER_IMAGE) . - -bin/pomo-linux: bin/pomo-$(VERSION)-linux-amd64 - -bin/pomo-darwin: bin/pomo-$(VERSION)-darwin-amd64 - -bin/pomo-$(VERSION)-linux-amd64: bin - $(DOCKER_CMD) --env GOOS=linux --env GOARCH=amd64 $(DOCKER_IMAGE) go build -ldflags "${LDFLAGS}" -o $@ - -bin/pomo-$(VERSION)-linux-amd64.md5: - md5sum bin/pomo-$(VERSION)-linux-amd64 | sed -e 's/bin\///' > $@ - -bin/pomo-$(VERSION)-darwin-amd64: bin - # This is used to cross-compile a Darwin compatible Mach-O executable - # on Linux for OSX, you need to install https://github.com/tpoechtrager/osxcross - $(DOCKER_CMD) --env GOOS=darwin --env GOARCH=amd64 --env CC=x86_64-apple-darwin15-cc --env CGO_ENABLED=1 $(DOCKER_IMAGE) go build -ldflags "${LDFLAGS}" -o $@ - - -bin/pomo-$(VERSION)-darwin-amd64.md5: - md5sum bin/pomo-$(VERSION)-darwin-amd64 | sed -e 's/bin\///' > $@ - -release-linux: bin/pomo-$(VERSION)-linux-amd64 bin/pomo-$(VERSION)-linux-amd64.md5 - -release-darwin: bin/pomo-$(VERSION)-darwin-amd64 bin/pomo-$(VERSION)-darwin-amd64.md5 - -release: release-linux release-darwin - docs: www/data/readme.json - cd www && cp ../install.sh static/ && hugo -d ../docs + cd www && hugo -d ../docs www/data/readme.json: www/data README.md cat README.md | python -c 'import json,sys; print(json.dumps({"content": sys.stdin.read()}))' > $@ diff --git a/README.md b/README.md index b5b7453..dac20d9 100644 --- a/README.md +++ b/README.md @@ -18,24 +18,12 @@ The Pomodoro Technique is simple and effective: ## Installation -### Binaries - -Binaries are available for Linux and OSX platforms in the [releases section](https://github.com/kevinschoon/pomo/releases) on github. - -### Installer Script - -A bash script to download and verify the latest release for Linux and OSX platforms can be run -with the following command: - -```bash -curl -L -s https://kevinschoon.github.io/pomo/install.sh | bash /dev/stdin -``` - ### Source ```bash - go get github.com/kevinschoon/pomo - pomo -v + git clone git@github.com:kevinschoon/pomo.git + cd pomo + make ``` ## Usage