Moved 'added' keys from platform.keys.rewrite.txt to generic platform.txt

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/hardware/platform.keys.rewrite.txt

@@ -1,8 +1,6 @@
 old.0.compiler.path={runtime.ide.path}/hardware/tools/avr/bin/
 new.0.compiler.path={runtime.tools.avr-gcc.path}/bin/
 
-added.tools.avrdude.path={runtime.tools.avrdude.path}
-
 old.1.tools.avrdude.cmd.path={runtime.ide.path}/hardware/tools/avr/bin/avrdude
 new.1.tools.avrdude.cmd.path={path}/bin/avrdude
 
@@ -18,13 +16,6 @@ new.4.tools.bossac.path={runtime.tools.bossac.path}
 old.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
 new.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/core/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
 
-added.preproc.includes.flags=-w -x c++ -M -MG -MP
-added.recipe.preproc.includes="{compiler.path}{compiler.c.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} "{source_file}"
-
-added.preproc.macros.flags=-w -x c++ -E -CC
-added.preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
-added.recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}"
-
 #specific to RedBearLab nRF51822 Boards
 old.6.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" -mcpu={build.mcu} -mthumb -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map={build.path}/{build.project_name}.map,--cref "-T{build.variant.path}/{build.ldscript}" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group "{build.path}/system_nrf51.c.o" {object_files} "{build.path}/startup_NRF51822.s.o" "{build.path}/{archive_file}" -Wl,--end-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 new.6.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" -mcpu={build.mcu} -mthumb -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map={build.path}/{build.project_name}.map,--cref "-T{build.variant.path}/{build.ldscript}" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group "{build.path}/core/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c.o" {object_files} "{build.path}/core/startup_NRF51822.S.o" "{build.path}/{archive_file}" -Wl,--end-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys

Diff for: src/arduino.cc/builder/hardware/platform.txt

@@ -3,3 +3,13 @@
 tools.ctags.path={runtime.tools.ctags.path}
 tools.ctags.cmd.path={path}/ctags
 tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns "{source_file}"
+
+# additional entries
+tools.avrdude.path={runtime.tools.avrdude.path}
+
+preproc.includes.flags=-w -x c++ -M -MG -MP
+recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} "{source_file}"
+
+preproc.macros.flags=-w -x c++ -E -CC
+preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
+recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}"

Diff for: src/arduino.cc/builder/platform_keys_rewrite_loader.go

@@ -55,7 +55,6 @@ func (s *PlatformKeysRewriteLoader) Run(context map[string]interface{}) error {
 
 	platformKeysRewrite := types.PlatforKeysRewrite{}
 	platformKeysRewrite.Rewrites = []types.PlatforKeyRewrite{}
-	platformKeysRewrite.Additions = []types.KeyValuePair{}
 
 	txt, err := props.Load(platformKeysRewriteTxtPath)
 	keys := utils.KeysOfMapOfString(txt)
@@ -69,11 +68,6 @@ func (s *PlatformKeysRewriteLoader) Run(context map[string]interface{}) error {
 			newValue := txt[constants.PLATFORM_REWRITE_NEW+"."+strings.Join(keyParts[1:], ".")]
 			platformKeyRewrite := types.PlatforKeyRewrite{Key: rewriteKey, OldValue: oldValue, NewValue: newValue}
 			platformKeysRewrite.Rewrites = append(platformKeysRewrite.Rewrites, platformKeyRewrite)
-		} else if keyParts[0] == constants.PLATFORM_REWRITE_ADDED {
-			additionalKey := strings.Join(keyParts[1:], ".")
-			additionalValue := txt[key]
-			platformKeyAddition := types.KeyValuePair{Key: additionalKey, Value: additionalValue}
-			platformKeysRewrite.Additions = append(platformKeysRewrite.Additions, platformKeyAddition)
 		}
 	}
 

Diff for: src/arduino.cc/builder/rewrite_hardware_keys.go

@@ -60,14 +60,6 @@ func (s *RewriteHardwareKeys) Run(context map[string]interface{}) error {
 					}
 				}
 			}
-			for _, addition := range platformKeysRewrite.Additions {
-				if platform.Properties[addition.Key] == constants.EMPTY_STRING {
-					platform.Properties[addition.Key] = addition.Value
-					if warn {
-						logger.Fprintln(os.Stderr, constants.MSG_WARNING_PLATFORM_MISSING_VALUE, platform.Properties[constants.PLATFORM_NAME], addition.Key, addition.Value)
-					}
-				}
-			}
 		}
 	}
 

Diff for: src/arduino.cc/builder/test/hardware_loader_test.go

@@ -118,6 +118,11 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 
 	require.Equal(t, "AVRISP mkII", avrPlatform.Programmers["avrispmkii"][constants.PROGRAMMER_NAME])
 
+	require.Equal(t, "-w -x c++ -M -MG -MP", avrPlatform.Properties["preproc.includes.flags"])
+	require.Equal(t, "-w -x c++ -E -CC", avrPlatform.Properties["preproc.macros.flags"])
+	require.Equal(t, "{build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}", avrPlatform.Properties["preproc.macros.compatibility_flags"])
+	require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} \"{source_file}\"", avrPlatform.Properties[constants.RECIPE_PREPROC_INCLUDES])
+
 	require.NotNil(t, packages["my_avr_platform"])
 	myAVRPlatform := packages["my_avr_platform"].Platforms["avr"]
 	require.Equal(t, "custom_yun", myAVRPlatform.Boards["custom_yun"].BoardId)
@@ -127,6 +132,9 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 	require.Equal(t, "{path}/bin/avrdude", myAVRPlatform.Properties["tools.avrdude.cmd.path"])
 	require.Equal(t, "{path}/etc/avrdude.conf", myAVRPlatform.Properties["tools.avrdude.config.path"])
 
+	require.Equal(t, "-w -x c++ -M -MG -MP", myAVRPlatform.Properties["preproc.includes.flags"])
+	require.Equal(t, "-w -x c++ -E -CC", myAVRPlatform.Properties["preproc.macros.flags"])
+
 	if runtime.GOOS != "windows" {
 		require.NotNil(t, packages["my_symlinked_avr_platform"])
 		require.NotNil(t, packages["my_symlinked_avr_platform"].Platforms["avr"])

Diff for: src/arduino.cc/builder/test/platform_keys_rewrite_loader_test.go

@@ -64,18 +64,4 @@ func TestLoadPlatformKeysRewrite(t *testing.T) {
 	require.Equal(t, "recipe.c.combine.pattern", platformKeysRewrite.Rewrites[5].Key)
 	require.Equal(t, "\"{compiler.path}{compiler.c.elf.cmd}\" {compiler.c.elf.flags} -mcpu={build.mcu} \"-T{build.variant.path}/{build.ldscript}\" \"-Wl,-Map,{build.path}/{build.project_name}.map\" {compiler.c.elf.extra_flags} -o \"{build.path}/{build.project_name}.elf\" \"-L{build.path}\" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group \"{build.path}/syscalls_sam3.c.o\" {object_files} \"{build.variant.path}/{build.variant_system_lib}\" \"{build.path}/{archive_file}\" -Wl,--end-group -lm -gcc", platformKeysRewrite.Rewrites[5].OldValue)
 	require.Equal(t, "\"{compiler.path}{compiler.c.elf.cmd}\" {compiler.c.elf.flags} -mcpu={build.mcu} \"-T{build.variant.path}/{build.ldscript}\" \"-Wl,-Map,{build.path}/{build.project_name}.map\" {compiler.c.elf.extra_flags} -o \"{build.path}/{build.project_name}.elf\" \"-L{build.path}\" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group \"{build.path}/core/syscalls_sam3.c.o\" {object_files} \"{build.variant.path}/{build.variant_system_lib}\" \"{build.path}/{archive_file}\" -Wl,--end-group -lm -gcc", platformKeysRewrite.Rewrites[5].NewValue)
-
-	require.Equal(t, 6, len(platformKeysRewrite.Additions))
-	require.Equal(t, "preproc.includes.flags", platformKeysRewrite.Additions[0].Key)
-	require.Equal(t, "-w -x c++ -M -MG -MP", platformKeysRewrite.Additions[0].Value)
-	require.Equal(t, "preproc.macros.compatibility_flags", platformKeysRewrite.Additions[1].Key)
-	require.Equal(t, "{build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}", platformKeysRewrite.Additions[1].Value)
-	require.Equal(t, "preproc.macros.flags", platformKeysRewrite.Additions[2].Key)
-	require.Equal(t, "-w -x c++ -E -CC", platformKeysRewrite.Additions[2].Value)
-	require.Equal(t, constants.RECIPE_PREPROC_INCLUDES, platformKeysRewrite.Additions[3].Key)
-	require.Equal(t, "\"{compiler.path}{compiler.c.cmd}\" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} \"{source_file}\"", platformKeysRewrite.Additions[3].Value)
-	require.Equal(t, constants.RECIPE_PREPROC_MACROS, platformKeysRewrite.Additions[4].Key)
-	require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} \"{source_file}\"", platformKeysRewrite.Additions[4].Value)
-	require.Equal(t, "tools.avrdude.path", platformKeysRewrite.Additions[5].Key)
-	require.Equal(t, "{runtime.tools.avrdude.path}", platformKeysRewrite.Additions[5].Value)
 }

Diff for: src/arduino.cc/builder/test/rewrite_hardware_keys_test.go

@@ -54,8 +54,7 @@ func TestRewriteHardwareKeys(t *testing.T) {
 	context[constants.CTX_HARDWARE] = hardware
 
 	rewrite := types.PlatforKeyRewrite{Key: constants.BUILD_PROPERTIES_COMPILER_PATH, OldValue: "{runtime.ide.path}/hardware/tools/avr/bin/", NewValue: "{runtime.tools.avr-gcc.path}/bin/"}
-	addition := types.KeyValuePair{Key: "tools.avrdude.path", Value: "{runtime.tools.avrdude.path}"}
-	platformKeysRewrite := types.PlatforKeysRewrite{Rewrites: []types.PlatforKeyRewrite{rewrite}, Additions: []types.KeyValuePair{addition}}
+	platformKeysRewrite := types.PlatforKeysRewrite{Rewrites: []types.PlatforKeyRewrite{rewrite}}
 	context[constants.CTX_PLATFORM_KEYS_REWRITE] = platformKeysRewrite
 
 	commands := []types.Command{
@@ -70,5 +69,4 @@ func TestRewriteHardwareKeys(t *testing.T) {
 	}
 
 	require.Equal(t, "{runtime.tools.avr-gcc.path}/bin/", platform.Properties[constants.BUILD_PROPERTIES_COMPILER_PATH])
-	require.Equal(t, "{runtime.tools.avrdude.path}", platform.Properties["tools.avrdude.path"])
 }

Diff for: src/arduino.cc/builder/types/types.go

@@ -128,8 +128,7 @@ func (library *Library) SupportsArchitectures(archs []string) bool {
 }
 
 type PlatforKeysRewrite struct {
-	Rewrites  []PlatforKeyRewrite
-	Additions []KeyValuePair
+	Rewrites []PlatforKeyRewrite
 }
 
 type PlatforKeyRewrite struct {