feat(build): move grafana into grafana-server

build.go

@@ -63,7 +63,7 @@ func main() {
 			setup()
 
 		case "build":
-			pkg := "."
+			pkg := "./pkg/cmd/grafana-server"
 			clean()
 			build(pkg, []string{})
 

pkg/cmd/grafana-server/main.go

@@ -12,7 +12,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/grafana/grafana/pkg/cmd"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/metrics"
@@ -74,7 +73,7 @@ func main() {
 		go metrics.StartUsageReportLoop()
 	}
 
-	cmd.StartServer()
+	StartServer()
 	exitChan <- 0
 }
 

pkg/cmd/grafana-server/web.go

@@ -1,7 +1,7 @@
 // Copyright 2014 Unknwon
 // Copyright 2014 Torkel Ödegaard
 
-package cmd
+package main
 
 import (
 	"fmt"