Make package_index library aware of installed cores

The coreDependency resolution will search for most recent installed core.
The test has been moved to allow populating the context

Author: facchinm

src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go

@@ -57,7 +57,7 @@ func (s *OverridePropertiesWithJsonInfo) Run(ctx *types.Context) error {
 
 	if ctx.JsonFolders != nil {
 
-		jsonProperties, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.JsonFolders)
+		jsonProperties, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.Hardware, ctx.JsonFolders)
 
 		if err != nil {
 			// doesn't matter, log the broken package in verbose mode

src/arduino.cc/builder/test/add_build_board_property_if_missing_test.go

@@ -33,6 +33,7 @@ import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
+	"arduino.cc/json_package_index"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
@@ -95,3 +96,35 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
 	require.Equal(t, "atmega2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
 	require.Equal(t, "AVR_MEGA2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
 }
+
+func TestCoreDependencyProperty(t *testing.T) {
+	var paths []string
+	path, _ := filepath.Abs(filepath.Join("..", "..", "json_package_index", "testdata"))
+	paths = append(paths, path)
+
+	DownloadCoresAndToolsAndLibraries(t)
+
+	ctx := &types.Context{
+		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+	}
+
+	commands := []types.Command{
+		&builder.HardwareLoader{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(ctx)
+		NoError(t, err)
+	}
+
+	p, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.Hardware, paths)
+	require.NoError(t, err)
+
+	version := ctx.Hardware.Packages["arduino"].Platforms["avr"].Properties["version"]
+
+	if json_package_index.CompareVersions(version, "1.6.12") >= 0 {
+		require.Equal(t, "{runtime.tools.avr-gcc-4.9.2-atmel3.5.3-arduino2.path}", p["attiny:avr:1.0.2"]["runtime.tools.avr-gcc.path"])
+	} else {
+		require.Equal(t, "{runtime.tools.avr-gcc-4.8.1-arduino5.path}", p["attiny:avr:1.0.2"]["runtime.tools.avr-gcc.path"])
+	}
+}

src/arduino.cc/json_package_index/package_index.go

@@ -32,6 +32,7 @@ package json_package_index
 import (
 	"arduino.cc/builder/constants"
 	_ "arduino.cc/builder/i18n"
+	"arduino.cc/builder/types"
 	"arduino.cc/properties"
 	"encoding/json"
 	"errors"
@@ -51,14 +52,14 @@ type core struct {
 	Name         string `json:"archiveFileName"`
 	Checksum     string `json:"checksum"`
 	destination  string
+	installed    bool
 	Dependencies []struct {
 		Packager string `json:"packager"`
 		Name     string `json:"name"`
 		Version  string `json:"version"`
 	} `json:"toolsDependencies"`
 	CoreDependencies []struct {
 		Packager string `json:"packager"`
-		Name     string `json:"name"`
 	} `json:"coreDependencies"`
 }
 
@@ -98,9 +99,10 @@ var systems = map[string]string{
 
 var globalProperties map[string]properties.Map
 
-func PackageIndexFoldersToPropertiesMap(folders []string) (map[string]properties.Map, error) {
+func PackageIndexFoldersToPropertiesMap(packages *types.Packages, folders []string) (map[string]properties.Map, error) {
 
 	var paths []string
+
 	for _, folder := range folders {
 		folder, err := filepath.Abs(folder)
 		if err != nil {
@@ -113,15 +115,15 @@ func PackageIndexFoldersToPropertiesMap(folders []string) (map[string]properties
 			}
 		}
 	}
-	return PackageIndexesToPropertiesMap(paths)
+	return PackageIndexesToPropertiesMap(packages, paths)
 }
 
-func PackageIndexesToPropertiesMap(urls []string) (map[string]properties.Map, error) {
+func PackageIndexesToPropertiesMap(packages *types.Packages, urls []string) (map[string]properties.Map, error) {
 
 	globalProperties = make(map[string]properties.Map)
 	coreDependencyMap := make(map[string]string)
 
-	data, err := PackageIndexesToGlobalIndex(urls)
+	data, err := PackageIndexesToGlobalIndex(packages, urls)
 
 	for _, p := range data.Packages {
 		for _, a := range p.Platforms {
@@ -136,32 +138,32 @@ func PackageIndexesToPropertiesMap(urls []string) (map[string]properties.Map, er
 			}
 			for _, coredep := range a.CoreDependencies {
 				// inherit all the tools from latest coredep
-				version, err := findLatestCore(data, coredep.Packager, coredep.Name)
 				if err == nil {
 					coreDependencyMap[p.Name+":"+a.Architecture+":"+a.Version] =
-						coredep.Packager + ":" + coredep.Name + ":" + version
+						coredep.Packager + ":" + a.Architecture
 				}
 			}
 			globalProperties[p.Name+":"+a.Architecture+":"+a.Version] = localProperties.Clone()
 		}
 	}
 
 	for idx, parentCore := range coreDependencyMap {
-		if (globalProperties[parentCore]) != nil {
-			globalProperties[idx] = globalProperties[parentCore].Clone()
+		version, err := findLatestInstalledCore(data, strings.Split(parentCore, ":")[0], strings.Split(parentCore, ":")[1])
+		if err == nil {
+			globalProperties[idx] = globalProperties[parentCore+":"+version].Clone()
 		}
 	}
 
 	return globalProperties, err
 }
 
-func findLatestCore(data index, Packager string, Name string) (string, error) {
+func findLatestInstalledCore(data index, Packager string, Name string) (string, error) {
 	latest, _ := semver.Make("0.0.0")
 	for _, p := range data.Packages {
 		for _, a := range p.Platforms {
 			if p.Name == Packager && a.Architecture == Name {
 				test, _ := semver.Make(a.Version)
-				if test.GT(latest) {
+				if test.GT(latest) && a.installed {
 					latest = test
 				}
 			}
@@ -177,9 +179,9 @@ func findLatestCore(data index, Packager string, Name string) (string, error) {
 	return latest.String(), err
 }
 
-func PackageIndexesToGlobalIndex(urls []string) (index, error) {
+func PackageIndexesToGlobalIndex(packages *types.Packages, urls []string) (index, error) {
 
-	// firststub of arduino-pdpm
+	// first stub of arduino-pdpm
 	var data index
 	var err error
 
@@ -210,5 +212,29 @@ func PackageIndexesToGlobalIndex(urls []string) (index, error) {
 			data.Packages = append(data.Packages, entry)
 		}
 	}
+
+	for i, p := range data.Packages {
+		for j, a := range p.Platforms {
+			if packages != nil && packages.Packages[p.Name] != nil &&
+				packages.Packages[p.Name].Platforms[a.Architecture] != nil &&
+				packages.Packages[p.Name].Platforms[a.Architecture].Properties["version"] == a.Version {
+				data.Packages[i].Platforms[j].installed = true
+			}
+		}
+	}
+
 	return data, err
 }
+
+func CompareVersions(fv string, sv string) int {
+	v1, _ := semver.Make(fv)
+	v2, _ := semver.Make(sv)
+	if v1.EQ(v2) {
+		return 0
+	}
+	if v1.GT(v2) {
+		return 1
+	} else {
+		return -1
+	}
+}

src/arduino.cc/json_package_index/package_index_test.go

@@ -1,18 +1,17 @@
 package json_package_index
 
 import (
+	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestPropertiesPackageIndex(t *testing.T) {
 
 	var paths []string
 	paths = append(paths, filepath.Join("testdata", "package_index.json"))
 
-	p, err := PackageIndexesToPropertiesMap(paths)
+	p, err := PackageIndexesToPropertiesMap(nil, paths)
 
 	require.NoError(t, err)
 
@@ -25,7 +24,7 @@ func TestPropertiesPackageIndexRemote(t *testing.T) {
 	paths = append(paths, filepath.Join("testdata", "package_index.json"))
 	paths = append(paths, "http://downloads.arduino.cc/packages/package_arduino.cc_linux_index.json")
 
-	p, err := PackageIndexesToPropertiesMap(paths)
+	p, err := PackageIndexesToPropertiesMap(nil, paths)
 
 	require.NoError(t, err)
 
@@ -38,7 +37,7 @@ func TestPackageIndexToGlobalIndex(t *testing.T) {
 	var paths []string
 	paths = append(paths, filepath.Join("testdata", "package_index.json"))
 
-	p, err := PackageIndexesToGlobalIndex(paths)
+	p, err := PackageIndexesToGlobalIndex(nil, paths)
 	require.NoError(t, err)
 
 	require.Equal(t, "Arduino", p.Packages[0].Maintainer)
@@ -48,18 +47,8 @@ func TestPackageIndexFoldersToPropertiesMap(t *testing.T) {
 	var paths []string
 	paths = append(paths, "testdata")
 
-	p, err := PackageIndexFoldersToPropertiesMap(paths)
+	p, err := PackageIndexFoldersToPropertiesMap(nil, paths)
 	require.NoError(t, err)
 
 	require.Equal(t, "{runtime.tools.avr-gcc-4.9.2-atmel3.5.3-arduino2.path}", p["arduino:avr:1.6.12"]["runtime.tools.avr-gcc.path"])
 }
-
-func TestCoreDependencyProperty(t *testing.T) {
-	var paths []string
-	paths = append(paths, "testdata")
-
-	p, err := PackageIndexFoldersToPropertiesMap(paths)
-	require.NoError(t, err)
-
-	require.Equal(t, "{runtime.tools.avr-gcc-4.9.2-atmel3.5.3-arduino2.path}", p["attiny:avr:1.0.2"]["runtime.tools.avr-gcc.path"])
-}