diff --git a/tools/cooja/config/external_tools_linux.config b/tools/cooja/config/external_tools_linux.config index 93ff227e7..3f0a0474e 100644 --- a/tools/cooja/config/external_tools_linux.config +++ b/tools/cooja/config/external_tools_linux.config @@ -24,6 +24,7 @@ CORECOMM_TEMPLATE_FILENAME = corecomm_template.java PATH_JAVAC = javac DEFAULT_PROJECTDIRS = ../apps/mrm +PARSE_WITH_NM = true MAPFILE_DATA_START = ^.data[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$ MAPFILE_DATA_SIZE = ^.data[ \t]*0x[0-9A-Fa-f]*[ \t]*0x([0-9A-Fa-f]*)[ \t]*$ MAPFILE_BSS_START = ^.bss[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$ diff --git a/tools/cooja/config/external_tools_win32.config b/tools/cooja/config/external_tools_win32.config index a85bc8457..6aa67a7b5 100644 --- a/tools/cooja/config/external_tools_win32.config +++ b/tools/cooja/config/external_tools_win32.config @@ -24,6 +24,7 @@ CORECOMM_TEMPLATE_FILENAME = corecomm_template.java PATH_JAVAC = javac DEFAULT_PROJECTDIRS = ../apps/mrm +PARSE_WITH_NM = true MAPFILE_DATA_START = ^.data[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$ MAPFILE_DATA_SIZE = ^.data[ \t]*0x[0-9A-Fa-f]*[ \t]*0x([0-9A-Fa-f]*)[ \t]*$ MAPFILE_BSS_START = ^.bss[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$ diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java index d8eb0aa85..11da1d779 100644 --- a/tools/cooja/java/se/sics/cooja/GUI.java +++ b/tools/cooja/java/se/sics/cooja/GUI.java @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: GUI.java,v 1.58 2007/09/10 13:25:36 fros4943 Exp $ + * $Id: GUI.java,v 1.59 2007/09/10 14:04:50 fros4943 Exp $ */ package se.sics.cooja; @@ -142,15 +142,27 @@ public class GUI { private static Properties currentExternalToolsSettings; private static final String externalToolsSettingNames[] = new String[] { - "PATH_CONTIKI", "PATH_COOJA_CORE_RELATIVE", "PATH_MAKE", "PATH_SHELL", - "PATH_C_COMPILER", "COMPILER_ARGS", "PATH_LINKER", "PATH_NM", "NM_ARGS", - "PATH_OBJDUMP", "OBJDUMP_ARGS", "LINK_COMMAND_1", "LINK_COMMAND_2", - "CONTIKI_STANDARD_PROCESSES", "CMD_GREP_PROCESSES", - "REGEXP_PARSE_PROCESSES", "CMD_GREP_INTERFACES", - "REGEXP_PARSE_INTERFACES", "CMD_GREP_SENSORS", "REGEXP_PARSE_SENSORS", - "CONTIKI_MAIN_TEMPLATE_FILENAME", "DEFAULT_PROJECTDIRS", - "CORECOMM_TEMPLATE_FILENAME", "PATH_JAVAC", + "PATH_CONTIKI", "PATH_COOJA_CORE_RELATIVE", + "PATH_MAKE", + "PATH_SHELL", + "PATH_C_COMPILER", "COMPILER_ARGS", + "PATH_LINKER", "LINK_COMMAND_1", "LINK_COMMAND_2", + "PATH_NM", "NM_ARGS", + "PATH_OBJDUMP", "OBJDUMP_ARGS", + "PATH_JAVAC", + + "CONTIKI_STANDARD_PROCESSES", + "CONTIKI_MAIN_TEMPLATE_FILENAME", + + "CMD_GREP_PROCESSES", "REGEXP_PARSE_PROCESSES", + "CMD_GREP_INTERFACES", "REGEXP_PARSE_INTERFACES", + "CMD_GREP_SENSORS", "REGEXP_PARSE_SENSORS", + + "DEFAULT_PROJECTDIRS", + "CORECOMM_TEMPLATE_FILENAME", + + "PARSE_WITH_NM", "MAPFILE_DATA_START", "MAPFILE_DATA_SIZE", "MAPFILE_BSS_START", "MAPFILE_BSS_SIZE", "MAPFILE_VAR_NAME",