Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-02-28 04:01:16 +0000
committerAndrew Overholt2011-02-28 04:01:22 +0000
commit8743f059e9e8f9d0577f2bdea63732aefb975e5a (patch)
treeffbd5478e9f63cb4b33527bf054c7795fb572813
parent04bd219cd1ba621962f219d13d3e8794b87968f6 (diff)
parentd2fe45e3a84ed87a51d21ab984957479fe0c05b6 (diff)
downloadorg.eclipse.linuxtools-8743f059e9e8f9d0577f2bdea63732aefb975e5a.tar.gz
org.eclipse.linuxtools-8743f059e9e8f9d0577f2bdea63732aefb975e5a.tar.xz
org.eclipse.linuxtools-8743f059e9e8f9d0577f2bdea63732aefb975e5a.zip
Merge autotools 0.6.1
-rw-r--r--autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog6
-rw-r--r--autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml18
2 files changed, 24 insertions, 0 deletions
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
index a23fb97bfc..8f919900ef 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14 Jeff Johnston <jjohnstn@redhat.com>
+
+ Resolves: #325194
+ * plugin.xml: Add enable restrictions for Autotools General and Configure Settings
+ property pages.
+
2010-08-25 Jeff Johnston <jjohnstn@redhat.com>
Patch from Marc-Andre Laperle <malaperle@omnialabs.net>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
index 5e6c7c62d6..2ee79a933b 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
@@ -300,6 +300,18 @@
name="projectNature"
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
</filter>
+ <enabledWhen>
+ <or>
+ <instanceof value="org.eclipse.core.resources.IProject"/>
+ <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+
+ <instanceof value="org.eclipse.core.resources.IFolder"/>
+ <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+ <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+ <instanceof value="org.eclipse.core.resources.IFile"/>
+ </or>
+ </enabledWhen>
</page>
<page
category="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
@@ -310,6 +322,12 @@
name="projectNature"
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
</filter>
+ <enabledWhen>
+ <or>
+ <instanceof value="org.eclipse.core.resources.IProject"/>
+ <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+ </or>
+ </enabledWhen>
</page>
</extension>
<extension

Back to the top