From 22b17ff4ca4c06a61c870718f6d91d6ca9d38051 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 29 Oct 2009 11:41:08 +0300 Subject: [PATCH] obsolete code and tests removed, IDEADEV-41068 fixed --- .../DefaultExplodedAndJarBuildGenerator.java | 69 ------------------- .../CompoundBuildInstructionImpl.java | 69 ------------------- .../impl/packagingCompiler/JarInfo.java | 12 ---- .../impl/packagingCompiler/JarsBuilder.java | 12 +--- .../OldProcessingItemsBuilderContext.java | 9 +-- .../ProcessingItemsBuilder.java | 34 --------- .../IncrementalArtifactsCompiler.java | 48 ++----------- .../ant/CompoundBuildInstructionNaming.java | 37 ---------- .../ant/ExplodedAndJarTargetParameters.java | 23 ++----- .../make/BuildInstructionVisitor.java | 3 - .../make/CompoundBuildInstruction.java | 28 -------- .../build/ant/ChunkBuildPluginExtension.java | 2 +- 12 files changed, 20 insertions(+), 326 deletions(-) delete mode 100644 java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/CompoundBuildInstructionImpl.java delete mode 100644 java/compiler/openapi/src/com/intellij/compiler/ant/CompoundBuildInstructionNaming.java delete mode 100644 java/compiler/openapi/src/com/intellij/openapi/compiler/make/CompoundBuildInstruction.java diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java index aeb088abd1ad..ac490077f162 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java @@ -19,11 +19,9 @@ import com.intellij.compiler.ant.*; import com.intellij.compiler.ant.taskdefs.*; import com.intellij.compiler.make.ExplodedAndJarBuildGenerator; import com.intellij.compiler.make.MakeUtil; -import com.intellij.openapi.compiler.DummyCompileContext; import com.intellij.openapi.compiler.make.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.Ref; -import com.intellij.util.PathUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -77,23 +75,6 @@ public class DefaultExplodedAndJarBuildGenerator extends ExplodedAndJarBuildGene return true; } - public boolean visitCompoundBuildInstruction(CompoundBuildInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - final String outputRelativePath = "/" + instruction.getOutputRelativePath(); - final String outputPath = BuildProperties.propertyRef(parameters.getExplodedPathParameter()) + outputRelativePath; - - final Tag tag; - if (instruction.getBuildProperties().isExplodedEnabled()) { - tag = new Copy(outputPath); - tag.add(new FileSet(BuildProperties.propertyRef(parameters.getCompoundBuildInstructionNaming().getExplodedPathProperty(instruction)))); - } - else { - tag = new AntCall(parameters.getCompoundBuildInstructionNaming().getBuildExplodedTargetName(instruction)); - tag.add(new Param(parameters.getExplodedPathParameter(), outputPath)); - } - tags.add(tag); - return true; - } }); return tags.toArray(new Tag[tags.size()]); } @@ -155,45 +136,6 @@ public class DefaultExplodedAndJarBuildGenerator extends ExplodedAndJarBuildGene return true; } - public boolean visitCompoundBuildInstruction(CompoundBuildInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - // gather child module dependencies - final BuildRecipe childModuleRecipe = instruction.getChildInstructions(DummyCompileContext.getInstance()); - childModuleRecipe.visitInstructions(new BuildInstructionVisitor() { - public boolean visitFileCopyInstruction(FileCopyInstruction instruction) throws RuntimeException { - if (!instruction.isExternalDependencyInstruction()) return true; - final File file = instruction.getFile(); - final Module instructionModule = instruction.getModule(); - String sourceLocation = GenerationUtils.toRelativePath(file.getPath(), moduleBaseDir, instructionModule, - parameters.getGenerationOptions()); - final String relPath = PathUtil.getCanonicalPath("/tmp/"+instruction.getOutputRelativePath()).substring(1); - final ZipFileSet zipFileSet = new ZipFileSet(sourceLocation, relPath, false); - zipFileSetTags.add(zipFileSet); - return true; - } - - public boolean visitJarAndCopyBuildInstruction(JarAndCopyBuildInstruction instruction) throws RuntimeException { - if (!instruction.isExternalDependencyInstruction()) return true; - final String relPath = PathUtil.getCanonicalPath("/tmp/"+instruction.getOutputRelativePath()).substring(1); - tempDirUsed.set(true); - final ZipFileSet zipFileSet = new ZipFileSet(BuildProperties.propertyRef(tempDirProperty) + "/" + relPath, relPath, false); - zipFileSetTags.add(zipFileSet); - return true; - } - }, false); - - if (instruction.getBuildProperties().isJarEnabled()) { - final ZipFileSet zipFileSet = new ZipFileSet(BuildProperties.propertyRef(parameters.getCompoundBuildInstructionNaming().getJarPathProperty(instruction)), instruction.getOutputRelativePath(), false); - zipFileSetTags.add(zipFileSet); - } - else { - final String jarName = new File(instruction.getOutputRelativePath()).getName(); - final String destJarPath = BuildProperties.propertyRef(tempDirProperty)+"/"+jarName; - tempDirUsed.set(true); - zipFileSetTags.add(new ZipFileSet(destJarPath, instruction.getOutputRelativePath(), false)); - } - return true; - } }); return zipFileSetTags.toArray(new ZipFileSet[zipFileSetTags.size()]); } @@ -214,17 +156,6 @@ public class DefaultExplodedAndJarBuildGenerator extends ExplodedAndJarBuildGene return true; } - public boolean visitCompoundBuildInstruction(CompoundBuildInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - if (!instruction.getBuildProperties().isJarEnabled()) { - final String jarName = new File(instruction.getOutputRelativePath()).getName(); - final String destJarPath = BuildProperties.propertyRef(tempDirProperty)+"/"+jarName; - final AntCall makeJar = new AntCall(parameters.getCompoundBuildInstructionNaming().getBuildJarTargetName(instruction)); - prepareTags.add(makeJar); - makeJar.add(new Param(parameters.getJarPathParameter(), destJarPath)); - } - return true; - } }); return prepareTags.toArray(new Tag[prepareTags.size()]); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/CompoundBuildInstructionImpl.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/CompoundBuildInstructionImpl.java deleted file mode 100644 index 92c99d20ffca..000000000000 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/CompoundBuildInstructionImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.compiler.impl.packagingCompiler; - -import com.intellij.openapi.compiler.CompileContext; -import com.intellij.openapi.compiler.make.*; -import com.intellij.openapi.diagnostic.Logger; -import org.jetbrains.annotations.NonNls; - -import java.io.File; -import java.util.Collection; - -public class CompoundBuildInstructionImpl extends BuildInstructionBase implements CompoundBuildInstruction { - private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.packagingCompiler.CompoundBuildInstructionImpl"); - - private final BuildConfiguration myBuildConfiguration; - private final BuildParticipant myBuildParticipant; - @NonNls private static final String TMP_FILE_SUFFIX = ".tmp"; - - public CompoundBuildInstructionImpl(BuildParticipant buildParticipant, String outputRelativePath) { - super(outputRelativePath, buildParticipant.getModule()); - myBuildConfiguration = buildParticipant.getBuildConfiguration(); - myBuildParticipant = buildParticipant; - } - - public BuildParticipant getBuildParticipant() { - return myBuildParticipant; - } - - public boolean accept(BuildInstructionVisitor visitor) throws Exception { - return visitor.visitCompoundBuildInstruction(this); - } - - public BuildRecipe getChildInstructions(CompileContext context) { - return myBuildParticipant.getBuildInstructions(context); - } - - public BuildConfiguration getBuildProperties() { - return myBuildConfiguration; - } - - public String toString() { - return "Java EE build instruction: " + myBuildParticipant + " -> " + getOutputRelativePath(); - } - - public void collectFilesToDelete(final Collection filesToDelete) { - super.collectFilesToDelete(filesToDelete); - BuildRecipe childInstructions = getChildInstructions(null); - childInstructions.visitInstructions(new BuildInstructionVisitor() { - public boolean visitInstruction(BuildInstruction instruction) throws Exception { - ((BuildInstructionBase)instruction).collectFilesToDelete(filesToDelete); - return true; - } - }, false); - } -} diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java index 8ae8dd1dc6d8..1948cc05980a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java @@ -18,7 +18,6 @@ package com.intellij.compiler.impl.packagingCompiler; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -31,17 +30,11 @@ public class JarInfo { private List> myPackedFiles; private LinkedHashSet> myPackedJars; private List myDestinations; - private List myClasspath; public JarInfo() { - this(null); - } - - public JarInfo(List classpath) { myDestinations = new ArrayList(); myPackedFiles = new ArrayList>(); myPackedJars = new LinkedHashSet>(); - myClasspath = classpath; } public void addDestination(DestinationInfo info) { @@ -74,11 +67,6 @@ public class JarInfo { return list; } - @Nullable - public List getClasspath() { - return myClasspath; - } - public List getAllDestinations() { return myDestinations; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarsBuilder.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarsBuilder.java index 0ab3a56ca5e5..64b8518924de 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarsBuilder.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarsBuilder.java @@ -20,7 +20,6 @@ import com.intellij.openapi.compiler.CompileContext; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.deployment.DeploymentUtil; -import com.intellij.openapi.deployment.DeploymentUtilImpl; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtil; @@ -162,19 +161,14 @@ public class JarsBuilder { File jarFile = createTempFile(); myBuiltJars.put(jar, jarFile); - Manifest manifest = createManifest(jar); - DeploymentUtilImpl.setManifestAttributes(manifest.getMainAttributes(), jar.getClasspath()); + Manifest manifest = null; final JarOutputStream jarOutputStream = createJarOutputStream(jarFile, manifest); try { final THashSet writtenPaths = new THashSet(); - writtenPaths.add(JarFile.MANIFEST_NAME); for (Pair pair : jar.getPackedFiles()) { File file = VfsUtil.virtualToIoFile(pair.getSecond()); - String relativePath = pair.getFirst(); - if (!JarFile.MANIFEST_NAME.equalsIgnoreCase(relativePath)) { - addFileToJar(jarOutputStream, file, relativePath, writtenPaths); - } + addFileToJar(jarOutputStream, file, pair.getFirst(), writtenPaths); } for (Pair nestedJar : jar.getPackedJars()) { @@ -198,7 +192,7 @@ public class JarsBuilder { protected JarOutputStream createJarOutputStream(final File jarFile, final Manifest manifest) throws IOException { FileUtil.createParentDirs(jarFile); - return new JarOutputStream(new BufferedOutputStream(new FileOutputStream(jarFile)), manifest); + return new JarOutputStream(new BufferedOutputStream(new FileOutputStream(jarFile))); } protected File createTempFile() throws IOException { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/OldProcessingItemsBuilderContext.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/OldProcessingItemsBuilderContext.java index 488473cce1e8..0e0a16253988 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/OldProcessingItemsBuilderContext.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/OldProcessingItemsBuilderContext.java @@ -16,14 +16,12 @@ package com.intellij.compiler.impl.packagingCompiler; import com.intellij.openapi.compiler.CompileContext; -import com.intellij.openapi.compiler.make.BuildParticipant; import com.intellij.openapi.compiler.make.BuildConfiguration; +import com.intellij.openapi.compiler.make.BuildParticipant; import com.intellij.openapi.compiler.make.BuildRecipe; import com.intellij.openapi.module.Module; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.deployment.DeploymentUtilImpl; import com.intellij.openapi.util.MultiValuesMap; -import com.intellij.packaging.impl.compiler.ArtifactPackagingProcessingItem; +import com.intellij.openapi.vfs.VirtualFile; import java.util.*; @@ -72,8 +70,7 @@ public class OldProcessingItemsBuilderContext extends ProcessingItemsBuilderCont JarInfo jarInfo = getCachedJar(buildConfiguration); boolean addJarContent = jarInfo == null; if (jarInfo == null) { - List classpath = DeploymentUtilImpl.getExternalDependenciesClasspath(buildRecipe); - jarInfo = new JarInfo(classpath); + jarInfo = new JarInfo(); putCachedJar(buildConfiguration, jarInfo); } jarInfo.addDestination(destinationInfo); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/ProcessingItemsBuilder.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/ProcessingItemsBuilder.java index 038c111f0b68..845e5f6348f0 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/ProcessingItemsBuilder.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/ProcessingItemsBuilder.java @@ -274,40 +274,6 @@ public class ProcessingItemsBuilder extends BuildInstructionVisitor { } } - public boolean visitCompoundBuildInstruction(final CompoundBuildInstruction instruction) throws Exception { - String outputPath = DeploymentUtil.appendToPath(myOutputPaths.peek(), instruction.getOutputRelativePath()); - myOutputPaths.push(outputPath); - BuildRecipe childInstructions = instruction.getChildInstructions(myContext.getCompileContext()); - NestedJarInfo oldNestedJar = null; - if (myNestedJars != null) { - if (instruction.isExternalDependencyInstruction()) { - oldNestedJar = myNestedJars.pop(); - } - DestinationInfo destinationInfo; - if (!myNestedJars.isEmpty()) { - NestedJarInfo nestedJar = myNestedJars.peek(); - destinationInfo = new JarDestinationInfo(trimParentPrefix(instruction.getOutputRelativePath()), nestedJar.myJarInfo, nestedJar.myDestination); - } - else { - String jarPath = getCanonicalConcat(myBuildConfiguration.getJarPath(), instruction.getOutputRelativePath()); - destinationInfo = createExplodedDestination(jarPath); - } - myNestedJars.push(myContext.createNestedJarInfo(destinationInfo, instruction.getBuildProperties(), childInstructions)); - } - - buildItems(childInstructions); - - if (myNestedJars != null) { - myNestedJars.pop(); - if (oldNestedJar != null) { - myNestedJars.push(oldNestedJar); - } - } - myOutputPaths.pop(); - - return true; - } - public static class NestedJarInfo { private final JarInfo myJarInfo; private final DestinationInfo myDestination; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java index 978a951cc8de..6f4081e7a81e 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java @@ -15,17 +15,16 @@ */ package com.intellij.packaging.impl.compiler; -import com.intellij.compiler.impl.CompilerUtil; +import com.intellij.compiler.CompilerManagerImpl; import com.intellij.compiler.impl.CompilerCacheManager; +import com.intellij.compiler.impl.CompilerUtil; import com.intellij.compiler.impl.FileProcessingCompilerStateCache; import com.intellij.compiler.impl.packagingCompiler.*; -import com.intellij.compiler.CompilerManagerImpl; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.Result; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.*; import com.intellij.openapi.deployment.DeploymentUtil; -import com.intellij.openapi.deployment.DeploymentUtilImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; @@ -52,9 +51,11 @@ import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.*; +import java.io.DataInput; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; import java.util.*; -import java.util.jar.Manifest; /** * @author nik @@ -291,8 +292,6 @@ public class IncrementalArtifactsCompiler implements PackagingCompiler { } } - createManifestFiles(builderContext.getManifestFiles()); - JarsBuilder builder = new JarsBuilder(changedJars, fileFilter, context); final boolean processed = builder.buildJars(writtenPaths); if (!processed) { @@ -330,39 +329,6 @@ public class IncrementalArtifactsCompiler implements PackagingCompiler { return true; } - private static void createManifestFiles(final List manifestFileInfos) throws IOException { - for (ManifestFileInfo manifestFileInfo : manifestFileInfos) { - File outputFile = new File(FileUtil.toSystemDependentName(manifestFileInfo.getOutputPath())); - Manifest manifest; - if (outputFile.exists()) { - FileInputStream stream = new FileInputStream(outputFile); - try { - manifest = new Manifest(stream); - } - finally { - stream.close(); - } - } - else { - manifest = new Manifest(); - } - - DeploymentUtilImpl.setManifestAttributes(manifest.getMainAttributes(), manifestFileInfo.getClasspath()); - - FileUtil.createParentDirs(outputFile); - FileOutputStream out = null; - try { - out = new FileOutputStream(outputFile); - manifest.write(out); - } - finally { - if (out != null) { - out.close(); - } - } - } - } - private static void processDestinations(final List items) { for (ArtifactPackagingProcessingItem item : items) { item.setProcessed(); diff --git a/java/compiler/openapi/src/com/intellij/compiler/ant/CompoundBuildInstructionNaming.java b/java/compiler/openapi/src/com/intellij/compiler/ant/CompoundBuildInstructionNaming.java deleted file mode 100644 index dd21f72a40a0..000000000000 --- a/java/compiler/openapi/src/com/intellij/compiler/ant/CompoundBuildInstructionNaming.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intellij.compiler.ant; - -import org.jetbrains.annotations.NonNls; -import com.intellij.openapi.compiler.make.CompoundBuildInstruction; - -/** - * @author nik - */ -public abstract class CompoundBuildInstructionNaming { - @NonNls - public abstract String getBuildExplodedTargetName(CompoundBuildInstruction instruction); - - @NonNls - public abstract String getBuildJarTargetName(CompoundBuildInstruction instruction); - - @NonNls - public abstract String getExplodedPathProperty(CompoundBuildInstruction instruction); - - @NonNls - public abstract String getJarPathProperty(CompoundBuildInstruction instruction); -} diff --git a/java/compiler/openapi/src/com/intellij/compiler/ant/ExplodedAndJarTargetParameters.java b/java/compiler/openapi/src/com/intellij/compiler/ant/ExplodedAndJarTargetParameters.java index 69838af50ad0..2e40f4bd0b63 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/ant/ExplodedAndJarTargetParameters.java +++ b/java/compiler/openapi/src/com/intellij/compiler/ant/ExplodedAndJarTargetParameters.java @@ -17,7 +17,6 @@ package com.intellij.compiler.ant; import com.intellij.openapi.compiler.make.BuildConfiguration; -import com.intellij.openapi.compiler.make.CompoundBuildInstruction; import com.intellij.openapi.module.Module; /** @@ -34,19 +33,13 @@ public class ExplodedAndJarTargetParameters { private final String myExplodedPathProperty; private final String myJarPathProperty; private final BuildConfiguration myBuildConfiguration; - private final CompoundBuildInstructionNaming myCompoundBuildInstructionNaming; - public ExplodedAndJarTargetParameters(final ModuleChunk chunk, - final Module containingModule, - final GenerationOptions generationOptions, - final BuildConfiguration buildConfiguration, - final String explodedPathParameter, - final String jarPathParameter, - final String buildExplodedTargetName, - final String buildJarTargetName, - final String explodedPathProperty, - final String jarPathProperty, final CompoundBuildInstructionNaming compoundBuildInstructionNaming) { - myCompoundBuildInstructionNaming = compoundBuildInstructionNaming; + public ExplodedAndJarTargetParameters(final ModuleChunk chunk, final Module containingModule, final GenerationOptions generationOptions, + final BuildConfiguration buildConfiguration, final String explodedPathParameter, final String jarPathParameter, + final String buildExplodedTargetName, + final String buildJarTargetName, + final String explodedPathProperty, + final String jarPathProperty) { myBuildConfiguration = buildConfiguration; myChunk = chunk; myContainingModule = containingModule; @@ -95,10 +88,6 @@ public class ExplodedAndJarTargetParameters { return myJarPathProperty; } - public CompoundBuildInstructionNaming getCompoundBuildInstructionNaming() { - return myCompoundBuildInstructionNaming; - } - public BuildConfiguration getBuildConfiguration() { return myBuildConfiguration; } diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildInstructionVisitor.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildInstructionVisitor.java index ca86e52d1177..0a10fcf6445c 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildInstructionVisitor.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildInstructionVisitor.java @@ -26,7 +26,4 @@ public abstract class BuildInstructionVisitor { public boolean visitJarAndCopyBuildInstruction(JarAndCopyBuildInstruction instruction) throws Exception { return visitFileCopyInstruction(instruction); } - public boolean visitCompoundBuildInstruction(CompoundBuildInstruction instruction) throws Exception { - return visitInstruction(instruction); - } } \ No newline at end of file diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/CompoundBuildInstruction.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/CompoundBuildInstruction.java deleted file mode 100644 index 0d99a5864bfb..000000000000 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/CompoundBuildInstruction.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.compiler.make; - - -import com.intellij.openapi.compiler.CompileContext; - -public interface CompoundBuildInstruction extends BuildInstruction { - - BuildConfiguration getBuildProperties(); - - BuildRecipe getChildInstructions(CompileContext context); - - BuildParticipant getBuildParticipant(); -} \ No newline at end of file diff --git a/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java b/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java index 2e43d8d52d82..bd2fa3c05232 100644 --- a/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java +++ b/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java @@ -63,7 +63,7 @@ public class ChunkBuildPluginExtension extends ChunkBuildExtension { PluginBuildProperties.getBuildExplodedTargetName(configurationName), PluginBuildProperties.getBuildJarTargetName(configurationName), PluginBuildProperties.getExplodedPathProperty(configurationName), - PluginBuildProperties.getJarPathProperty(configurationName), null); + PluginBuildProperties.getJarPathProperty(configurationName)); final Set libs = new HashSet(); PluginBuildUtil.getLibraries(module, libs); @NonNls String jarPath = chunk.getBaseDir().getPath() + "/" + chunk.getName();