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

generate 'ant' tasks instead of 'antcall' for post/pre processing tasks (IDEA-65622)

Browse Source
This commit is contained in:
nik
2011-02-18 13:20:31 +03:00
parent 90e0e831ee
commit 990a4def0d
3 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java
+3 -1
View File
@@ -47,8 +47,10 @@ public class ArtifactsGenerator {
private final PackagingElementResolvingContext myResolvingContext;
private final ArtifactAntGenerationContextImpl myContext;
private final List<Artifact> myAllArtifacts;
private final GenerationOptions myGenOptions;
public ArtifactsGenerator(Project project, GenerationOptions genOptions) {
myGenOptions = genOptions;
myResolvingContext = ArtifactManager.getInstance(project).getResolvingContext();
myAllArtifacts = new ArrayList<Artifact>(Arrays.asList(ArtifactManager.getInstance(project).getSortedArtifacts()));
@@ -174,7 +176,7 @@ public class ArtifactsGenerator {
private void generateTasksForArtifacts(Artifact artifact, Target artifactTarget, final boolean preprocessing) {
for (ChunkBuildExtension extension : ChunkBuildExtension.EP_NAME.getExtensions()) {
extension.generateTasksForArtifact(myResolvingContext.getProject(), artifact, preprocessing, artifactTarget);
extension.generateTasksForArtifact(artifact, preprocessing, myResolvingContext.getProject(), myGenOptions, artifactTarget);
}
}
java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java
+2 -1
View File
@@ -45,7 +45,8 @@ public abstract class ChunkBuildExtension {
public void generateProperties(final PropertyFileGenerator generator, final Project project, final GenerationOptions options) {
}
public void generateTasksForArtifact(Project project, Artifact artifact, boolean preprocessing, CompositeGenerator generator) {
public void generateTasksForArtifact(Artifact artifact, boolean preprocessing, Project project, GenerationOptions genOptions,
CompositeGenerator generator) {
}
public List<String> getCleanTargetNames(Project project, GenerationOptions genOptions) {
plugins/ant/src/com/intellij/lang/ant/config/impl/artifacts/AntArtifactBuildExtension.java
+13 -37
View File
@@ -16,54 +16,23 @@
package com.intellij.lang.ant.config.impl.artifacts;
import com.intellij.compiler.ant.*;
import com.intellij.compiler.ant.taskdefs.AntCall;
import com.intellij.compiler.ant.taskdefs.Import;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ArtifactManager;
import com.intellij.packaging.artifacts.ArtifactPropertiesProvider;
import com.intellij.util.ArrayUtil;
import com.intellij.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
/**
* @author nik
*/
public class AntArtifactBuildExtension extends ChunkBuildExtension {
@Override
public void generateProjectTargets(Project project, GenerationOptions genOptions, CompositeGenerator generator) {
final Artifact[] artifacts = ArtifactManager.getInstance(project).getSortedArtifacts();
Set<String> filesToImport = new LinkedHashSet<String>();
for (Artifact artifact : artifacts) {
for (Boolean value : Arrays.asList(true, false)) {
final AntArtifactProperties properties = getProperties(artifact, value);
if (properties != null) {
filesToImport.add(properties.getFileUrl());
}
}
}
for (String url : filesToImport) {
final String path = VfsUtil.urlToPath(url);
final String relativePath = GenerationUtils.toRelativePath(path, BuildProperties.getProjectBaseDir(project), BuildProperties.getProjectBaseDirProperty(), genOptions);
generator.add(new Import(relativePath));
}
}
@Override
public void generateTasksForArtifact(Project project, Artifact artifact, boolean preprocessing, CompositeGenerator generator) {
final AntArtifactProperties properties = getProperties(artifact, preprocessing);
if (properties != null) {
generator.add(new AntCall(properties.getTargetName()));
}
}
@Nullable
private static AntArtifactProperties getProperties(Artifact artifact, boolean preprocessing) {
public void generateTasksForArtifact(Artifact artifact,
boolean preprocessing, Project project,
GenerationOptions genOptions, CompositeGenerator generator) {
final ArtifactPropertiesProvider provider;
if (preprocessing) {
provider = AntArtifactPreProcessingPropertiesProvider.getInstance();
@@ -72,7 +41,14 @@ public class AntArtifactBuildExtension extends ChunkBuildExtension {
provider = AntArtifactPostprocessingPropertiesProvider.getInstance();
}
final AntArtifactProperties properties = (AntArtifactProperties)artifact.getProperties(provider);
return properties != null && properties.isEnabled() ? properties : null;
if (properties != null && properties.isEnabled()) {
final String path = VfsUtil.urlToPath(properties.getFileUrl());
String fileName = PathUtil.getFileName(path);
String dirPath = PathUtil.getParentPath(path);
final String relativePath = GenerationUtils.toRelativePath(dirPath, BuildProperties.getProjectBaseDir(project), BuildProperties.getProjectBaseDirProperty(), genOptions);
generator.add(new Tag("ant", Pair.create("antfile", fileName), Pair.create("target", properties.getTargetName()),
Pair.create("dir", relativePath)));
}
}
@NotNull