Merge plugin.xml and plugin.xml_gen

diverse-project · Jul 20, 2015 · 991c6c3 · 991c6c3
1 parent 58a61b0
commit 991c6c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/plugins/fr.inria.diverse.melange.p2updatesite/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fr.inria.diverse.melange.p2updatesite/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,5 +1,6 @@
 //outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java/src-gen.directory=src/main/xtend-gen
 //outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
 eclipse.preferences.version=1
 is_project_specific=true
 outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true

diff --git a/plugins/fr.inria.diverse.melange.sdk/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fr.inria.diverse.melange.sdk/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,5 +1,6 @@
 //outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java/src-gen.directory=src/main/xtend-gen
 //outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
 eclipse.preferences.version=1
 is_project_specific=true
 outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true

diff --git a/plugins/fr.inria.diverse.melange.ui/plugin.xml b/plugins/fr.inria.diverse.melange.ui/plugin.xml
@@ -602,6 +602,12 @@
             extensions="melange">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="melange"
+            type="text">
+    </fileTypes>
+  </extension>
   <extension
         point="org.eclipse.ui.newWizards">
      <category