Restructure directory layout: org subpackage

2018-12-02 16:52:27 +01:00 · 2018-12-02 16:52:27 +01:00 · fc982125c9
commit fc982125c9
parent 6c683dfbdb
17 changed files with 11 additions and 7 deletions
--- a/16
+++ b/16
@ -1,13 +1,17 @@
 .PHONY: default
 default: test
-.PHONY: test
+.PHONY: install
-test:
+install:
-	go test ./... -v
+	go get ./...
 .PHONY: build
-build:
+build: install
-	go build cmd/org/*
+	go build main.go
 .PHONY: test
 test: install
 	go test ./... -v
 .PHONY: setup
 setup:
@ -16,4 +20,4 @@ setup:
 case=example
 .PHONY: render
 render:
-	bash -c "go run cmd/org/org.go testdata/$(case).org html |& html2text"
+	bash -c "go run main.go org/testdata/$(case).org html |& html2text"
--- a/cmd/org/org.go
+++ b/cmd/org/org.go
@ -11,7 +11,7 @@ import (
 	"github.com/alecthomas/chroma/formatters/html"
 	"github.com/alecthomas/chroma/lexers"
 	"github.com/alecthomas/chroma/styles"
-	"github.com/niklasfasching/org"
+	"github.com/niklasfasching/go-org/org"
 )
 func main() {
--- a/org/block.go
+++ b/org/block.go
--- a/org/document.go
+++ b/org/document.go
--- a/org/footnote.go
+++ b/org/footnote.go
--- a/org/headline.go
+++ b/org/headline.go
--- a/org/html.go
+++ b/org/html.go
--- a/org/html_test.go
+++ b/org/html_test.go
--- a/org/inline.go
+++ b/org/inline.go
--- a/org/keyword.go
+++ b/org/keyword.go
--- a/org/list.go
+++ b/org/list.go
--- a/org/org.go
+++ b/org/org.go
--- a/org/org_test.go
+++ b/org/org_test.go
--- a/org/paragraph.go
+++ b/org/paragraph.go
--- a/org/table.go
+++ b/org/table.go
--- a/org/testdata/example.html
+++ b/org/testdata/example.html
--- a/org/testdata/example.org
+++ b/org/testdata/example.org