Converted the project into a valid go package. Modules "properties" and "timeutils" are replaced with external dependencies.

Author: Lerg

.travis.yml

@@ -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_additional_entries_to_context.go renamed to add_additional_entries_to_context.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_build_board_property_if_missing.go renamed to add_build_board_property_if_missing.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/add_missing_build_properties_from_parent_platform_txt_files.go renamed to add_missing_build_properties_from_parent_platform_txt_files.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/builder/additional_sketch_files_copier.go renamed to additional_sketch_files_copier.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/arduino-builder/main.go renamed to arduino-builder/main.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.go renamed to builder.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/builder_utils/utils.go renamed to builder_utils/utils.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{}