diff --git a/plugins/devkit/src/build/PluginBuildUtil.java b/plugins/devkit/src/build/PluginBuildUtil.java index 9680c2cbfbea..0602009999e2 100644 --- a/plugins/devkit/src/build/PluginBuildUtil.java +++ b/plugins/devkit/src/build/PluginBuildUtil.java @@ -7,11 +7,14 @@ import com.intellij.openapi.roots.LibraryOrderEntry; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; +import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.util.ArrayUtil; import org.jetbrains.idea.devkit.projectRoots.IdeaJdk; import org.jetbrains.idea.devkit.projectRoots.Sandbox; import java.util.Set; +import java.util.ArrayList; /** * User: anna @@ -39,6 +42,17 @@ public class PluginBuildUtil { } } + public static Module [] getWrongSetDependencies(Module module){ + ArrayList result = new ArrayList(); + final Module[] projectModules = ModuleManager.getInstance(module.getProject()).getModules(); + for(int i = 0; i < projectModules.length; i++){ + if (ArrayUtil.find(ModuleRootManager.getInstance(projectModules[i]).getDependencies(), module) > -1){ + result.add(projectModules[i]); + } + } + return result.toArray(new Module[result.size()]); + } + public static void getLibraries(Module module, Set libs) { OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries(); for (int i = 0; i < orderEntries.length; i++) { diff --git a/plugins/devkit/src/build/PluginModuleBuildProperties.java b/plugins/devkit/src/build/PluginModuleBuildProperties.java index 8aa7e38f13d8..2cb069f46ef0 100644 --- a/plugins/devkit/src/build/PluginModuleBuildProperties.java +++ b/plugins/devkit/src/build/PluginModuleBuildProperties.java @@ -26,7 +26,7 @@ public class PluginModuleBuildProperties extends ModuleBuildProperties implement } public String getJarPath() { - return PluginBuildUtil.getPluginExPath(myModule) + "/lib/" + myModule.getName() + ".jar"; + return PluginBuildUtil.getPluginExPath(myModule) != null ? PluginBuildUtil.getPluginExPath(myModule) + "/lib/" + myModule.getName() + ".jar" : null; } public String getExplodedPath() {