Skip to content

Commit 548de5c

Browse files
committed
Use a more standard folder architecture
We follow this structure: https://golang.org/doc/code.html#Workspaces Signed-off-by: Matteo Suppo <[email protected]>
1 parent 7c83c05 commit 548de5c

File tree

293 files changed

+392
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+392
-367
lines changed

README.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,32 @@ See [Doing continuous integration with arduino builder](https://github.com/ardui
5757

5858
You need [Go 1.4.3](https://golang.org/dl/#go1.4.3).
5959

60-
Repo root contains the script `setup_go_env_vars`. Use it as is or as a template for setting up Go environment variables.
60+
If you want a clean Gopath you can start by creating a directory wherever you want
61+
62+
```bash
63+
$ mkdir abuilder
64+
$ cd abuilder
65+
```
66+
67+
And set the GOPATH to that directory
68+
69+
```bash
70+
$ export GOPATH=`pwd`
71+
```
72+
73+
Then you can clone this repository in the folder
74+
75+
```bash
76+
$ go get github.com/arduino/arduino-builder
77+
```
78+
79+
If you instead need to clone a private fork you can use this method:
80+
81+
```bash
82+
$ mkdir -p src/github.com/arduino
83+
$ cd src/github.com/arduino
84+
$ git clone [email protected]:myusername/arduino-builder.git
85+
```
6186

6287
To install `codereview/patch` you have to install [Mercurial](https://www.mercurial-scm.org/) first.
6388

@@ -77,12 +102,13 @@ go build
77102
In order to run the tests, type:
78103

79104
```
80-
go test -v ./src/arduino.cc/builder/test/...
105+
go test -v ./builder/test/...
81106
```
82107

83108
In jenkins, use
109+
84110
```
85-
go test -v ./src/arduino.cc/builder/test/... | bin/go-junit-report > report.xml
111+
go test -v ./builder/test/... | bin/go-junit-report > report.xml
86112
```
87113

88114
### License and Copyright

src/arduino.cc/builder/add_additional_entries_to_context.go renamed to builder/add_additional_entries_to_context.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"path/filepath"
3737
)
3838

src/arduino.cc/builder/add_build_board_property_if_missing.go renamed to builder/add_build_board_property_if_missing.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/types"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/i18n"
35+
"github.com/arduino/arduino-builder/builder/types"
3636
"os"
3737
"strings"
3838
)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/props"
35-
"arduino.cc/builder/types"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/props"
35+
"github.com/arduino/arduino-builder/builder/types"
3636
)
3737

3838
type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}

src/arduino.cc/builder/additional_sketch_files_copier.go renamed to builder/additional_sketch_files_copier.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"bytes"
3737
"io/ioutil"
3838
"path/filepath"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/phases"
35-
"arduino.cc/builder/types"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/phases"
35+
"github.com/arduino/arduino-builder/builder/types"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"os"
3838
"reflect"
3939
"strconv"

src/arduino.cc/builder/builder_utils/utils.go renamed to builder/builder_utils/utils.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder_utils
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/i18n"
35+
"github.com/arduino/arduino-builder/builder/props"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"bytes"
3838
"fmt"
3939
"os"

src/arduino.cc/builder/coan_runner.go renamed to builder/coan_runner.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/i18n"
35+
"github.com/arduino/arduino-builder/builder/props"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"fmt"
3838
"path/filepath"
3939
"regexp"

src/arduino.cc/builder/collect_all_source_files_from_folders_with_sources.go renamed to builder/collect_all_source_files_from_folders_with_sources.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/gohasissues"
35-
"arduino.cc/builder/types"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/gohasissues"
35+
"github.com/arduino/arduino-builder/builder/types"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"io/ioutil"
3838
"os"
3939
"path/filepath"

src/arduino.cc/builder/collect_ctags_from_sketch_files.go renamed to builder/collect_ctags_from_sketch_files.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"strings"
3737
)
3838

src/arduino.cc/builder/compare_prototypes_from_source_and_preproc_source.go renamed to builder/compare_prototypes_from_source_and_preproc_source.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
3535
)
3636

3737
type ComparePrototypesFromSourceAndPreprocSource struct{}

src/arduino.cc/builder/container_add_prototypes.go renamed to builder/container_add_prototypes.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/ctags"
35-
"arduino.cc/builder/types"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/ctags"
35+
"github.com/arduino/arduino-builder/builder/types"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
)
3838

3939
type ContainerAddPrototypes struct{}

src/arduino.cc/builder/container_build_options.go renamed to builder/container_build_options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/types"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/types"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
)
3636

3737
type ContainerBuildOptions struct{}

src/arduino.cc/builder/container_find_includes.go renamed to builder/container_find_includes.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"path/filepath"
3737
)
3838

src/arduino.cc/builder/container_merge_copy_sketch_files.go renamed to builder/container_merge_copy_sketch_files.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/types"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/types"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
)
3636

3737
type ContainerMergeCopySketchFiles struct{}

src/arduino.cc/builder/container_setup.go renamed to builder/container_setup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/types"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/types"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
)
3636

3737
type ContainerSetupHardwareToolsLibsSketchAndProps struct{}

src/arduino.cc/builder/create_build_options_map.go renamed to builder/create_build_options_map.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
"encoding/json"
3636
"reflect"
3737
"strings"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package ctags
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"os"
3737
"reflect"
3838
"runtime"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package ctags
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/i18n"
35+
"github.com/arduino/arduino-builder/builder/props"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"fmt"
3838
)
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package ctags
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/types"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/types"
3535
"strings"
3636
)
3737

src/arduino.cc/builder/ctags_target_file_saver.go renamed to builder/ctags_target_file_saver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
"path/filepath"
3636
)
3737

src/arduino.cc/builder/dump_build_properties.go renamed to builder/dump_build_properties.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/props"
35-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/props"
35+
"github.com/arduino/arduino-builder/builder/utils"
3636
"fmt"
3737
"sort"
3838
)

src/arduino.cc/builder/dump_context.go renamed to builder/dump_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/utils"
3434
"fmt"
3535
"sort"
3636
)

src/arduino.cc/builder/ensure_buildpath_exists.go renamed to builder/ensure_buildpath_exists.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
)
3636

3737
type EnsureBuildPathExists struct{}

src/arduino.cc/builder/external_include_replacer.go renamed to builder/external_include_replacer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
33+
"github.com/arduino/arduino-builder/builder/constants"
3434
"path/filepath"
3535
"strings"
3636
)

src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go renamed to builder/fail_if_buildpath_equals_sketchpath.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
"path/filepath"
3636
)
3737

src/arduino.cc/builder/fail_if_imported_library_is_wrong.go renamed to builder/fail_if_imported_library_is_wrong.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/types"
36-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/i18n"
35+
"github.com/arduino/arduino-builder/builder/types"
36+
"github.com/arduino/arduino-builder/builder/utils"
3737
"os"
3838
"path/filepath"
3939
)

src/arduino.cc/builder/gcc_minus_m_output_parser.go renamed to builder/gcc_minus_m_output_parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/utils"
33+
"github.com/arduino/arduino-builder/builder/constants"
34+
"github.com/arduino/arduino-builder/builder/utils"
3535
"strings"
3636
)
3737

0 commit comments

Comments
 (0)