Skip to content

Commit 147f3d9

Browse files
committed
Converted the project into a valid go package. Modules "properties" and "timeutils" are replaced with external dependencies.
1 parent 03d0da6 commit 147f3d9

File tree

302 files changed

+326
-1655
lines changed

Some content is hidden

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

302 files changed

+326
-1655
lines changed

.travis.yml

-26
This file was deleted.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package builder
3232
import (
3333
"path/filepath"
3434

35-
"arduino.cc/builder/constants"
36-
"arduino.cc/builder/i18n"
37-
"arduino.cc/builder/types"
35+
"github.com/arduino/arduino-builder/constants"
36+
"github.com/arduino/arduino-builder/i18n"
37+
"github.com/arduino/arduino-builder/types"
3838
)
3939

4040
type AddAdditionalEntriesToContext struct{}

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

+2-2
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/constants"
34+
"github.com/arduino/arduino-builder/types"
3535
"os"
3636
"strings"
3737
)
+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
package builder
3131

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

3636
type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

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

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ import (
4040
"strings"
4141
"syscall"
4242

43-
"arduino.cc/builder"
44-
"arduino.cc/builder/gohasissues"
45-
"arduino.cc/builder/i18n"
46-
"arduino.cc/builder/types"
47-
"arduino.cc/builder/utils"
48-
"arduino.cc/properties"
43+
"github.com/arduino/arduino-builder"
44+
"github.com/arduino/arduino-builder/gohasissues"
45+
"github.com/arduino/arduino-builder/i18n"
46+
"github.com/arduino/arduino-builder/types"
47+
"github.com/arduino/arduino-builder/utils"
48+
"github.com/arduino/go-properties-map"
4949
"github.com/go-errors/errors"
5050
)
5151

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ import (
3535
"strconv"
3636
"time"
3737

38-
"arduino.cc/builder/constants"
39-
"arduino.cc/builder/i18n"
40-
"arduino.cc/builder/phases"
41-
"arduino.cc/builder/types"
42-
"arduino.cc/builder/utils"
38+
"github.com/arduino/arduino-builder/constants"
39+
"github.com/arduino/arduino-builder/i18n"
40+
"github.com/arduino/arduino-builder/phases"
41+
"github.com/arduino/arduino-builder/types"
42+
"github.com/arduino/arduino-builder/utils"
4343
)
4444

4545
var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import (
3838
"path/filepath"
3939
"strings"
4040

41-
"arduino.cc/builder/constants"
42-
"arduino.cc/builder/i18n"
43-
"arduino.cc/builder/utils"
44-
"arduino.cc/properties"
41+
"github.com/arduino/arduino-builder/constants"
42+
"github.com/arduino/arduino-builder/i18n"
43+
"github.com/arduino/arduino-builder/utils"
44+
"github.com/arduino/go-properties-map"
4545
)
4646

4747
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
384384
var err error
385385
commandLine := buildProperties.ExpandPropsInString(pattern)
386386
if removeUnsetProperties {
387-
commandLine, err = properties.DeleteUnexpandedPropsFromString(commandLine)
388-
if err != nil {
389-
return nil, i18n.WrapError(err)
390-
}
387+
commandLine = properties.DeleteUnexpandedPropsFromString(commandLine)
391388
}
392389

393390
command, err := utils.PrepareCommand(commandLine, logger)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package builder
3232
import (
3333
"path/filepath"
3434

35-
"arduino.cc/builder/constants"
36-
"arduino.cc/builder/i18n"
37-
"arduino.cc/builder/types"
35+
"github.com/arduino/arduino-builder/constants"
36+
"github.com/arduino/arduino-builder/i18n"
37+
"github.com/arduino/arduino-builder/types"
3838
)
3939

4040
type ContainerAddPrototypes struct{}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

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

3737
type ContainerBuildOptions struct{}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ import (
113113
"path/filepath"
114114
"time"
115115

116-
"arduino.cc/builder/builder_utils"
117-
"arduino.cc/builder/constants"
118-
"arduino.cc/builder/i18n"
119-
"arduino.cc/builder/types"
120-
"arduino.cc/builder/utils"
116+
"github.com/arduino/arduino-builder/builder_utils"
117+
"github.com/arduino/arduino-builder/constants"
118+
"github.com/arduino/arduino-builder/i18n"
119+
"github.com/arduino/arduino-builder/types"
120+
"github.com/arduino/arduino-builder/utils"
121121
)
122122

123123
type ContainerFindIncludes struct{}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

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

3737
type ContainerMergeCopySketchFiles struct{}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

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

3737
type ContainerSetupHardwareToolsLibsSketchAndProps struct{}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package builder
3131

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"os"
3535
"strings"
3636

37-
"arduino.cc/builder/types"
37+
"github.com/arduino/arduino-builder/types"
3838
)
3939

4040
func (p *CTagsParser) FixCLinkageTagsDeclarations(tags []*types.CTag) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"strconv"
3434
"strings"
3535

36-
"arduino.cc/builder/types"
36+
"github.com/arduino/arduino-builder/types"
3737
)
3838

3939
const KIND_PROTOTYPE = "prototype"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"path/filepath"
3535
"testing"
3636

37-
"arduino.cc/builder/types"
37+
"github.com/arduino/arduino-builder/types"
3838

3939
"github.com/stretchr/testify/require"
4040
)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ package ctags
3232
import (
3333
"strings"
3434

35-
"arduino.cc/builder/types"
35+
"github.com/arduino/arduino-builder/types"
3636
)
3737

3838
func (p *CTagsParser) GeneratePrototypes() ([]*types.Prototype, int) {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"path/filepath"
3535
"testing"
3636

37-
"arduino.cc/builder/types"
37+
"github.com/arduino/arduino-builder/types"
3838
"github.com/stretchr/testify/require"
3939
)
4040

@@ -220,7 +220,7 @@ func TestCTagsToPrototypesFunctionPointersNoIndirect(t *testing.T) {
220220
}
221221

222222
func TestCTagsRunnerSketchWithClassFunction(t *testing.T) {
223-
prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino")
223+
prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino")
224224

225225
require.Equal(t, 3, len(prototypes))
226226
require.Equal(t, "void setup();", prototypes[0].Prototype)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
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
2+
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
3+
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
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:8 signature:() returntype:void

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ package builder
3232
import (
3333
"fmt"
3434

35-
"arduino.cc/builder/constants"
36-
"arduino.cc/builder/ctags"
37-
"arduino.cc/builder/i18n"
38-
"arduino.cc/builder/types"
39-
"arduino.cc/builder/utils"
35+
"github.com/arduino/arduino-builder/constants"
36+
"github.com/arduino/arduino-builder/ctags"
37+
"github.com/arduino/arduino-builder/i18n"
38+
"github.com/arduino/arduino-builder/types"
39+
"github.com/arduino/arduino-builder/utils"
4040
)
4141

4242
type CTagsRunner struct{}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

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

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

+2-2
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/types"
34+
"github.com/arduino/arduino-builder/utils"
3535
"fmt"
3636
"sort"
3737
)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

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

3838
type EnsureBuildPathExists struct{}

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

+3-3
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/constants"
34+
"github.com/arduino/arduino-builder/i18n"
35+
"github.com/arduino/arduino-builder/types"
3636
"path/filepath"
3737
)
3838

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

+3-3
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/constants"
34+
"github.com/arduino/arduino-builder/i18n"
35+
"github.com/arduino/arduino-builder/types"
3636
"os"
3737
"path/filepath"
3838
)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"strconv"
3535
"strings"
3636

37-
"arduino.cc/builder/types"
38-
"arduino.cc/builder/utils"
37+
"github.com/arduino/arduino-builder/types"
38+
"github.com/arduino/arduino-builder/utils"
3939
)
4040

4141
type FilterSketchSource struct {

fmt_fix_vet

-5
This file was deleted.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import (
3333
"path/filepath"
3434
"strings"
3535

36-
"arduino.cc/builder/builder_utils"
37-
"arduino.cc/builder/constants"
38-
"arduino.cc/builder/i18n"
39-
"arduino.cc/builder/types"
40-
"arduino.cc/builder/utils"
41-
"arduino.cc/properties"
36+
"github.com/arduino/arduino-builder/builder_utils"
37+
"github.com/arduino/arduino-builder/constants"
38+
"github.com/arduino/arduino-builder/i18n"
39+
"github.com/arduino/arduino-builder/types"
40+
"github.com/arduino/arduino-builder/utils"
41+
"github.com/arduino/go-properties-map"
4242
)
4343

4444
type GCCPreprocRunner struct {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ package builder
3232
// XXX: OBSOLETE?
3333

3434
import (
35-
"arduino.cc/builder/constants"
36-
"arduino.cc/builder/i18n"
37-
"arduino.cc/builder/types"
38-
"arduino.cc/builder/utils"
35+
"github.com/arduino/arduino-builder/constants"
36+
"github.com/arduino/arduino-builder/i18n"
37+
"github.com/arduino/arduino-builder/types"
38+
"github.com/arduino/arduino-builder/utils"
3939
"path/filepath"
4040
)
4141

0 commit comments

Comments
 (0)