|
Lines 37-42
Link Here
|
| 37 |
private static final String PROP_P2_DATA_AREA = "eclipse.p2.data.area"; //$NON-NLS-1$ |
37 |
private static final String PROP_P2_DATA_AREA = "eclipse.p2.data.area"; //$NON-NLS-1$ |
| 38 |
private static final String DEFAULT_PROFILE_NAME = "SelfHostingProfile"; //$NON-NLS-1$ |
38 |
private static final String DEFAULT_PROFILE_NAME = "SelfHostingProfile"; //$NON-NLS-1$ |
| 39 |
|
39 |
|
|
|
40 |
private static String PRODUCT_PROPERTY = "eclipse.product"; //$NON-NLS-1$ |
| 41 |
private static String APPLICATION_PROPERTY = "eclipse.application"; //$NON-NLS-1$ |
| 42 |
|
| 40 |
/** |
43 |
/** |
| 41 |
* The p2 data area will be set to a directory with this name inside the configuration folder |
44 |
* The p2 data area will be set to a directory with this name inside the configuration folder |
| 42 |
*/ |
45 |
*/ |
|
Lines 91-103
Link Here
|
| 91 |
Properties properties = null; |
94 |
Properties properties = null; |
| 92 |
// if we are to generate a config.ini, start with the values in the target platform's config.ini - bug 141918 |
95 |
// if we are to generate a config.ini, start with the values in the target platform's config.ini - bug 141918 |
| 93 |
if (configuration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true)) { |
96 |
if (configuration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true)) { |
|
|
97 |
String appID = configuration.getAttribute(IPDELauncherConstants.APPLICATION, TargetPlatform.getDefaultApplication()); |
| 94 |
properties = TargetPlatformHelper.getConfigIniProperties(); |
98 |
properties = TargetPlatformHelper.getConfigIniProperties(); |
| 95 |
// if target's config.ini does not exist, lets try to fill in default values |
99 |
// if target's config.ini does not exist, lets try to fill in default values |
| 96 |
if (properties == null) |
100 |
if (properties == null) |
| 97 |
properties = new Properties(); |
101 |
properties = new Properties(); |
| 98 |
// keep properties only if we are launching the default product (bug 175437) |
102 |
// clear properties only if we are NOT launching the default product or app (bug 175437, bug 315039) |
| 99 |
else if (productID == null || !productID.equals(properties.get("eclipse.product"))) //$NON-NLS-1$ |
103 |
else if ((productID != null && !productID.equals(properties.get(PRODUCT_PROPERTY)) || (appID != null && !appID.equals(properties.get(APPLICATION_PROPERTY))))) { |
| 100 |
properties.clear(); |
104 |
properties.clear(); |
|
|
105 |
} |
| 101 |
// if target's config.ini has the osgi.bundles header, then parse and compute the proper osgi.bundles value |
106 |
// if target's config.ini has the osgi.bundles header, then parse and compute the proper osgi.bundles value |
| 102 |
String bundleList = properties.getProperty(PROP_OSGI_BUNDLES); |
107 |
String bundleList = properties.getProperty(PROP_OSGI_BUNDLES); |
| 103 |
if (bundleList != null) |
108 |
if (bundleList != null) |
|
Lines 210-216
Link Here
|
| 210 |
*/ |
215 |
*/ |
| 211 |
private static String computeOSGiBundles(String bundleList, Map bundles, Map bundlesWithStartLevels) { |
216 |
private static String computeOSGiBundles(String bundleList, Map bundles, Map bundlesWithStartLevels) { |
| 212 |
|
217 |
|
| 213 |
// if p2 and only simple configurator and |
218 |
// if p2 and only simple configurator and |
| 214 |
// if simple configurator isn't selected & isn't in bundle list... hack it |
219 |
// if simple configurator isn't selected & isn't in bundle list... hack it |
| 215 |
|
220 |
|
| 216 |
// if using p2's simple configurator, a bundles.txt will be written, so we only need simple configurator in the config.ini |
221 |
// if using p2's simple configurator, a bundles.txt will be written, so we only need simple configurator in the config.ini |
