|
Lines 41-46
Link Here
|
| 41 |
import org.eclipse.pde.internal.core.PDECore; |
41 |
import org.eclipse.pde.internal.core.PDECore; |
| 42 |
import org.eclipse.pde.internal.core.PDECoreMessages; |
42 |
import org.eclipse.pde.internal.core.PDECoreMessages; |
| 43 |
import org.eclipse.pde.internal.core.PluginModelManager; |
43 |
import org.eclipse.pde.internal.core.PluginModelManager; |
|
|
44 |
import org.eclipse.pde.internal.core.WorkspaceModelManager; |
| 44 |
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel; |
45 |
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel; |
| 45 |
import org.eclipse.pde.internal.core.ibundle.IBundleFragmentModel; |
46 |
import org.eclipse.pde.internal.core.ibundle.IBundleFragmentModel; |
| 46 |
import org.eclipse.pde.internal.core.ibundle.IBundleModel; |
47 |
import org.eclipse.pde.internal.core.ibundle.IBundleModel; |
|
Lines 166-172
Link Here
|
| 166 |
|
167 |
|
| 167 |
validateSourceEntries(sourceEntries); |
168 |
validateSourceEntries(sourceEntries); |
| 168 |
validateMissingSourceInBinIncludes(binIncludes, sourceEntryKeys, build); |
169 |
validateMissingSourceInBinIncludes(binIncludes, sourceEntryKeys, build); |
| 169 |
|
170 |
validateBinIncludes(binIncludes); |
|
|
171 |
} |
| 172 |
|
| 173 |
private void validateBinIncludes(IBuildEntry binIncludes) { |
| 174 |
if(WorkspaceModelManager.hasBundleManifest(fProject)) { |
| 175 |
String[] tokens = binIncludes.getTokens(); |
| 176 |
boolean exists = false; |
| 177 |
String key = "META-INF/"; //$NON-NLS-1$ |
| 178 |
for(int i = 0; i < tokens.length; i++) { |
| 179 |
if(tokens[i].startsWith(key)) |
| 180 |
exists = true; |
| 181 |
} |
| 182 |
if(!exists) { |
| 183 |
prepareError(PROPERTY_BIN_INCLUDES, |
| 184 |
key, |
| 185 |
NLS.bind(PDECoreMessages.BuildErrorReporter_binIncludesMissing, key), |
| 186 |
PDEMarkerFactory.B_ADDDITION); |
| 187 |
} |
| 188 |
} |
| 170 |
} |
189 |
} |
| 171 |
|
190 |
|
| 172 |
private void validateJarsExtraClasspath(IBuildEntry javaExtra) { |
191 |
private void validateJarsExtraClasspath(IBuildEntry javaExtra) { |
|
Lines 550-553
Link Here
|
| 550 |
} catch (CoreException e) { |
569 |
} catch (CoreException e) { |
| 551 |
} |
570 |
} |
| 552 |
} |
571 |
} |
|
|
572 |
|
| 553 |
} |
573 |
} |
