Populate buildProperties[constants.BUILD_PROPERTIES_FQBN] with proper fqbn

facchinm · facchinm · commit 8dd4a22f9f54 · 2017-02-10T11:42:14.000+01:00
diff --git a/src/arduino.cc/builder/builder_utils/utils.go b/src/arduino.cc/builder/builder_utils/utils.go
@@ -476,6 +476,8 @@ func copyFileContents(src, dst string) (err error) {
 	return
 }
 
-func GetCoreArchivePath(fqbnToUnderscore string) string {
+func GetCoreArchivePath(fqbn string) string {
+	fqbnToUnderscore := strings.Replace(fqbn, ":", "_", -1)
+	fqbnToUnderscore = strings.Replace(fqbnToUnderscore, "=", "_", -1)
 	return os.TempDir() + "/core_" + fqbnToUnderscore + ".a"
 }
diff --git a/src/arduino.cc/builder/setup_build_properties.go b/src/arduino.cc/builder/setup_build_properties.go
@@ -70,7 +70,7 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH] = targetPlatform.Folder
 	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_HARDWARE_PATH] = filepath.Join(targetPlatform.Folder, "..")
 	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = ctx.ArduinoAPIVersion
-	buildProperties[constants.BUILD_PROPERTIES_FQBN] = strings.Replace(ctx.FQBN, ":", "_", -1)
+	buildProperties[constants.BUILD_PROPERTIES_FQBN] = ctx.FQBN
 	buildProperties[constants.IDE_VERSION] = ctx.ArduinoAPIVersion
 	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_OS] = utils.PrettyOSName()
 

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,8 @@ func copyFileContents(src, dst string) (err error) {`
`476`	`476`	`return`
`477`	`477`	`}`
`478`	`478`
`479`		`-func GetCoreArchivePath(fqbnToUnderscore string) string {`
	`479`	`+func GetCoreArchivePath(fqbn string) string {`
	`480`	`+ fqbnToUnderscore := strings.Replace(fqbn, ":", "_", -1)`
	`481`	`+ fqbnToUnderscore = strings.Replace(fqbnToUnderscore, "=", "_", -1)`
`480`	`482`	`return os.TempDir() + "/core_" + fqbnToUnderscore + ".a"`
`481`	`483`	`}`