Imported arduino-builder as legacy module

Author: cmaglie

commands/compile/compile.go

@@ -26,9 +26,9 @@ import (
 	"sort"
 	"strings"
 
-	builder "github.com/arduino/arduino-builder"
-	"github.com/arduino/arduino-builder/i18n"
-	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-cli/legacy/builder"
+	"github.com/arduino/arduino-cli/legacy/builder/i18n"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"

go.mod

@@ -3,11 +3,10 @@ module github.com/arduino/arduino-cli
 go 1.12
 
 require (
-	github.com/arduino/arduino-builder v0.0.0-20190412183451-a4859ca30383
 	github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
 	github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1
 	github.com/arduino/go-properties-orderedmap v0.0.0-20181003091528-89278049acd3
-	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b // indirect
+	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
 	github.com/bouk/monkey v1.0.0
 	github.com/cmaglie/pb v1.0.27
@@ -18,7 +17,8 @@ require (
 	github.com/fatih/color v1.6.0
 	github.com/fluxio/iohelpers v0.0.0-20160419043813-3a4dd67a94d2 // indirect
 	github.com/fluxio/multierror v0.0.0-20160419044231-9c68d39025e5 // indirect
-	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/fsnotify/fsnotify v1.4.7
+	github.com/go-errors/errors v1.0.1
 	github.com/golang/protobuf v1.3.1
 	github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282
 	github.com/h2non/filetype v1.0.8 // indirect
@@ -49,6 +49,7 @@ require (
 	go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	golang.org/x/net v0.0.0-20190311183353-d8887717615a
+	golang.org/x/text v0.3.0
 	google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect
 	google.golang.org/grpc v1.19.1
 	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect

go.sum

@@ -1,7 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/arduino/arduino-builder v0.0.0-20190412183451-a4859ca30383 h1:GnRuHA8ZpNAt4sDNmPy/Cvk75jnzoSS6mWZGVNDj2eE=
-github.com/arduino/arduino-builder v0.0.0-20190412183451-a4859ca30383/go.mod h1:Rs4tZQDLujNdbD1dyLjYSP2Y6gvE3U7OMCPNdFn5eCI=
 github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c h1:agh2JT96G8egU7FEb13L4dq3fnCN7lxXhJ86t69+W7s=
 github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=
 github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1 h1:S0NpDSqjlkNA510vmRCP5Cq9mPgu3rWDSdeN4SI1Mwc=

legacy/builder/.gitignore

@@ -0,0 +1,81 @@
+bin
+src/github.com
+src/golang.org
+./arduino-builder
+
+# Created by .ignore support plugin (hsz.mobi)
+### Go template
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
+
+
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties

legacy/builder/add_additional_entries_to_context.go

@@ -0,0 +1,86 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package builder
+
+import (
+	"github.com/arduino/arduino-cli/legacy/builder/constants"
+	"github.com/arduino/arduino-cli/legacy/builder/i18n"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
+	"github.com/arduino/arduino-cli/arduino/cores"
+)
+
+type AddAdditionalEntriesToContext struct{}
+
+func (*AddAdditionalEntriesToContext) Run(ctx *types.Context) error {
+	if ctx.BuildPath != nil {
+		buildPath := ctx.BuildPath
+		preprocPath, err := buildPath.Join(constants.FOLDER_PREPROC).Abs()
+		if err != nil {
+			return i18n.WrapError(err)
+		}
+		sketchBuildPath, err := buildPath.Join(constants.FOLDER_SKETCH).Abs()
+		if err != nil {
+			return i18n.WrapError(err)
+		}
+		librariesBuildPath, err := buildPath.Join("libraries").Abs()
+		if err != nil {
+			return i18n.WrapError(err)
+		}
+		coreBuildPath, err := buildPath.Join(constants.FOLDER_CORE).Abs()
+		if err != nil {
+			return i18n.WrapError(err)
+		}
+
+		ctx.PreprocPath = preprocPath
+		ctx.SketchBuildPath = sketchBuildPath
+		ctx.LibrariesBuildPath = librariesBuildPath
+		ctx.CoreBuildPath = coreBuildPath
+	}
+
+	if ctx.BuildCachePath != nil {
+		coreBuildCachePath, err := ctx.BuildCachePath.Join(constants.FOLDER_CORE).Abs()
+		if err != nil {
+			return i18n.WrapError(err)
+		}
+
+		ctx.CoreBuildCachePath = coreBuildCachePath
+	}
+
+	if ctx.WarningsLevel == "" {
+		ctx.WarningsLevel = DEFAULT_WARNINGS_LEVEL
+	}
+
+	ctx.CollectedSourceFiles = &types.UniqueSourceFileQueue{}
+
+	ctx.LibrariesResolutionResults = map[string]types.LibraryResolutionResult{}
+	ctx.HardwareRewriteResults = map[*cores.PlatformRelease][]types.PlatforKeyRewrite{}
+
+	return nil
+}

legacy/builder/add_build_board_property_if_missing.go

@@ -0,0 +1,67 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package builder
+
+import (
+	"os"
+	"strings"
+
+	"github.com/arduino/arduino-cli/legacy/builder/constants"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
+)
+
+type AddBuildBoardPropertyIfMissing struct{}
+
+func (*AddBuildBoardPropertyIfMissing) Run(ctx *types.Context) error {
+	packages := ctx.Hardware
+	logger := ctx.GetLogger()
+
+	for _, aPackage := range packages.Packages {
+		for _, platform := range aPackage.Platforms {
+			for _, platformRelease := range platform.Releases {
+				for _, board := range platformRelease.Boards {
+					if board.Properties.Get("build.board") == "" {
+						board.Properties.Set("build.board", strings.ToUpper(platform.Architecture+"_"+board.BoardID))
+						logger.Fprintln(
+							os.Stdout,
+							constants.LOG_LEVEL_WARN,
+							constants.MSG_MISSING_BUILD_BOARD,
+							aPackage.Name,
+							platform.Architecture,
+							board.BoardID,
+							board.Properties.Get(constants.BUILD_PROPERTIES_BUILD_BOARD))
+					}
+				}
+			}
+		}
+	}
+
+	return nil
+}

legacy/builder/add_missing_build_properties_from_parent_platform_txt_files.go

@@ -0,0 +1,48 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package builder
+
+import (
+	"github.com/arduino/arduino-cli/legacy/builder/ctags"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
+)
+
+type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
+
+func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(ctx *types.Context) error {
+	buildProperties := ctx.BuildProperties
+
+	newBuildProperties := ctags.CtagsProperties.Clone()
+	newBuildProperties.Merge(ArduinoPreprocessorProperties)
+	newBuildProperties.Merge(buildProperties)
+	ctx.BuildProperties = newBuildProperties
+
+	return nil
+}