58 data.setExeSelectionPath(data.getLaunchableExes().get(0)); |
58 data.setExeSelectionPath(data.getLaunchableExes().get(0)); |
59 else if (data.getDefaultExecutable() != null) |
59 else if (data.getDefaultExecutable() != null) |
60 data.setExeSelectionPath(data.getDefaultExecutable()); |
60 data.setExeSelectionPath(data.getDefaultExecutable()); |
61 if (Path.EMPTY.equals(data.getExeSelectionPath())) |
61 if (Path.EMPTY.equals(data.getExeSelectionPath())) |
62 data.setExeSelection(EExeSelection.ATTACH_TO_PROCESS); |
62 data.setExeSelection(EExeSelection.ATTACH_TO_PROCESS); |
|
63 |
63 ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(data.getProject()); |
64 ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(data.getProject()); |
64 data.setInstallPackage((data.isSysTRKConnection() == Boolean.FALSE /* but NOT if unknown */ |
65 boolean hasSisInstall = false; |
65 || !data.isInternalLayout()) |
|
66 && !data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS)); |
|
67 if (cpi != null) { |
66 if (cpi != null) { |
68 ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); |
67 ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); |
69 for (ISISBuilderInfo info : config.getSISBuilderInfoList()) { |
68 for (ISISBuilderInfo info : config.getSISBuilderInfoList()) { |
70 IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath(); |
69 IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath(); |
71 data.setSisPath(sisPath.toOSString()); |
70 data.setSisPath(sisPath.toOSString()); |
|
71 if (info.isEnabled()) { |
|
72 hasSisInstall = true; |
|
73 break; |
|
74 } |
72 } |
75 } |
73 } |
76 } |
|
77 |
|
78 if (data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS)) { |
|
79 data.setInstallPackage(true); |
|
80 } else { |
|
81 Boolean detectedSysTrk = data.isSysTRKConnection(); // TRUE, FALSE, or null |
|
82 boolean isSysTrk = detectedSysTrk == Boolean.TRUE || (detectedSysTrk == null && data.isInternalLayout()); |
|
83 data.setInstallPackage(hasSisInstall || !isSysTrk); |
|
84 } |
|
85 |
74 } |
86 } |
75 |
87 |
76 @Override |
88 @Override |
77 protected AbstractLaunchSettingsDialog createChangeSettingsDialog( |
89 protected AbstractLaunchSettingsDialog createChangeSettingsDialog( |
78 Shell shell, LaunchWizardData dialogData) { |
90 Shell shell, LaunchWizardData dialogData) { |