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

IDEA-71754: Exploded artifacts require output path even if "Build on make" is not checked

Browse Source
This commit is contained in:
nik
2011-07-11 13:05:12 +04:00
parent 4b05e48f84
commit ba84da5f1d
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactAdditionalCompileScopeProvider.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class ArtifactAdditionalCompileScopeProvider extends AdditionalCompileSco
}
return new ReadAction<CompileScope>() {
protected void run(final Result<CompileScope> result) {
final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(project, baseScope);
final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(project, baseScope, false);
result.setResult(ArtifactCompileScope.createScopeForModulesInArtifacts(project, artifacts));
}
}.execute().getResultObject();
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
+17 -8
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ArtifactManager;
import com.intellij.packaging.elements.PackagingElementResolvingContext;
@@ -62,12 +63,14 @@ public class ArtifactCompileScope {
return baseScope;
}
public static Set<Artifact> getArtifactsToBuild(final Project project, final CompileScope compileScope) {
public static Set<Artifact> getArtifactsToBuild(final Project project,
final CompileScope compileScope,
final boolean addIncludedArtifactsWithOutputPathsOnly) {
final Artifact[] artifactsFromScope = getArtifacts(compileScope);
final ArtifactManager artifactManager = ArtifactManager.getInstance(project);
PackagingElementResolvingContext context = artifactManager.getResolvingContext();
if (artifactsFromScope != null) {
return addIncludedArtifacts(Arrays.asList(artifactsFromScope), context);
return addIncludedArtifacts(Arrays.asList(artifactsFromScope), context, addIncludedArtifactsWithOutputPathsOnly);
}
final Set<Artifact> cached = compileScope.getUserData(CACHED_ARTIFACTS_KEY);
@@ -86,7 +89,7 @@ public class ArtifactCompileScope {
}
}
}
Set<Artifact> result = addIncludedArtifacts(artifacts, context);
Set<Artifact> result = addIncludedArtifacts(artifacts, context, addIncludedArtifactsWithOutputPathsOnly);
compileScope.putUserData(CACHED_ARTIFACTS_KEY, result);
return result;
}
@@ -107,25 +110,31 @@ public class ArtifactCompileScope {
}
@NotNull
private static Set<Artifact> addIncludedArtifacts(@NotNull Collection<Artifact> artifacts, @NotNull PackagingElementResolvingContext context) {
private static Set<Artifact> addIncludedArtifacts(@NotNull Collection<Artifact> artifacts,
@NotNull PackagingElementResolvingContext context,
final boolean withOutputPathOnly) {
Set<Artifact> result = new HashSet<Artifact>();
for (Artifact artifact : artifacts) {
collectIncludedArtifacts(artifact, context, result);
collectIncludedArtifacts(artifact, context, new HashSet<Artifact>(), result, withOutputPathOnly);
}
return result;
}
private static void collectIncludedArtifacts(Artifact artifact, final PackagingElementResolvingContext context, final Set<Artifact> result) {
if (!result.add(artifact)) {
private static void collectIncludedArtifacts(Artifact artifact, final PackagingElementResolvingContext context,
final Set<Artifact> processed, final Set<Artifact> result, final boolean withOutputPathOnly) {
if (!processed.add(artifact)) {
return;
}
if (!withOutputPathOnly || !StringUtil.isEmpty(artifact.getOutputPath())) {
result.add(artifact);
}
ArtifactUtil.processPackagingElements(artifact, ArtifactElementType.ARTIFACT_ELEMENT_TYPE, new Processor<ArtifactPackagingElement>() {
@Override
public boolean process(ArtifactPackagingElement element) {
Artifact included = element.findArtifact(context);
if (included != null) {
collectIncludedArtifacts(included, context, result);
collectIncludedArtifacts(included, context, processed, result, withOutputPathOnly);
}
return true;
}
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ArtifactsCompilerInstance extends GenericCompilerInstance<ArtifactB
protected void run(final Result result) {
final Set<Artifact> artifacts;
if (selectedOnly) {
artifacts = ArtifactCompileScope.getArtifactsToBuild(getProject(), myContext.getCompileScope());
artifacts = ArtifactCompileScope.getArtifactsToBuild(getProject(), myContext.getCompileScope(), true);
}
else {
artifacts = new HashSet<Artifact>(Arrays.asList(ArtifactManager.getInstance(getProject()).getArtifacts()));