MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed building of plugin modules

Browse Source
This commit is contained in:
nik
2011-04-11 11:25:06 +04:00
parent c8a38afa69
commit bc38350453
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java
+13 -13
View File
@@ -95,19 +95,6 @@ public class ArtifactsCompilerInstance extends GenericCompilerInstance<ArtifactB
else {
artifacts = new HashSet<Artifact>(Arrays.asList(ArtifactManager.getInstance(getProject()).getArtifacts()));
}
List<Artifact> additionalArtifacts = new ArrayList<Artifact>();
for (BuildParticipantProvider provider : BuildParticipantProvider.EXTENSION_POINT_NAME.getExtensions()) {
for (Module module : ModuleManager.getInstance(getProject()).getModules()) {
final Collection<? extends BuildParticipant> participants = provider.getParticipants(module);
for (BuildParticipant participant : participants) {
ContainerUtil.addIfNotNull(participant.createArtifact(myContext), additionalArtifacts);
}
}
}
if (LOG.isDebugEnabled() && !additionalArtifacts.isEmpty()) {
LOG.debug("additional artifacts to build: " + additionalArtifacts);
}
artifacts.addAll(additionalArtifacts);
Map<String, Artifact> artifactsMap = new HashMap<String, Artifact>();
for (Artifact artifact : artifacts) {
@@ -119,6 +106,19 @@ public class ArtifactsCompilerInstance extends GenericCompilerInstance<ArtifactB
targets.add(new ArtifactBuildTarget(artifact));
}
}
for (BuildParticipantProvider provider : BuildParticipantProvider.EXTENSION_POINT_NAME.getExtensions()) {
for (Module module : ModuleManager.getInstance(getProject()).getModules()) {
final Collection<? extends BuildParticipant> participants = provider.getParticipants(module);
for (BuildParticipant participant : participants) {
Artifact artifact = participant.createArtifact(myContext);
if (artifact != null) {
LOG.debug("additional artifact to build: " + artifact);
targets.add(new ArtifactBuildTarget(artifact));
}
}
}
}
}
}.execute();
return targets;