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

devkit: put META-INF/plugin.xml for new plugin module under 'resources' directory and mark it as resources root

Browse Source 
(this will ensure that all files from this directory will be included to the plugin jar/zip, currently we automatically include config-file specified in 'depends' tags but won't include files references via xi:include for example)
This commit is contained in:
nik
2015-10-01 18:29:14 +03:00
parent 651d0ce54f
commit 165912c0ba
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/module/PluginModuleBuilder.java
+17 -4
View File
@@ -17,6 +17,7 @@ package org.jetbrains.idea.devkit.module;
import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.ide.projectView.actions.MarkRootActionBase;
import com.intellij.ide.util.projectWizard.JavaModuleBuilder;
import com.intellij.ide.util.projectWizard.ModuleWizardStep;
import com.intellij.ide.util.projectWizard.SettingsStep;
@@ -25,21 +26,21 @@ import com.intellij.openapi.module.*;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.build.PluginBuildConfiguration;
import org.jetbrains.idea.devkit.projectRoots.IdeaJdk;
import org.jetbrains.idea.devkit.run.PluginConfigurationType;
import org.jetbrains.jps.model.java.JavaResourceRootType;
public class PluginModuleBuilder extends JavaModuleBuilder{
@NonNls private static final String META_INF = "META-INF";
@NonNls private static final String PLUGIN_XML = "plugin.xml";
public ModuleType getModuleType() {
@@ -48,7 +49,19 @@ public class PluginModuleBuilder extends JavaModuleBuilder{
public void setupRootModel(final ModifiableRootModel rootModel) throws ConfigurationException {
super.setupRootModel(rootModel);
final String defaultPluginXMLLocation = getModuleFileDirectory() + '/' + META_INF + '/' + PLUGIN_XML;
String contentEntryPath = getContentEntryPath();
if (contentEntryPath == null) return;
String resourceRootPath = contentEntryPath + "/resources";
VirtualFile contentRoot = LocalFileSystem.getInstance().findFileByPath(contentEntryPath);
if (contentRoot == null) return;
ContentEntry contentEntry = MarkRootActionBase.findContentEntry(rootModel, contentRoot);
if (contentEntry != null) {
contentEntry.addSourceFolder(VfsUtilCore.pathToUrl(resourceRootPath), JavaResourceRootType.RESOURCE);
}
final String defaultPluginXMLLocation = resourceRootPath + "/META-INF/plugin.xml";
final Module module = rootModel.getModule();
final Project project = module.getProject();
StartupManager.getInstance(project).runWhenProjectIsInitialized(new Runnable() {