Convert the project into a proper go-package

.travis.yml

@@ -1,20 +1,21 @@
 language: go
 
 go:
-  - 1.6.3
+  - 1.9.2
 
 install:
-  - export GOPATH=`pwd`:$GOPATH
   - go get github.com/go-errors/errors
   - go get github.com/stretchr/testify
   - go get github.com/jstemmer/go-junit-report
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
   - go get github.com/wadey/gocovmerge
+  - go get github.com/arduino/go-properties-map
+  - go get github.com/arduino/go-timeutils
 
 script:
-  - go build -v arduino.cc/arduino-builder
-  - export TEST_PACKAGES=`go list arduino.cc/...`
+  - go build -o $HOME/arduino-builder -v github.com/arduino/arduino-builder/arduino-builder
+  - export TEST_PACKAGES=`go list github.com/arduino/arduino-builder/...`
   - RES=0; I=0; for PKG in $TEST_PACKAGES; do go test -v -timeout 30m -covermode=count -coverprofile=coverage.$I.out $PKG; ((RES=RES+$?)); ((I++)); done; ( exit $RES )
 
 after_success:

README.md

@@ -55,31 +55,26 @@ See [Doing continuous integration with arduino builder](https://github.com/ardui
 
 ### Building from source
 
-You need [Go 1.6.3](https://golang.org/dl/#go1.6.3).
+You need [a recent version of Go (>=1.8.0)](https://golang.org/).
 
-To install `codereview/patch` you have to install [Mercurial](https://www.mercurial-scm.org/) first.
-
-To set things up, run the following inside the cloned arduino-builder
-directory:
+To build, run the following commands:
 
 ```
-export GOPATH=$(pwd)
 go get github.com/go-errors/errors
 go get github.com/stretchr/testify
 go get github.com/jstemmer/go-junit-report
-go build arduino.cc/arduino-builder
+go get github.com/arduino/go-properties-map
+go get github.com/arduino/go-timeutils
+go get github.com/arduino/arduino-builder
+go build github.com/arduino/arduino-builder/arduino-builder
 ```
 
-After installing dependencies, you do not need to run the `go get`
-commands again, but you will have to set `GOPATH` again for every shell
-you want to build in.
-
 ### TDD
 
 In order to run the tests, type:
 
 ```
-go test arduino.cc/...
+go test github.com/arduino/arduino-builder/arduino-builder/...
 ```
 
 This runs all tests, showing any failures and a summary at the end.
@@ -93,13 +88,13 @@ To run a single test, use the -run option, which accepts a regular
 expression (see also go help testflag).
 
 ```
-go test arduino.cc/... -run 'TestBuilderEmptySketch'
-go test arduino.cc/... -run 'TestPrototypesAdder.*'
+go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestBuilderEmptySketch'
+go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestPrototypesAdder.*'
 ```
 
 In jenkins, use
 ```
-go test -v arduino.cc/... | bin/go-junit-report > report.xml
+go test -v github.com/arduino/arduino-builder/arduino-builder/... | bin/go-junit-report > report.xml
 ```
 
 The first time you run the tests, some needed files (toolchains and
@@ -114,6 +109,6 @@ increasing the timeout might be needed as well.
 
 `arduino-builder` is licensed under General Public License version 2, as published by the Free Software Foundation. See [LICENSE.txt](LICENSE.txt).
 
-Copyright (C) 2015 Arduino LLC and contributors
+Copyright (C) 2017 Arduino AG and contributors
 
 See https://www.arduino.cc/ and https://github.com/arduino/arduino-builder/graphs/contributors

src/arduino.cc/builder/add_additional_entries_to_context.go → add_additional_entries_to_context.go

@@ -32,9 +32,9 @@ package builder
 import (
 	"path/filepath"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type AddAdditionalEntriesToContext struct{}

src/arduino.cc/builder/add_build_board_property_if_missing.go → add_build_board_property_if_missing.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"strings"
 )

src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go → add_missing_build_properties_from_parent_platform_txt_files.go

@@ -30,7 +30,7 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}

src/arduino.cc/builder/additional_sketch_files_copier.go → additional_sketch_files_copier.go

@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"bytes"
 	"io/ioutil"
 	"path/filepath"

src/arduino.cc/arduino-builder/main.go → arduino-builder/main.go

@@ -40,12 +40,12 @@ import (
 	"strings"
 	"syscall"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 	"github.com/go-errors/errors"
 )
 

src/arduino.cc/builder/builder.go → builder.go

@@ -35,11 +35,11 @@ import (
 	"strconv"
 	"time"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/phases"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/phases"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}

src/arduino.cc/builder/builder_utils/utils.go → builder_utils/utils.go

@@ -38,10 +38,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
@@ -384,10 +384,7 @@ func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, remo
 	var err error
 	commandLine := buildProperties.ExpandPropsInString(pattern)
 	if removeUnsetProperties {
-		commandLine, err = properties.DeleteUnexpandedPropsFromString(commandLine)
-		if err != nil {
-			return nil, i18n.WrapError(err)
-		}
+		commandLine = properties.DeleteUnexpandedPropsFromString(commandLine)
 	}
 
 	command, err := utils.PrepareCommand(commandLine, logger)

src/arduino.cc/builder/container_add_prototypes.go → container_add_prototypes.go

@@ -32,9 +32,9 @@ package builder
 import (
 	"path/filepath"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerAddPrototypes struct{}

src/arduino.cc/builder/container_build_options.go → container_build_options.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerBuildOptions struct{}

src/arduino.cc/builder/container_find_includes.go → container_find_includes.go

@@ -113,11 +113,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type ContainerFindIncludes struct{}

src/arduino.cc/builder/container_merge_copy_sketch_files.go → container_merge_copy_sketch_files.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerMergeCopySketchFiles struct{}

src/arduino.cc/builder/container_setup.go → container_setup.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerSetupHardwareToolsLibsSketchAndProps struct{}

src/arduino.cc/builder/create_build_options_map.go → create_build_options_map.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"encoding/json"
 )
 

src/arduino.cc/builder/ctags/ctags_has_issues.go → ctags/ctags_has_issues.go

@@ -34,7 +34,7 @@ import (
 	"os"
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 func (p *CTagsParser) FixCLinkageTagsDeclarations(tags []*types.CTag) {

src/arduino.cc/builder/ctags/ctags_parser.go → ctags/ctags_parser.go

@@ -33,7 +33,7 @@ import (
 	"strconv"
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 const KIND_PROTOTYPE = "prototype"

src/arduino.cc/builder/ctags/ctags_parser_test.go → ctags/ctags_parser_test.go

@@ -34,7 +34,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 
 	"github.com/stretchr/testify/require"
 )

src/arduino.cc/builder/ctags/ctags_to_prototypes.go → ctags/ctags_to_prototypes.go

@@ -32,7 +32,7 @@ package ctags
 import (
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 func (p *CTagsParser) GeneratePrototypes() ([]*types.Prototype, int) {

src/arduino.cc/builder/ctags/ctags_to_prototypes_test.go → ctags/ctags_to_prototypes_test.go

@@ -34,7 +34,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -220,7 +220,7 @@ func TestCTagsToPrototypesFunctionPointersNoIndirect(t *testing.T) {
 }
 
 func TestCTagsRunnerSketchWithClassFunction(t *testing.T) {
-	prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino")
+	prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino")
 
 	require.Equal(t, 3, len(prototypes))
 	require.Equal(t, "void setup();", prototypes[0].Prototype)

ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt

@@ -0,0 +1,4 @@
+asdf	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^    void asdf() {}$/;"	kind:function	line:2	class:test	signature:()	returntype:void
+setup	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void setup() {$/;"	kind:function	line:4	signature:()	returntype:void
+loop	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void loop() {}$/;"	kind:function	line:7	signature:()	returntype:void
+asdf	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void asdf() {}$/;"	kind:function	line:8	signature:()	returntype:void

src/arduino.cc/builder/ctags_runner.go → ctags_runner.go

@@ -32,11 +32,11 @@ package builder
 import (
 	"fmt"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/ctags"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/ctags"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type CTagsRunner struct{}

src/arduino.cc/builder/ctags_target_file_saver.go → ctags_target_file_saver.go

@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"path/filepath"
 )
 

src/arduino.cc/builder/dump_build_properties.go → dump_build_properties.go

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"fmt"
 	"sort"
 )

src/arduino.cc/builder/ensure_buildpath_exists.go → ensure_buildpath_exists.go

@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type EnsureBuildPathExists struct{}

src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go → fail_if_buildpath_equals_sketchpath.go

@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"path/filepath"
 )