Splitting preprocessing in two commands, with different params.

New gcc -E -dM is just like gcc -E but does NOT outputs preprocessed code
which makes arduino-builder run faster on Windows

Signed-off-by: Federico Fissore <f.fissore@arduino.cc>

Author: Federico Fissore

src/arduino.cc/builder/constants/constants.go

@@ -252,6 +252,7 @@ const RECIPE_AR_PATTERN = "recipe.ar.pattern"
 const RECIPE_C_COMBINE_PATTERN = "recipe.c.combine.pattern"
 const RECIPE_C_PATTERN = "recipe.c.o.pattern"
 const RECIPE_CPP_PATTERN = "recipe.cpp.o.pattern"
+const RECIPE_PREPROC_FINAL = "recipe.preproc.final"
 const RECIPE_PREPROC_INCLUDES = "recipe.preproc.includes"
 const RECIPE_PREPROC_MACROS = "recipe.preproc.macros"
 const RECIPE_S_PATTERN = "recipe.S.o.pattern"

src/arduino.cc/builder/gcc_preproc_runner.go

@@ -48,7 +48,7 @@ func (s *GCCPreprocRunner) Run(context map[string]interface{}) error {
 
 	verbose := context[constants.CTX_VERBOSE].(bool)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
-	output, err := builder_utils.ExecRecipe(properties, constants.RECIPE_PREPROC_MACROS, true, verbose, false, logger)
+	output, err := builder_utils.ExecRecipe(properties, constants.RECIPE_PREPROC_FINAL, true, verbose, false, logger)
 	if err != nil {
 		return utils.WrapError(err)
 	}

src/arduino.cc/builder/hardware/platform.keys.rewrite.txt

@@ -38,8 +38,5 @@ old.11.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.
 new.11.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} -o "{build.path}/{build.project_name}.elf" {object_files} "{archive_file_path}" "-L{build.path}" -lm
 
 #generic again
-old.12.preproc.includes.flags=-w -x c++ -M -MG -MP
-new.12.preproc.includes.flags=-w -x c++ -M -MG -MP -include Arduino.h
-
-old.13.preproc.macros.flags=-w -x c++ -E -CC
-new.13.preproc.macros.flags=-w -x c++ -E -CC -include Arduino.h
+old.12.preproc.macros.flags=-w -x c++ -E -CC
+new.12.preproc.macros.flags=-w -x c++ -E -CC -dM -include Arduino.h

src/arduino.cc/builder/hardware/platform.txt

@@ -11,6 +11,10 @@ preproc.includes.flags=-w -x c++ -M -MG -MP -include Arduino.h
 preproc.includes.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.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} {preproc.includes.compatibility_flags} {includes} "{source_file}"
 
-preproc.macros.flags=-w -x c++ -E -CC -include Arduino.h
+preproc.macros.flags=-w -x c++ -E -CC -dM -include Arduino.h
 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}"
+
+preproc.final.flags=-w -x c++ -E -CC -include Arduino.h
+preproc.final.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.final="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.final.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.final.compatibility_flags} {includes} "{source_file}"

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

@@ -89,6 +89,7 @@ func TestBuilderBridge(t *testing.T) {
 	context[constants.CTX_BUILT_IN_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
 	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
 	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+	context[constants.CTX_VERBOSE] = true
 
 	command := builder.Builder{}
 	err := command.Run(context)

src/arduino.cc/builder/test/downloaded_stuff_patches/avr_platform_patch.patch

@@ -1,17 +1,12 @@
-diff --git a/downloaded_hardware/arduino/avr/platform.txt b/downloaded_hardware/arduino/avr/platform.txt
-index 537fcc5..4e526d9 100644
---- a/downloaded_hardware/arduino/avr/platform.txt
-+++ b/downloaded_hardware/arduino/avr/platform.txt
-@@ -81,6 +81,12 @@ recipe.size.regex=^(?:\.text|\.data|\.bootloader)\s+([0-9]+).*
- recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
- recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
+--- a/downloaded_hardware/arduino/avr/platform.txt.orig	2015-11-11 17:20:47.731372477 +0100
++++ b/downloaded_hardware/arduino/avr/platform.txt	2015-11-11 17:21:21.463373279 +0100
+@@ -88,6 +88,9 @@
+ preproc.macros.flags=-w -x c++ -E -CC
+ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.macros.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
 
-+## Preprocessor
-+preproc.includes.flags=-w -x c++ -M -MG -MP
-+recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.includes.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
++preproc.final.flags=-w -x c++ -E -CC
++recipe.preproc.final="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.final.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
 +
-+preproc.macros.flags=-w -x c++ -E -CC
-+recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.macros.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
- 
  # AVR Uploader/Programmers tools
  # ------------------------------
+ 

src/arduino.cc/builder/test/hardware/platform.txt

@@ -1,9 +1,3 @@
-# ctags
-# ------------------------------
-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 --line-directives "{source_file}"
-
 # coan
 # ------------------------------
 tools.coan.path={runtime.tools.coan.path}

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

@@ -81,7 +81,8 @@ func TestLoadHardware(t *testing.T) {
 	require.Equal(t, "{runtime.tools.ctags.path}", packages.Properties["tools.ctags.path"])
 	require.Equal(t, "\"{cmd.path}\" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives \"{source_file}\"", packages.Properties["tools.ctags.pattern"])
 	require.Equal(t, "{runtime.tools.avrdude.path}", packages.Properties["tools.avrdude.path"])
-	require.Equal(t, "-w -x c++ -E -CC -include Arduino.h", packages.Properties["preproc.macros.flags"])
+	require.Equal(t, "-w -x c++ -E -CC -include Arduino.h", packages.Properties["preproc.final.flags"])
+	require.Equal(t, "-w -x c++ -E -CC -dM -include Arduino.h", packages.Properties["preproc.macros.flags"])
 }
 
 func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
@@ -130,8 +131,8 @@ 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 -include Arduino.h", avrPlatform.Properties["preproc.includes.flags"])
-	require.Equal(t, "-w -x c++ -E -CC -include Arduino.h", avrPlatform.Properties["preproc.macros.flags"])
+	require.Equal(t, "-w -x c++ -M -MG -MP", avrPlatform.Properties["preproc.includes.flags"])
+	require.Equal(t, "-w -x c++ -E -CC -dM -include Arduino.h", avrPlatform.Properties["preproc.macros.flags"])
 	require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {compiler.cpp.flags} {preproc.includes.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} \"{source_file}\"", avrPlatform.Properties[constants.RECIPE_PREPROC_INCLUDES])
 	require.False(t, utils.MapStringStringHas(avrPlatform.Properties, "preproc.macros.compatibility_flags"))
 
@@ -146,7 +147,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 	require.Equal(t, "{runtime.tools.ctags.path}", packages.Properties["tools.ctags.path"])
 	require.Equal(t, "\"{cmd.path}\" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives \"{source_file}\"", packages.Properties["tools.ctags.pattern"])
 	require.Equal(t, "{runtime.tools.avrdude.path}", packages.Properties["tools.avrdude.path"])
-	require.Equal(t, "-w -x c++ -E -CC -include Arduino.h", packages.Properties["preproc.macros.flags"])
+	require.Equal(t, "-w -x c++ -E -CC -dM -include Arduino.h", packages.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}", packages.Properties["preproc.macros.compatibility_flags"])
 
 	if runtime.GOOS != "windows" {

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

@@ -54,7 +54,7 @@ func TestLoadPlatformKeysRewrite(t *testing.T) {
 
 	platformKeysRewrite := context[constants.CTX_PLATFORM_KEYS_REWRITE].(types.PlatforKeysRewrite)
 
-	require.Equal(t, 14, len(platformKeysRewrite.Rewrites))
+	require.Equal(t, 13, len(platformKeysRewrite.Rewrites))
 	require.Equal(t, constants.BUILD_PROPERTIES_COMPILER_PATH, platformKeysRewrite.Rewrites[0].Key)
 	require.Equal(t, "{runtime.ide.path}/hardware/tools/avr/bin/", platformKeysRewrite.Rewrites[0].OldValue)
 	require.Equal(t, "{runtime.tools.avr-gcc.path}/bin/", platformKeysRewrite.Rewrites[0].NewValue)