Moved CTagsRunner command into builder package

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

src/arduino.cc/builder/container_add_prototypes.go

@@ -33,7 +33,6 @@ import (
 	"path/filepath"
 
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/ctags"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 )
@@ -47,7 +46,7 @@ func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
 		&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
 		&FilterSketchSource{Source: &ctx.SourceGccMinusE},
 		&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
-		&ctags.CTagsRunner{},
+		&CTagsRunner{},
 		&PrototypesAdder{},
 		&SketchSaver{},
 	}

src/arduino.cc/builder/ctags/ctags_runner.go renamed to src/arduino.cc/builder/ctags_runner.go

@@ -27,12 +27,13 @@
  * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
  */
 
-package ctags
+package builder
 
 import (
 	"fmt"
 
 	"arduino.cc/builder/constants"
+	"arduino.cc/builder/ctags"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
@@ -72,7 +73,7 @@ func (s *CTagsRunner) Run(ctx *types.Context) error {
 
 	ctx.CTagsOutput = string(sourceBytes)
 
-	parser := &CTagsParser{}
+	parser := &ctags.CTagsParser{}
 	ctx.CTagsOfPreprocessedSource = parser.Parse(ctx.CTagsOutput)
 	protos, line := parser.GeneratePrototypes()
 	if line != -1 {

src/arduino.cc/builder/test/ctags_runner_test.go

@@ -30,15 +30,15 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/ctags"
-	"arduino.cc/builder/types"
-	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"arduino.cc/builder"
+	"arduino.cc/builder/constants"
+	"arduino.cc/builder/types"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCTagsRunner(t *testing.T) {
@@ -71,7 +71,7 @@ func TestCTagsRunner(t *testing.T) {
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
-		&ctags.CTagsRunner{},
+		&builder.CTagsRunner{},
 	}
 
 	for _, command := range commands {
@@ -121,7 +121,7 @@ func TestCTagsRunnerSketchWithClass(t *testing.T) {
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
-		&ctags.CTagsRunner{},
+		&builder.CTagsRunner{},
 	}
 
 	for _, command := range commands {
@@ -169,7 +169,7 @@ func TestCTagsRunnerSketchWithTypename(t *testing.T) {
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
-		&ctags.CTagsRunner{},
+		&builder.CTagsRunner{},
 	}
 
 	for _, command := range commands {
@@ -216,7 +216,7 @@ func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
-		&ctags.CTagsRunner{},
+		&builder.CTagsRunner{},
 	}
 
 	for _, command := range commands {
@@ -262,7 +262,7 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
-		&ctags.CTagsRunner{},
+		&builder.CTagsRunner{},
 	}
 
 	for _, command := range commands {