Use a more standard folder architecture

README.md

@@ -57,7 +57,32 @@ See [Doing continuous integration with arduino builder](https://github.com/ardui
 
 You need [Go 1.4.3](https://golang.org/dl/#go1.4.3).
 
-Repo root contains the script `setup_go_env_vars`. Use it as is or as a template for setting up Go environment variables.
+If you want a clean Gopath you can start by creating a directory wherever you want
+
+```bash
+$ mkdir abuilder
+$ cd abuilder
+```
+
+And set the GOPATH to that directory
+
+```bash
+$ export GOPATH=`pwd`
+```
+
+Then you can clone this repository in the folder
+
+```bash
+$ go get github.com/arduino/arduino-builder
+```
+
+If you instead need to clone a private fork you can use this method:
+
+```bash
+$ mkdir -p src/github.com/arduino
+$ cd src/github.com/arduino
+$ git clone git@github.com:myusername/arduino-builder.git
+```
 
 To install `codereview/patch` you have to install [Mercurial](https://www.mercurial-scm.org/) first.
 
@@ -77,12 +102,13 @@ go build
 In order to run the tests, type:
 
 ```
-go test -timeout 60m -v ./src/arduino.cc/builder/test/...
+go test -timeout 60m -v ./builder/test/...
 ```
 
 In jenkins, use
+
 ```
-go test -timeout 60m -v ./src/arduino.cc/builder/test/... | bin/go-junit-report > report.xml
+go test -timeout 60m -v ./builder/test/... | bin/go-junit-report > report.xml
 ```
 
 ### License and Copyright

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

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

src/arduino.cc/builder/add_build_board_property_if_missing.go → builder/add_build_board_property_if_missing.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/builder/constants"
+	"github.com/arduino/arduino-builder/builder/i18n"
+	"github.com/arduino/arduino-builder/builder/types"
 	"os"
 	"strings"
 )

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

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

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

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

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

@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/phases"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/phases"
+	"github.com/arduino/arduino-builder/builder/types"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"os"
 	"reflect"
 	"strconv"

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

@@ -30,10 +30,10 @@
 package builder_utils
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/i18n"
+	"github.com/arduino/arduino-builder/builder/props"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"bytes"
 	"fmt"
 	"os"

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

@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/i18n"
+	"github.com/arduino/arduino-builder/builder/props"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"fmt"
 	"path/filepath"
 	"regexp"

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

@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/gohasissues"
+	"github.com/arduino/arduino-builder/builder/types"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"io/ioutil"
 	"os"
 	"path/filepath"

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

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

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

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

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

@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/ctags"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/ctags"
+	"github.com/arduino/arduino-builder/builder/types"
+	"github.com/arduino/arduino-builder/builder/utils"
 )
 
 type ContainerAddPrototypes struct{}

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

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

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

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

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

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

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

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

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

@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"encoding/json"
 	"reflect"
 	"strings"

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

@@ -30,9 +30,9 @@
 package ctags
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/types"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"os"
 	"reflect"
 	"runtime"

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

@@ -30,10 +30,10 @@
 package ctags
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder/constants"
+	"github.com/arduino/arduino-builder/builder/i18n"
+	"github.com/arduino/arduino-builder/builder/props"
+	"github.com/arduino/arduino-builder/builder/utils"
 	"fmt"
 )
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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