Expand $(MAKE) in csc files

This makes csc files portable between Linux and macOS.
contiki-ng · Sep 1, 2023 · eca8fec · eca8fec
1 parent 519e540
commit eca8fec
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -1,3 +1,13 @@
+# Cooja v5.0
+
+## Cooja User Interface Changes
+
+## Cooja Simulation File Changes
+
+### Expand $(MAKE) in csc files
+
+Simulation file version 2023090101 introduces expansion of $(MAKE).
+
 # Cooja v4.9
 
 ## Cooja User Interface Changes

diff --git a/java/org/contikios/cooja/Cooja.java b/java/org/contikios/cooja/Cooja.java
@@ -99,7 +99,7 @@ public class Cooja {
    *  Version used to detect incompatibility with the Cooja simulation config files.
    *  The format is &lt;YYYY&gt;&lt;MM&gt;&lt;DD&gt;&lt;2 digit sequence number&gt;.
    */
-  public static final String SIMULATION_CONFIG_VERSION = "2022112801";
+  public static final String SIMULATION_CONFIG_VERSION = "2023090101";
 
   /**
    *  Version used to detect incompatibility with the Contiki-NG

diff --git a/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java b/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
@@ -247,11 +247,11 @@ public void actionPerformed(ActionEvent e1) {
         nextCommandAction.actionPerformed(null); /* Recursive calls for all commands */
       }
     };
-    cleanButton.setToolTipText("make clean TARGET=" + targetName);
+    cleanButton.setToolTipText("$(MAKE) clean TARGET=" + targetName);
     cleanButton.addActionListener(e -> {
       createButton.setEnabled(false);
       try {
-        currentCompilationProcess = BaseContikiMoteType.compile("make clean TARGET=" + targetName,
+        currentCompilationProcess = BaseContikiMoteType.compile("$(MAKE) clean TARGET=" + targetName,
             moteType.getCompilationEnvironment(), new File(contikiField.getText()).getParentFile(),
             null, null, new MessageListUI(), true);
       } catch (Exception e1) {
@@ -545,7 +545,7 @@ protected void addMoteInterface(Class<? extends MoteInterface> intfClass, boolea
    */
   protected String getDefaultCompileCommands(String name) {
     String sourceNoExtension = new File(name.substring(0, name.length() - 2)).getName();
-    return Cooja.getExternalToolsSetting("PATH_MAKE") + " -j$(CPUS) " +
+    return "$(MAKE) -j$(CPUS) " +
             sourceNoExtension + "." + targetName + " TARGET=" + targetName;
   }
 

diff --git a/java/org/contikios/cooja/mote/BaseContikiMoteType.java b/java/org/contikios/cooja/mote/BaseContikiMoteType.java
@@ -420,8 +420,9 @@ public static Process compile(
           throws MoteTypeCreationException {
     Pattern p = Pattern.compile("([^\\s\"']+|\"[^\"]*\"|'[^']*')");
     // Perform compile command variable expansions.
+    String make = Cooja.getExternalToolsSetting("PATH_MAKE");
     String cpus = Integer.toString(Runtime.getRuntime().availableProcessors());
-    Matcher m = p.matcher(commandIn.replace("$(CPUS)", cpus));
+    Matcher m = p.matcher(commandIn.replace("$(MAKE)", make).replace("$(CPUS)", cpus));
     ArrayList<String> commandList = new ArrayList<>();
     while (m.find()) {
       String arg = m.group();

diff --git a/java/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java b/java/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java
@@ -373,7 +373,7 @@ public String getQuickHelp() {
             "<br>This plugin shows the source code for MSP430 based motes and can set or remove breakpoints." +
             "<br><br>" +
             "<b>Note:</b> You must compile the code with <i>DEBUG=1</i> to include information about the source code in the build." +
-            "<br><br>Example: make TARGET=sky DEBUG=1 hello-world";
+            "<br><br>Example: $(MAKE) -j$(CPUS) TARGET=sky DEBUG=1 hello-world";
   }
 
   private class Rule {