X Goodbye neotools

zodbtools provide additional service over zodb (various dumping
routines), but neotools just invokes neo.NewMaster and neo.NewStorage.

For a possible future `neo monitor` maybe bringing neotools back would
be needed, but for now there is simply no reason to keep them around.

go/neo/neotools/main.go → go/neo/cmd/neo/main.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
+// Copyright (C) 2017-2018  Nexedi SA and Contributors.
 //                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
@@ -17,8 +17,8 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-// Package neotools provides tools for running and managing NEO databases.
-package neotools
+// Neo is a driver program for running and managing NEO databases.
+package main
 
 import "lab.nexedi.com/kirr/go123/prog"
 
@@ -31,10 +31,13 @@ var helpTopics = prog.HelpRegistry{
 	// XXX for now empty
 }
 
-// main neo driver
-var Prog = prog.MainProg{
+func main() {
+	prog := prog.MainProg{
 	        Name:       "neo",
 	        Summary:    "Neo is a tool for running NEO services and commands",
 	        Commands:   commands,
 	        HelpTopics: helpTopics,
+	}
+
+	prog.Main()
 }

go/neo/neotools/master.go → go/neo/cmd/neo/master.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
+// Copyright (C) 2017-2018  Nexedi SA and Contributors.
 //                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package neotools
+package main
 // cli to run master node
 
 import (

go/neo/cmd/neo/neo.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
-//                     Kirill Smelkov <kirr@nexedi.com>
-//
-// This program is free software: you can Use, Study, Modify and Redistribute
-// it under the terms of the GNU General Public License version 3, or (at your
-// option) any later version, as published by the Free Software Foundation.
-//
-// You can also Link and Combine this program with other software covered by
-// the terms of any of the Free Software licenses or any of the Open Source
-// Initiative approved licenses and Convey the resulting work. Corresponding
-// source of such a combination shall include the source code for all other
-// software used.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//
-// See COPYING file for full licensing terms.
-// See https://www.nexedi.com/licensing for rationale and options.
-
-// Neo is a driver program for running & invoking NEO commands and services.
-package main
-
-import (
-	"lab.nexedi.com/kirr/neo/go/neo/neotools"
-)
-
-func main() {
-	neotools.Prog.Main()
-}

go/neo/neotools/storage.go → go/neo/cmd/neo/storage.go

-// Copyright (C) 2016-2017  Nexedi SA and Contributors.
+// Copyright (C) 2016-2018  Nexedi SA and Contributors.
 //                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package neotools
+package main
 // cli to run storage node
 
 import (