mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 06:02:11 +02:00
Bug 433014 - Autotools UI plugin is using deprecated extensions
Replace usage of popupMenus with command/handler/menu framework. Change-Id: I89b4bc611572fafbf63e27b68573f105da4d2698 Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com> Reviewed-on: https://git.eclipse.org/r/26134 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
Andrew Ferrazzutti
Jeff Johnston
parent
80ea8de8d4
commit
fdfa6fe4b8
1 changed files with 111 additions and 423 deletions
|
|
@ -18,123 +18,6 @@
|
|||
<selection class="org.eclipse.core.resources.IProject"/>
|
||||
</wizard>
|
||||
</extension>
|
||||
<!--
|
||||
<extension
|
||||
point="org.eclipse.ui.navigator.navigatorContent">
|
||||
<commonWizard
|
||||
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
|
||||
menuGroupId="org.eclipse.cdt.ui.newProject"
|
||||
type="new"
|
||||
wizardId="org.eclipse.linuxtools.cdt.autotools.ui.wizards.conversionWizard">
|
||||
<enablement>
|
||||
<and>
|
||||
<adapt type="org.eclipse.core.resources.IProject" />
|
||||
<not>
|
||||
<adapt type="org.eclipse.core.resources.IProject" >
|
||||
<test
|
||||
property="org.eclipse.core.resources.projectNature"
|
||||
value="org.eclipse.cdt.autotools.core.autotoolsNatureV2"/>
|
||||
</adapt>
|
||||
</not>
|
||||
</and>
|
||||
</enablement>
|
||||
</commonWizard>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.ui.navigator.viewer">
|
||||
<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
|
||||
<includes>
|
||||
<contentExtension pattern="org.eclipse.linuxtools.cdt.autotools.ui.wizards.*"/>
|
||||
</includes>
|
||||
</viewerContentBinding>
|
||||
</extension>
|
||||
-->
|
||||
<extension
|
||||
point="org.eclipse.ui.menus">
|
||||
<menuContribution
|
||||
locationURI="popup:org.eclipse.ui.popup.any?before=additions">
|
||||
<separator
|
||||
name="autotoolsGroup"
|
||||
visible="true">
|
||||
</separator>
|
||||
</menuContribution>
|
||||
</extension>
|
||||
<extension
|
||||
id="org.eclipse.cdt.autotools.ui.popup1"
|
||||
point="org.eclipse.ui.popupMenus">
|
||||
<objectContribution
|
||||
objectClass="org.eclipse.core.resources.IResource"
|
||||
adaptable="true"
|
||||
id="org.eclipse.cdt.autotools.ui.popupMenu.NavigatorContribution">
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeLibtoolizeAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.libtoolize1"
|
||||
label="%InvokeLibtoolize.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeAutoheaderAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.autoheader1"
|
||||
label="%InvokeAutoheader.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeAutoreconfAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.autoreconf1"
|
||||
label="%InvokeAutoreconf.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeAutomakeAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.automake1"
|
||||
label="%InvokeAutomake.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeAutoconfAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.autoconf1"
|
||||
label="%InvokeAutoconf.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.InvokeAclocalAction"
|
||||
enablesFor="1"
|
||||
id="org.eclipse.cdt.autotools.ui.action.aclocal1"
|
||||
label="%InvokeAclocal.label"
|
||||
menubarPath="org.eclipse.cdt.autotools.ui.invokeAutotools1/gm1">
|
||||
</action>
|
||||
<menu
|
||||
id="org.eclipse.cdt.autotools.ui.invokeAutotools1"
|
||||
label="%InvokeAutotools.label"
|
||||
path="autotoolsGroup">
|
||||
<groupMarker
|
||||
name="gm1">
|
||||
</groupMarker>
|
||||
</menu>
|
||||
<action
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.ReconfigureAction"
|
||||
definitionId="org.eclipse.cdt.autotools.ui.command.reconfigure"
|
||||
id="org.eclipse.cdt.autotools.ui.action.autoreconf1"
|
||||
label="%Reconfigure.label"
|
||||
menubarPath="autotoolsGroup">
|
||||
</action>
|
||||
<visibility>
|
||||
<or>
|
||||
<objectState
|
||||
name="projectNature"
|
||||
value="org.eclipse.cdt.autotools.core.autotoolsNatureV2"/>
|
||||
<objectState
|
||||
name="projectNature"
|
||||
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2"/>
|
||||
</or>
|
||||
</visibility>
|
||||
</objectContribution>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.cdt.core.CBuildConsole">
|
||||
<CBuildConsole
|
||||
|
|
@ -293,8 +176,7 @@
|
|||
<page
|
||||
class="org.eclipse.cdt.internal.autotools.ui.properties.AutotoolsHeadPropertyPage"
|
||||
id="org.eclipse.cdt.autotools.ui.propertypage"
|
||||
name="%PropertyAutotools.name"
|
||||
>
|
||||
name="%PropertyAutotools.name">
|
||||
<filter
|
||||
name="projectNature"
|
||||
value="org.eclipse.cdt.autotools.core.autotoolsNatureV2">
|
||||
|
|
@ -411,78 +293,36 @@
|
|||
</enabledWhen>
|
||||
</page>
|
||||
</extension>
|
||||
<!-- <extension
|
||||
point="org.eclipse.ui.menus">
|
||||
<menuContribution
|
||||
locationURI="menu:project?after=additions">
|
||||
<menu
|
||||
id="invokeAutotools"
|
||||
label="%InvokeAutotools.label"
|
||||
mnemonic="%InvokeAutotools.mnemonic">
|
||||
<visibleWhen
|
||||
checkEnabled="false">
|
||||
<and>
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
<test
|
||||
property="org.eclipse.core.resources.projectNature"
|
||||
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
|
||||
</test>
|
||||
</adapt>
|
||||
</iterate>
|
||||
</and>
|
||||
</visibleWhen>
|
||||
</menu>
|
||||
</menuContribution>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.ui.menus">
|
||||
<menuContribution
|
||||
locationURI="menu:project?after=additions">
|
||||
locationURI="popup:org.eclipse.ui.popup.any?before=additions">
|
||||
<separator
|
||||
name="autotoolsGroup"
|
||||
visible="true">
|
||||
</separator>
|
||||
</menuContribution>
|
||||
<menuContribution
|
||||
locationURI="popup:org.eclipse.ui.popup.any?after=autotoolsGroup">
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.reconfigure"
|
||||
id="reconfigure"
|
||||
id="autotools"
|
||||
label="%Reconfigure.label"
|
||||
mnemonic="%Reconfigure.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen
|
||||
checkEnabled="false">
|
||||
<and>
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
<test
|
||||
property="org.eclipse.core.resources.projectNature"
|
||||
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
|
||||
</test>
|
||||
</adapt>
|
||||
</iterate>
|
||||
</and>
|
||||
</visibleWhen>
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
</menuContribution>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.ui.menus">
|
||||
<menuContribution
|
||||
locationURI="menu:invokeAutotools">
|
||||
<menu
|
||||
id="autotools"
|
||||
label="%InvokeAutotools.label"
|
||||
mnemonic="%InvokeAutotools.mnemonic">
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoconf"
|
||||
id="autoconf"
|
||||
label="%InvokeAutoconf.label"
|
||||
mnemonic="%InvokeAutoconf.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoheader"
|
||||
|
|
@ -490,6 +330,7 @@
|
|||
label="%InvokeAutoheader.label"
|
||||
mnemonic="%InvokeAutoheader.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.automake"
|
||||
|
|
@ -497,6 +338,7 @@
|
|||
label="%InvokeAutomake.label"
|
||||
mnemonic="%InvokeAutomake.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoreconf"
|
||||
|
|
@ -504,6 +346,7 @@
|
|||
label="%InvokeAutoreconf.label"
|
||||
mnemonic="%InvokeAutoreconf.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.aclocal"
|
||||
|
|
@ -511,6 +354,7 @@
|
|||
label="%InvokeAclocal.label"
|
||||
mnemonic="%InvokeAclocal.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
<command
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.libtoolize"
|
||||
|
|
@ -518,9 +362,11 @@
|
|||
label="%InvokeLibtoolize.label"
|
||||
mnemonic="%InvokeLibtoolize.mnemonic"
|
||||
style="push">
|
||||
<visibleWhen checkEnabled="true"/>
|
||||
</command>
|
||||
</menu>
|
||||
</menuContribution>
|
||||
</extension> -->
|
||||
</extension>
|
||||
<extension
|
||||
id="org.eclipse.cdt.autotools.ui.commands"
|
||||
name="Autoconf"
|
||||
|
|
@ -577,237 +423,50 @@
|
|||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.AutoconfHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoconf">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.AutoheaderHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoheader">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.AutomakeHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.automake">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.AutoreconfHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.autoreconf">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.AclocalHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.aclocal">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.LibtoolizeHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.libtoolize">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
<handler
|
||||
class="org.eclipse.cdt.internal.autotools.ui.actions.ReconfigureHandler"
|
||||
commandId="org.eclipse.cdt.autotools.ui.command.reconfigure">
|
||||
<activeWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</activeWhen>
|
||||
<enabledWhen>
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
<reference definitionId="org.eclipse.cdt.autotools.ui.handlerEnablement"/>
|
||||
</enabledWhen>
|
||||
</handler>
|
||||
</extension>
|
||||
|
|
@ -843,4 +502,33 @@
|
|||
name="%Autotools.wizard.name">
|
||||
</wizard>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.core.expressions.definitions">
|
||||
<definition
|
||||
id="org.eclipse.cdt.autotools.ui.handlerEnablement">
|
||||
<with
|
||||
variable="selection">
|
||||
<count
|
||||
value="1">
|
||||
</count>
|
||||
<iterate
|
||||
ifEmpty="false"
|
||||
operator="and">
|
||||
<adapt
|
||||
type="org.eclipse.core.resources.IResource">
|
||||
<or>
|
||||
<test
|
||||
property="org.eclipse.core.resources.projectNature"
|
||||
value="org.eclipse.cdt.autotools.core.autotoolsNatureV2">
|
||||
</test>
|
||||
<test
|
||||
property="org.eclipse.core.resources.projectNature"
|
||||
value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
|
||||
</test>
|
||||
</or>
|
||||
</adapt>
|
||||
</iterate>
|
||||
</with>
|
||||
</definition>
|
||||
</extension>
|
||||
</plugin>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue