#661 installl awk in windows

Author: jantje

io.sloeber.core/config/pre_processing_platform_default.txt

@@ -1,19 +1,23 @@
-#this file contains default/fallback/resque values
+#this file contains default/fallback/rescue values
 software=ARDUINO
 recipe.objcopy.hex.pattern=${recipe.objcopy.bin.pattern}
 archive_file=arduino.ar
 archive_file_path=${build.path}/${archive_file}
-sloeber.size_command.avr="${compiler.path}${compiler.size.cmd}" --format=avr --mcu=${build.mcu} "${build.path}/${build.project_name}.elf"
-sloeber.size_command.awk=${recipe.size.pattern} | C:\test\awk\awk -f size.awk
 runtime.ide.version=10812
 build.system.path=${referenced.core.path}${DirectoryDelimiter}system
 serial.port=${com_port}
 build.project_name=${ProjName}
+
+#size stuff
+sloeber.size_command.avr="${compiler.path}${compiler.size.cmd}" --format=avr --mcu=${build.mcu} "${build.path}/${build.project_name}.elf"
+sloeber.size_command.awk=${recipe.size.pattern} | "${sloeber.awk.path}awk" -f size.awk
+
+
 #make sure we have default compiling warning commands
 compiler.warning_flags.none=-w
 compiler.warning_flags.more=-Wall
 compiler.warning_flags.all=-Wall -Wextra
-
+compiler.warning_flags=-w
 
 
 #quick fix for issue #810
@@ -33,12 +37,7 @@ tools.avrdude_remote.upload.verbose=-v
 #for due
 serial.port.file=${serial.port}
 
-#to turn warnings on/off
-compiler.warning_flags=-w
-compiler.warning_flags.all=-Wall -Wextra
-
 #for stm
-
 upload.altID=no_altID
 upload.usbID=no_altID
 

io.sloeber.core/src/io/sloeber/core/Activator.java

@@ -50,7 +50,6 @@
 import io.sloeber.core.listeners.IndexerListener;
 import io.sloeber.core.listeners.resourceChangeListener;
 
-
 /**
  * generated code
  *
@@ -398,8 +397,14 @@ private static void installOtherStuff() {
         String SH_EXE = "sh.exe";
         String MAKE_ZIP = "make1.zip";
         String MAKE_URL = "https://github.com/Sloeber/arduino-eclipse-plugin/files/2695478/make.zip";
-        // On Windows install make
+
+        String AWK_EXE = "awk.exe";
+        String AWK_ZIP = "awk_GNU_64_bit_V4_2_1.zip";
+        String AWK_URL = "https://github.com/Sloeber/arduino-eclipse-plugin/files/7102568/awk_GNU_64_bit_V4_2_1.zip";
+
+        // On Windows install make and awk
         if (SystemUtils.IS_OS_WINDOWS) {
+            // Install make if needed
             IPath localMakePath = ConfigurationPreferences.getMakePath();
             if (localMakePath.append(MAKE_EXE).toFile().exists()) {
                 if (!localMakePath.append(SH_EXE).toFile().exists()) {
@@ -415,6 +420,13 @@ private static void installOtherStuff() {
                 IProgressMonitor monitor = new NullProgressMonitor();
                 Common.log(downloadAndInstall(MAKE_URL, MAKE_ZIP, localMakePath, false, monitor));
             }
+
+            // Install awk if needed
+            IPath localAwkPath = ConfigurationPreferences.getAwkPath();
+            if (!localAwkPath.append(AWK_EXE).toFile().exists()) {
+                IProgressMonitor monitor = new NullProgressMonitor();
+                Common.log(downloadAndInstall(AWK_URL, AWK_ZIP, localAwkPath, false, monitor));
+            }
         }
     }
 

io.sloeber.core/src/io/sloeber/core/common/ConfigurationPreferences.java

@@ -26,7 +26,6 @@
  */
 public class ConfigurationPreferences {
 
-
     private static final String EXAMPLE_FOLDER_NAME = "examples"; //$NON-NLS-1$
     private static final String DOWNLOADS_FOLDER = "downloads"; //$NON-NLS-1$
     private static final String PRE_PROCESSING_PLATFORM_TXT = "pre_processing_platform.txt"; //$NON-NLS-1$
@@ -36,7 +35,6 @@ public class ConfigurationPreferences {
 
     private static final String KEY_UPDATE_JASONS = "Update jsons files"; //$NON-NLS-1$
 
-
     // preference nodes
     private static final String PACKAGES_FOLDER_NAME = "packages"; //$NON-NLS-1$
 
@@ -151,14 +149,15 @@ public static File getPostProcessingBoardsFile() {
         return getInstallationPath().append(POST_PROCESSING_BOARDS_TXT).toFile();
     }
 
-
-
-
     public static Path getMakePath() {
         return new Path(getInstallationPath().append("tools/make").toString()); //$NON-NLS-1$
 
     }
 
+    public static IPath getAwkPath() {
+        return new Path(getInstallationPath().append("tools/awk").toString()); //$NON-NLS-1$
+    }
+
     public static boolean getUpdateJasonFilesFlag() {
         return getBoolean(KEY_UPDATE_JASONS, Defaults.updateJsonFiles);
     }