Skip to content

Commit

Permalink
Remove Windows settings
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pjonsson committed Sep 18, 2023
1 parent b5d0563 commit 9da8402
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions java/org/contikios/cooja/Cooja.java
Original file line number Diff line number Diff line change
Expand Up @@ -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", "^[_](?<symbol>[^.].*?)[ \t]<SECTION>[ \t](?<address>[0-9a-fA-F]+)[ \t](?<size>[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 _([^ ]*)$");
Expand Down

0 comments on commit 9da8402

Please sign in to comment.