From 9da8402a0d62454762511a1c7040189622968047 Mon Sep 17 00:00:00 2001 From: "Peter A. Jonsson" Date: Mon, 18 Sep 2023 16:24:27 +0200 Subject: [PATCH] Remove Windows settings Native Windows is not supported by Contiki-NG, and has not been tested for a long time with Cooja, so remove the support. Cooja can still be used with Windows through WSL2. --- java/org/contikios/cooja/Cooja.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/java/org/contikios/cooja/Cooja.java b/java/org/contikios/cooja/Cooja.java index 82ee49577..dc91410d2 100644 --- a/java/org/contikios/cooja/Cooja.java +++ b/java/org/contikios/cooja/Cooja.java @@ -968,15 +968,7 @@ private static Properties getExternalToolsDefaultSettings() { settings.put("COMMAND_VAR_SEC_BSS", "[Bb]"); settings.put("COMMAND_VAR_SEC_COMMON", "[C]"); String osName = System.getProperty("os.name").toLowerCase(); - if (osName.startsWith("win")) { - settings.put("PATH_C_COMPILER", "mingw32-gcc"); - settings.put("PARSE_WITH_COMMAND", "true"); - - // Hack: nm with arguments -S --size-sort does not display __data_start symbols - settings.put("PARSE_COMMAND", "/bin/nm -aP --size-sort -S $(LIBFILE) && /bin/nm -aP $(LIBFILE)"); - - settings.put("COMMAND_VAR_NAME_ADDRESS_SIZE", "^[_](?[^.].*?)[ \t]
[ \t](?
[0-9a-fA-F]+)[ \t](?[0-9a-fA-F]+)"); - } else if (osName.startsWith("mac os x")) { + if (osName.startsWith("mac os x")) { settings.put("PARSE_WITH_COMMAND", "true"); settings.put("PARSE_COMMAND", "symbols $(LIBFILE)"); settings.put("COMMAND_VAR_NAME_ADDRESS", "^[ \t]*([0-9A-Fa-f][0-9A-Fa-f]*)[ \t]\\(__DATA,__[^ ]*\\) external _([^ ]*)$");