|
16 | 16 | import org.eclipse.core.runtime.IPath;
|
17 | 17 | import org.eclipse.core.runtime.IStatus;
|
18 | 18 | import org.eclipse.core.runtime.Path;
|
19 |
| -import org.eclipse.core.runtime.Platform; |
20 | 19 | import org.eclipse.core.runtime.Status;
|
21 | 20 | import org.eclipse.core.runtime.preferences.IEclipsePreferences;
|
22 | 21 | import org.eclipse.core.runtime.preferences.InstanceScope;
|
@@ -94,16 +93,6 @@ public class BoardDescription extends Common {
|
94 | 93 | private String myBoardID;
|
95 | 94 | private Map<String, String> myOptions;
|
96 | 95 |
|
97 |
| - /* |
98 |
| - * the following data is stored to detect changes that will make the equal fail |
99 |
| - * so os changes, workspace changes, eclipse install changes will force a update |
100 |
| - * on the stored data |
101 |
| - */ |
102 |
| - private String myProjectName = EMPTY; |
103 |
| - private String myOSName = Platform.getOS(); |
104 |
| - private IPath myWorkSpaceLocation = Common.getWorkspaceRoot(); |
105 |
| - private IPath myWorkEclipseLocation = ConfigurationPreferences.getEclipseHome(); |
106 |
| - |
107 | 96 | /*
|
108 | 97 | * Stuff to make things work
|
109 | 98 | */
|
@@ -162,18 +151,6 @@ public boolean needsRebuild(BoardDescription otherBoardDescriptor) {
|
162 | 151 | if (!this.getOptions().equals(otherBoardDescriptor.getOptions())) {
|
163 | 152 | return true;
|
164 | 153 | }
|
165 |
| - if (!this.getProjectName().equals(otherBoardDescriptor.getProjectName())) { |
166 |
| - return true; |
167 |
| - } |
168 |
| - if (!this.myOSName.equals(otherBoardDescriptor.myOSName)) { |
169 |
| - return true; |
170 |
| - } |
171 |
| - if (!this.myWorkEclipseLocation.equals(otherBoardDescriptor.myWorkEclipseLocation)) { |
172 |
| - return true; |
173 |
| - } |
174 |
| - if (!this.myWorkSpaceLocation.equals(otherBoardDescriptor.myWorkSpaceLocation)) { |
175 |
| - return true; |
176 |
| - } |
177 | 154 | return false;
|
178 | 155 | }
|
179 | 156 |
|
@@ -353,13 +330,7 @@ public BoardDescription(ICConfigurationDescription confdesc) {
|
353 | 330 | myreferencingBoardsFile = new File(
|
354 | 331 | getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_BOARDS_FILE, EMPTY));
|
355 | 332 | myBoardID = getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_BOARD_ID, EMPTY);
|
356 |
| - myProjectName = getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_PROJECT_NAME, EMPTY); |
357 | 333 | myTxtFile = new BoardTxtFile(this.myreferencingBoardsFile);
|
358 |
| - myOSName = getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_OS, EMPTY); |
359 |
| - myWorkSpaceLocation = new Path( |
360 |
| - getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_WORKSPACE_LOCATION, EMPTY)); |
361 |
| - myWorkEclipseLocation = new Path( |
362 |
| - getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_ECLIPSE_LOCATION, EMPTY)); |
363 | 334 | String optinconcat = getBuildEnvironmentVariable(confdesc, ENV_KEY_JANTJE_MENU_SELECTION, EMPTY);
|
364 | 335 | myOptions = KeyValue.makeMap(optinconcat);
|
365 | 336 | }
|
@@ -427,7 +398,6 @@ protected BoardDescription(BoardDescription sourceBoardDescriptor) {
|
427 | 398 | this.myProgrammer = sourceBoardDescriptor.getProgrammer();
|
428 | 399 | this.myBoardID = sourceBoardDescriptor.getBoardID();
|
429 | 400 | this.myOptions = sourceBoardDescriptor.getOptions();
|
430 |
| - this.myProjectName = sourceBoardDescriptor.getProjectName(); |
431 | 401 | this.myreferencingBoardsFile = sourceBoardDescriptor.getReferencingBoardsFile();
|
432 | 402 | this.myTxtFile = sourceBoardDescriptor.myTxtFile;
|
433 | 403 | this.myBoardsVariant = sourceBoardDescriptor.getBoardVariant();
|
@@ -642,11 +612,6 @@ public static String getUploadPort(IProject project) {
|
642 | 612 | }
|
643 | 613 |
|
644 | 614 |
|
645 |
| - |
646 |
| - public String getProjectName() { |
647 |
| - return this.myProjectName; |
648 |
| - } |
649 |
| - |
650 | 615 | /**
|
651 | 616 | * provide the actual path to the variant. Use this method if you want to know
|
652 | 617 | * where the variant is
|
@@ -900,10 +865,6 @@ public Map<String, String> getEnvVars() {
|
900 | 865 | allVars.put(ENV_KEY_JANTJE_ARCITECTURE_ID, getArchitecture());
|
901 | 866 | allVars.put(ENV_KEY_JANTJE_PACKAGE_ID, getPackage());
|
902 | 867 | allVars.put(ENV_KEY_JANTJE_UPLOAD_PORT, this.myUploadPort);
|
903 |
| - allVars.put(ENV_KEY_JANTJE_PROJECT_NAME, myProjectName); |
904 |
| - allVars.put(ENV_KEY_JANTJE_OS, this.myOSName); |
905 |
| - allVars.put(ENV_KEY_JANTJE_WORKSPACE_LOCATION, this.myWorkSpaceLocation.toOSString()); |
906 |
| - allVars.put(ENV_KEY_JANTJE_ECLIPSE_LOCATION, this.myWorkEclipseLocation.toOSString()); |
907 | 868 | allVars.put(JANTJE_ACTION_UPLOAD, this.myProgrammer);
|
908 | 869 |
|
909 | 870 | allVars.put(ENV_KEY_SERIAL_PORT, getActualUploadPort());
|
@@ -1081,16 +1042,6 @@ private Map<String, String> getEnvVarsPostProcessing(Map<String, String> vars) {
|
1081 | 1042 | }
|
1082 | 1043 | }
|
1083 | 1044 |
|
1084 |
| - // report that the upload comport is not set if default upload is used |
1085 |
| - String programmer = getProgrammer(); |
1086 |
| - if (programmer.equalsIgnoreCase(Defaults.getDefaultUploadProtocol())) { |
1087 |
| - String MComPort = getUploadPort(); |
1088 |
| - if (MComPort.isEmpty()) { |
1089 |
| - Common.log(new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID, |
1090 |
| - "Upload will fail due to missing upload port for project: " + myProjectName)); //$NON-NLS-1$ |
1091 |
| - } |
1092 |
| - } |
1093 |
| - |
1094 | 1045 | ArrayList<String> objcopyCommand = new ArrayList<>();
|
1095 | 1046 | for (Entry<String, String> curVariable : vars.entrySet()) {
|
1096 | 1047 | String name = curVariable.getKey();
|
|
0 commit comments