Move command line tool to subdir.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/Makefile b/Makefile
index 62f4e549e24aefd4301c23615679bef1dbb1e6e8..7c8ba29fb7c1319f9c489033ee7c1152a6d91573 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 GOPATH?=$(HOME)/go
 .PHONY: $(GOPATH)/bin/lightning
 $(GOPATH)/bin/lightning:
-       go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=$(shell ./version.sh)"
+       cd lightning && go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=$(shell ./version.sh)"

diff --git a/annotate.go b/annotate.go
index 8fab0f0f1ed1e5a197a9f5f550e426fabfa8c3b1..ac34ada40fd62089ef263d3983fba75fca57661f 100644 (file)
--- a/annotate.go
+++ b/annotate.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/arvados.go b/arvados.go
index 00d5d6fddac4296c3b7f35c1ba0463e8bc8d48c5..ec09637ae9217ed19d42fae2a3a484f41682d223 100644 (file)
--- a/arvados.go
+++ b/arvados.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "context"

diff --git a/cmd.go b/cmd.go
index 97505c3926502782b07dabfb3a84233a634b6906..1fff7b4b7e312ca09655ce1ba5c08e6dc6bd055b 100644 (file)
--- a/cmd.go
+++ b/cmd.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "fmt"
@@ -37,7 +37,7 @@ var (
        })
 )
 
-func main() {
+func Main() {
        if !isatty.IsTerminal(os.Stderr.Fd()) {
                logrus.StandardLogger().Formatter = &logrus.TextFormatter{DisableTimestamp: true}
        }

diff --git a/diff.go b/diff.go
index 2318c9f00b9b2a3311b91d4a386de4b77e9bc7e4..17b2bb6b11758a8d51a5a915bfcc0d7a28a2c352 100644 (file)
--- a/diff.go
+++ b/diff.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/diff_test.go b/diff_test.go
index 00c5f0c5987a3769ab16d6287bd6a11b3dce562b..341888119ba6ed8888c01f3876ec5d8c25ed180b 100644 (file)
--- a/diff_test.go
+++ b/diff_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bytes"

diff --git a/dumpgob.go b/dumpgob.go
index d2d4af36cefbad27a13736ba0453df501c6a80fe..4d5f574ac033d6e9ff3cbbcbdb32765b12ec69b0 100644 (file)
--- a/dumpgob.go
+++ b/dumpgob.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/export.go b/export.go
index 958da95a1703edee2d5b718558504be713070f70..8ff69bf88b75cb92eb13c671ca41c4fdc8bf7abb 100644 (file)
--- a/export.go
+++ b/export.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/exportnumpy.go b/exportnumpy.go
index 85d42f4f8b7672ed18f8c6a1b80ecf6f0a03444b..ec6c83b886831983f2a45225bf97c7271d027fc2 100644 (file)
--- a/exportnumpy.go
+++ b/exportnumpy.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/exportnumpy_test.go b/exportnumpy_test.go
index 09e17022216f28f6e3724f5c966689218fedafb0..9dd71da82b833014ef826cbad6c9e0db05988e87 100644 (file)
--- a/exportnumpy_test.go
+++ b/exportnumpy_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bytes"

diff --git a/filter.go b/filter.go
index afb424d47e7dd29ebd92a4b1366d07f32325e7a4..08468fa690049b39cf17680d6dc99cd54a538103 100644 (file)
--- a/filter.go
+++ b/filter.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/gob.go b/gob.go
index 907c7befcbb2570fcb2dc6ea3fbb1405074e013b..88b78c78c973632aebac2980ae6f568d7f39c8cd 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/import.go b/import.go
index 90ed684434f30c9c59c74513ba2e18dd119b783f..c12811cad21950ef73e2142e166c7e039171cced 100644 (file)
--- a/import.go
+++ b/import.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/lightning/main.go b/lightning/main.go
new file mode 100644 (file)
index 0000000..84511fb
--- /dev/null
+++ b/lightning/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/arvados/lightning"
+
+func main() {
+       lightning.Main()
+}

diff --git a/lis.go b/lis.go
index 2103af07bd570657908243ba07269213bdea3e3a..3e609af2152619ec67de221747e7152b34bcda17 100644 (file)
--- a/lis.go
+++ b/lis.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 func longestIncreasingSubsequence(srclen int, X func(int) int) []int {
        if srclen == 0 {

diff --git a/lis_test.go b/lis_test.go
index 9a33e5ec5c0f511a45d8310566e20553a55e8159..cc35119781830f36f0123db9aa3ce01f5ea4c9e5 100644 (file)
--- a/lis_test.go
+++ b/lis_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "gopkg.in/check.v1"

diff --git a/merge.go b/merge.go
index 322d62c7f2cee6112f78feeea578adcfd9874f5b..6530d600279655d0a68b9eff2246cd3af9836915 100644 (file)
--- a/merge.go
+++ b/merge.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/numpycomvar.go b/numpycomvar.go
index 7f991687132248f5a81d9f844c85ae7238ca0095..b330d6a7fa4d73edff0e016b84d73eb3abcb0780 100644 (file)
--- a/numpycomvar.go
+++ b/numpycomvar.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "flag"

diff --git a/pca.go b/pca.go
index 41e3a7877f2847bfaed98bf3f583a9cd0842841a..0248fa557090d580873430d8ef0e60cb04b03222 100644 (file)
--- a/pca.go
+++ b/pca.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/pipeline_test.go b/pipeline_test.go
index c917b3610de4f8dcf7181d4ebfe04c012c2cb95f..d66fef5442e9a315d3d4a15628f92c53c96880d1 100644 (file)
--- a/pipeline_test.go
+++ b/pipeline_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bytes"

diff --git a/plot.go b/plot.go
index 73f1f3c3d446dd653b2358f082cb167f2022f88d..4339484235eb11a50d57c02b4e18bef47b44f67b 100644 (file)
--- a/plot.go
+++ b/plot.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "flag"

diff --git a/ref2genome.go b/ref2genome.go
index 0561ea0f93ca99ababdf39f9c0a4d6640c5fe85b..058de169fb67612d01882f70f346c521c799f432 100644 (file)
--- a/ref2genome.go
+++ b/ref2genome.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/stats.go b/stats.go
index 460eef47fb29b865b1c4dd05158b96a80ad0a1dc..d0ccc92342bff174cf20fba6213a9b93f6e1710d 100644 (file)
--- a/stats.go
+++ b/stats.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/taglib.go b/taglib.go
index 527884c847761fa3720f09441273302ac5969e85..326feae92a8a94b7335de6c845ee765feabbf80a 100644 (file)
--- a/taglib.go
+++ b/taglib.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/taglib_test.go b/taglib_test.go
index fbddc81904a8083d18d6d84b992ed8ffb274b98d..fbaff356da799b57aea18aa98a9811af7f32fa24 100644 (file)
--- a/taglib_test.go
+++ b/taglib_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/throttle.go b/throttle.go
index a8411001099fdc8c3d068c7bd4133a24dd968416..da338f62f5ed0857f35497ae26a04e8082e3ca24 100644 (file)
--- a/throttle.go
+++ b/throttle.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "sync"

diff --git a/tilelib.go b/tilelib.go
index 8c88956b97685df9a24176a812999103543d5051..455a5262157a24de6aa1f0e31ba402a060fa8b65 100644 (file)
--- a/tilelib.go
+++ b/tilelib.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"

diff --git a/tilelib_test.go b/tilelib_test.go
index 947d456ac8726cab4f74cfafbbb88e991afe543b..40bdb6d396a3b495f11bebf46ce31aa455b5c0da 100644 (file)
--- a/tilelib_test.go
+++ b/tilelib_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bytes"

diff --git a/vcf2fasta.go b/vcf2fasta.go
index eea2f4df303718dcdee39465c4e2096ce3c0b71b..2f840ee73f0e9bcc62a9f360dbbb85ca616acfeb 100644 (file)
--- a/vcf2fasta.go
+++ b/vcf2fasta.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
        "bufio"