Skip to content

Commit 04d93b0

Browse files
author
jantje
committed
Merge branch 'Show_Size_info_Like_Arduino_#661'
2 parents 492dd20 + 9945af5 commit 04d93b0

16 files changed

+4527
-4104
lines changed

‎io.sloeber.core/config/pre_processing_platform_default.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
#this file contains default/fallback/resque values
1+
#this file contains default/fallback/rescue values
22
software=ARDUINO
33
recipe.objcopy.hex.pattern=${recipe.objcopy.bin.pattern}
44
archive_file=arduino.ar
55
archive_file_path=${build.path}/${archive_file}
6-
sloeber.alt_size_command="${compiler.path}${compiler.size.cmd}" --format=avr --mcu=${build.mcu} "${build.path}/${build.project_name}.elf"
76
runtime.ide.version=10812
87
build.system.path=${referenced.core.path}${DirectoryDelimiter}system
98
serial.port=${com_port}
109
build.project_name=${ProjName}
10+
11+
#size stuff
12+
sloeber.size_command.avr="${compiler.path}${compiler.size.cmd}" --format=avr --mcu=${build.mcu} "${build.path}/${build.project_name}.elf"
13+
sloeber.size_command.awk=${recipe.size.pattern} | "${sloeber.awk.path}awk" -f size.awk
14+
15+
1116
#make sure we have default compiling warning commands
1217
compiler.warning_flags.none=-w
1318
compiler.warning_flags.more=-Wall
1419
compiler.warning_flags.all=-Wall -Wextra
15-
20+
compiler.warning_flags=-w
1621

1722

1823
#quick fix for issue #810
@@ -32,12 +37,7 @@ tools.avrdude_remote.upload.verbose=-v
3237
#for due
3338
serial.port.file=${serial.port}
3439

35-
#to turn warnings on/off
36-
compiler.warning_flags=-w
37-
compiler.warning_flags.all=-Wall -Wextra
38-
3940
#for stm
40-
4141
upload.altID=no_altID
4242
upload.usbID=no_altID
4343

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

+14-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import io.sloeber.core.listeners.IndexerListener;
5151
import io.sloeber.core.listeners.resourceChangeListener;
5252

53-
5453
/**
5554
* generated code
5655
*
@@ -398,8 +397,14 @@ private static void installOtherStuff() {
398397
String SH_EXE = "sh.exe";
399398
String MAKE_ZIP = "make1.zip";
400399
String MAKE_URL = "https://github.com/Sloeber/arduino-eclipse-plugin/files/2695478/make.zip";
401-
// On Windows install make
400+
401+
String AWK_EXE = "awk.exe";
402+
String AWK_ZIP = "awk_GNU_64_bit_V4_2_1.zip";
403+
String AWK_URL = "https://github.com/Sloeber/arduino-eclipse-plugin/files/7102568/awk_GNU_64_bit_V4_2_1.zip";
404+
405+
// On Windows install make and awk
402406
if (SystemUtils.IS_OS_WINDOWS) {
407+
// Install make if needed
403408
IPath localMakePath = ConfigurationPreferences.getMakePath();
404409
if (localMakePath.append(MAKE_EXE).toFile().exists()) {
405410
if (!localMakePath.append(SH_EXE).toFile().exists()) {
@@ -415,6 +420,13 @@ private static void installOtherStuff() {
415420
IProgressMonitor monitor = new NullProgressMonitor();
416421
Common.log(downloadAndInstall(MAKE_URL, MAKE_ZIP, localMakePath, false, monitor));
417422
}
423+
424+
// Install awk if needed
425+
IPath localAwkPath = ConfigurationPreferences.getAwkPath();
426+
if (!localAwkPath.append(AWK_EXE).toFile().exists()) {
427+
IProgressMonitor monitor = new NullProgressMonitor();
428+
Common.log(downloadAndInstall(AWK_URL, AWK_ZIP, localAwkPath, false, monitor));
429+
}
418430
}
419431
}
420432

‎io.sloeber.core/src/io/sloeber/core/Messages.java

+92-91
Original file line numberDiff line numberDiff line change
@@ -3,113 +3,114 @@
33
import org.eclipse.osgi.util.NLS;
44

55
public class Messages extends NLS {
6-
private static final String BUNDLE_NAME = "io.sloeber.core.messages"; //$NON-NLS-1$
6+
private static final String BUNDLE_NAME = "io.sloeber.core.messages"; //$NON-NLS-1$
77
public static final String PORT_TAG = "{PORT}"; //$NON-NLS-1$
88
public static final String MENUITEMID_TAG = "{MENUITEMID}"; //$NON-NLS-1$
99
public static final String MENUID_TAG = "{MENUID}"; //$NON-NLS-1$
10-
public static final String BOARDID_TAG = "{BOARDID}"; //$NON-NLS-1$
11-
public static final String MENUITEMNAME_TAG = "{MENUITEMNAME}"; //$NON-NLS-1$
12-
public static final String LIB_TAG = "{LIB}"; //$NON-NLS-1$
13-
public static final String PROJECT_TAG = "{PROJECT}"; //$NON-NLS-1$
14-
public static final String UPLOADER_TAG = "{UPLOADER}"; //$NON-NLS-1$
15-
public static final String MS_TAG = "{MS}"; //$NON-NLS-1$
10+
public static final String BOARDID_TAG = "{BOARDID}"; //$NON-NLS-1$
11+
public static final String MENUITEMNAME_TAG = "{MENUITEMNAME}"; //$NON-NLS-1$
12+
public static final String LIB_TAG = "{LIB}"; //$NON-NLS-1$
13+
public static final String PROJECT_TAG = "{PROJECT}"; //$NON-NLS-1$
14+
public static final String UPLOADER_TAG = "{UPLOADER}"; //$NON-NLS-1$
15+
public static final String MS_TAG = "{MS}"; //$NON-NLS-1$
1616
public static final String NAME_TAG = "{NAME}"; //$NON-NLS-1$
1717
public static final String ID_TAG = "{ID}"; //$NON-NLS-1$
1818
public static final String COMMAND_TAG = "{COMMAND}"; //$NON-NLS-1$
19-
public static final String TOOL_TAG = "{TOOL}"; //$NON-NLS-1$
19+
public static final String TOOL_TAG = "{TOOL}"; //$NON-NLS-1$
2020
public static final String FILE_TAG = "{FILE}"; //$NON-NLS-1$
2121
public static final String BOARD_TAG = "{BOARD}"; //$NON-NLS-1$
2222
public static final String CONFIG_TAG = "{CONFIG}"; //$NON-NLS-1$
2323
public static final String KEY_TAG = "{KEY}"; //$NON-NLS-1$
2424
public static final String FOLDER_TAG = "{FOLDER}"; //$NON-NLS-1$
2525
public static final String VERSION_TAG = "{VERSION}"; //$NON-NLS-1$
2626
public static final String HOST_TAG = "{HOST}"; //$NON-NLS-1$
27-
28-
29-
public static String ArduinoSerial_Comport_Appeared_and_disappeared;
30-
public static String ArduinoSerial_Comport_is_not_behaving_as_expected;
31-
public static String ArduinoSerial_comport_not_found;
32-
public static String ArduinoSerial_Comport_reset_took;
33-
public static String ArduinoSerial_Continuing_to_use;
34-
public static String ArduinoSerial_Ending_reset;
35-
public static String ArduinoSerial_exception_while_opening_seral_port;
36-
public static String ArduinoSerial_port_reappeared;
37-
public static String ArduinoSerial_port_still_missing;
38-
public static String ArduinoSerial_reset_dtr_toggle;
39-
public static String ArduinoSerial_reset_failed;
40-
public static String ArduinoSerial_unable_to_open_serial_port;
41-
public static String ArduinoSerial_Using_1200bps_touch;
42-
public static String ArduinoSerial_Using_comport;
43-
public static String Boards_Failed_to_read_boards;
44-
public static String Boards_Get_menu_item_name_from_id_did_not_find;
45-
public static String Boards_menu_ID_not_found;
46-
public static String Boards_menu_name_not_found;
47-
public static String command_aborted;
48-
public static String command_finished;
49-
public static String command_interupted;
50-
public static String command_io;
51-
public static String command_launching;
52-
public static String command_output;
53-
public static String EmptyLibFolder;
54-
public static String Failed_To_Add_Libraries;
55-
public static String failed_to_remove_lib;
56-
public static String Boards_Get_menu_item_id_from_name_failed;
57-
public static String Helpers_Create_folder_failed;
58-
public static String Helpers_delete_folder_failed;
59-
public static String Helpers_error_boards_TXT;
60-
public static String Helpers_Error_File_does_not_exists;
61-
public static String Helpers_error_link_folder_is_empty;
62-
public static String Helpers_Error_parsing_IO_exception;
63-
public static String Helpers_Error_The_folder_is_empty;
64-
public static String Helpers_No_boards_txt_found;
65-
public static String Helpers_tool_reference_missing;
66-
public static String import_lib_failed;
67-
public static String Manager_archive_error_root_folder_name_mismatch;
68-
public static String Manager_archive_error_symbolic_link_to_absolute_path;
69-
public static String Manager_archiver_eror_single_root_folder_required;
70-
public static String Manager_Cant_create_folder;
71-
public static String Manager_Cant_create_folder_exists;
72-
public static String Manager_Cant_extract_file_exist;
73-
public static String Manager_Failed_to_download;
74-
public static String Manager_Failed_to_extract;
75-
public static String Manager_Failed_to_parse;
76-
public static String Manager_Format_not_supported;
77-
public static String MultipleVersionsOfLib;
78-
public static String Platform_loading_boards;
79-
public static String Platform_loading_platform;
80-
public static String security_login;
81-
public static String security_password;
82-
public static String Tool_no_valid_system;
83-
public static String ToolDependency_Tool_not_found;
84-
public static String Upload_console_name;
85-
public static String Upload_error_auth_fail;
86-
public static String Upload_Error_com_port;
87-
public static String Upload_error_connection_refused;
88-
public static String Upload_error_network;
89-
public static String Upload_Error_serial_monitor_restart;
90-
public static String Upload_failed;
91-
public static String Upload_failed_upload_file;
92-
public static String Upload_login_credentials_missing;
93-
public static String Upload_no_arduino_sketch;
94-
public static String Upload_Project_nature_unaccesible;
95-
public static String Upload_sending_sketch;
96-
public static String Upload_sketch_on_yun;
97-
public static String Upload_starting;
98-
public static String Upload_uploading;
99-
public static String uploader_Failed_to_get_upload_recipe;
100-
public static String uploader_no_reset_using_network;
101-
public static String uploader_no_reset_using_programmer;
102-
public static String BoardsManagerIsBussy;
103-
public static String No_Platform_available ;
27+
28+
public static String ArduinoSerial_Comport_Appeared_and_disappeared;
29+
public static String ArduinoSerial_Comport_is_not_behaving_as_expected;
30+
public static String ArduinoSerial_comport_not_found;
31+
public static String ArduinoSerial_Comport_reset_took;
32+
public static String ArduinoSerial_Continuing_to_use;
33+
public static String ArduinoSerial_Ending_reset;
34+
public static String ArduinoSerial_exception_while_opening_seral_port;
35+
public static String ArduinoSerial_port_reappeared;
36+
public static String ArduinoSerial_port_still_missing;
37+
public static String ArduinoSerial_reset_dtr_toggle;
38+
public static String ArduinoSerial_reset_failed;
39+
public static String ArduinoSerial_unable_to_open_serial_port;
40+
public static String ArduinoSerial_Using_1200bps_touch;
41+
public static String ArduinoSerial_Using_comport;
42+
public static String Boards_Failed_to_read_boards;
43+
public static String Boards_Get_menu_item_name_from_id_did_not_find;
44+
public static String Boards_menu_ID_not_found;
45+
public static String Boards_menu_name_not_found;
46+
public static String command_aborted;
47+
public static String command_finished;
48+
public static String command_interupted;
49+
public static String command_io;
50+
public static String command_launching;
51+
public static String command_output;
52+
public static String EmptyLibFolder;
53+
public static String Failed_To_Add_Libraries;
54+
public static String failed_to_remove_lib;
55+
public static String Boards_Get_menu_item_id_from_name_failed;
56+
public static String Helpers_Create_folder_failed;
57+
public static String Helpers_delete_folder_failed;
58+
public static String Helpers_error_boards_TXT;
59+
public static String Helpers_Error_File_does_not_exists;
60+
public static String Helpers_error_link_folder_is_empty;
61+
public static String Helpers_Error_parsing_IO_exception;
62+
public static String Helpers_Error_The_folder_is_empty;
63+
public static String Helpers_No_boards_txt_found;
64+
public static String Helpers_tool_reference_missing;
65+
public static String import_lib_failed;
66+
public static String Manager_archive_error_root_folder_name_mismatch;
67+
public static String Manager_archive_error_symbolic_link_to_absolute_path;
68+
public static String Manager_archiver_eror_single_root_folder_required;
69+
public static String Manager_Cant_create_folder;
70+
public static String Manager_Cant_create_folder_exists;
71+
public static String Manager_Cant_extract_file_exist;
72+
public static String Manager_Failed_to_download;
73+
public static String Manager_Failed_to_extract;
74+
public static String Manager_Failed_to_parse;
75+
public static String Manager_Format_not_supported;
76+
public static String MultipleVersionsOfLib;
77+
public static String Platform_loading_boards;
78+
public static String Platform_loading_platform;
79+
public static String security_login;
80+
public static String security_password;
81+
public static String Tool_no_valid_system;
82+
public static String ToolDependency_Tool_not_found;
83+
public static String Upload_console_name;
84+
public static String Upload_error_auth_fail;
85+
public static String Upload_Error_com_port;
86+
public static String Upload_error_connection_refused;
87+
public static String Upload_error_network;
88+
public static String Upload_Error_serial_monitor_restart;
89+
public static String Upload_failed;
90+
public static String Upload_failed_upload_file;
91+
public static String Upload_login_credentials_missing;
92+
public static String Upload_no_arduino_sketch;
93+
public static String Upload_Project_nature_unaccesible;
94+
public static String Upload_sending_sketch;
95+
public static String Upload_sketch_on_yun;
96+
public static String Upload_starting;
97+
public static String Upload_uploading;
98+
public static String uploader_Failed_to_get_upload_recipe;
99+
public static String uploader_no_reset_using_network;
100+
public static String uploader_no_reset_using_programmer;
101+
public static String BoardsManagerIsBussy;
102+
public static String No_Platform_available;
104103
public static String decorator_no_platform;
105104
public static String decorator_no_port;
106105
public static String projectNotFoundInGUI;
106+
public static String sizeReportSketch;
107+
public static String sizeReportData;
107108

108-
static {
109-
// initialize resource bundle
110-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
111-
}
109+
static {
110+
// initialize resource bundle
111+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
112+
}
112113

113-
private Messages() {
114-
}
114+
private Messages() {
115+
}
115116
}

0 commit comments

Comments
 (0)