[Esbox-commits] r1246 - trunk/org.maemo.esbox.product

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-02-27 15:34:54 +0200 (Fri, 27 Feb 2009)
New Revision: 1246

Modified:
   trunk/org.maemo.esbox.product/ESbox.product
   trunk/org.maemo.esbox.product/plugin.properties
   trunk/org.maemo.esbox.product/plugin.xml
Log:
Merge revs 1243:1245 from work_Ed branch.  Changes for new Autotools plugin.

Modified: trunk/org.maemo.esbox.product/ESbox.product
===================================================================
--- trunk/org.maemo.esbox.product/ESbox.product	2009-02-25 19:44:04 UTC (rev 1245)
+++ trunk/org.maemo.esbox.product/ESbox.product	2009-02-27 13:34:54 UTC (rev 1246)
@@ -42,7 +42,7 @@
    <plugins>
       <plugin id="com.ibm.icu"/>
       <plugin id="com.jcraft.jsch"/>
-      <plugin id="com.redhat.eclipse.cdt.autotools"/>
+      <plugin id="org.eclipse.linuxtools.cdt.autotools"/>
       <plugin id="org.eclipse.cdt.core"/>
       <plugin id="org.eclipse.cdt.core.aix"/>
       <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
@@ -132,7 +132,7 @@
    <features>
       <feature id="org.maemo.esbox.product" version="0.0.0"/>
       <feature id="org.maemo.esbox.product.supplement" version="0.0.0"/>
-      <feature id="com.redhat.eclipse.cdt.autotools.feature" version="0.0.0"/>
+      <feature id="org.eclipse.linuxtools.cdt.autotools.feature" version="0.0.0"/>
       <feature id="org.eclipse.dd.dsf.gdb" version="0.0.0"/>
       <feature id="org.eclipse.dd.dsf.gdb_launch" version="0.0.0"/>
       <feature id="org.eclipse.dd.dsf.sdk" version="0.0.0"/>

Modified: trunk/org.maemo.esbox.product/plugin.properties
===================================================================
--- trunk/org.maemo.esbox.product/plugin.properties	2009-02-25 19:44:04 UTC (rev 1245)
+++ trunk/org.maemo.esbox.product/plugin.properties	2009-02-27 13:34:54 UTC (rev 1246)
@@ -13,7 +13,7 @@
 
 productName=ESbox
 productBlurb=ESbox\n\
-version: 2.0.0-M2-20090217\n\
+version: 2.0.0-M2-20090218\n\
 Eclipse build id: {0}\n\
 \n\
 Copyright (c)2007-2009 INdT, 2007-2009 Nokia Corporation. All rights reserved.\n\

Modified: trunk/org.maemo.esbox.product/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.product/plugin.xml	2009-02-25 19:44:04 UTC (rev 1245)
+++ trunk/org.maemo.esbox.product/plugin.xml	2009-02-27 13:34:54 UTC (rev 1246)
@@ -196,16 +196,36 @@
 
       <activityPatternBinding
             activityId="org.maemo.esbox.product.autotoolsActivity"
-            pattern="com.redhat.eclipse.cdt.autotools/com.redhat.eclipse.cdt.autotools.wizard1">
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.wizard1">
       </activityPatternBinding>
       <activityPatternBinding
             activityId="org.maemo.esbox.product.autotoolsActivity"
-            pattern="com.redhat.eclipse.cdt.autotools/com.redhat.eclipse.cdt.autotools.wizard2">
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.wizard2">
       </activityPatternBinding>
       <activityPatternBinding
             activityId="org.maemo.esbox.product.autotoolsActivity"
-            pattern="com.redhat.eclipse.cdt.autotools/com.redhat.eclipse.cdt.autotools.wizard3">
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.wizard3">
       </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.maemo.esbox.product.autotoolsActivity"
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.actionSets">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.maemo.esbox.product.autotoolsActivity"
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.propertypage">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.maemo.esbox.product.autotoolsActivity"
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.objectContribution.autoconf.*">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.maemo.esbox.product.autotoolsActivity"
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.actions.invoke.*">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.maemo.esbox.product.autotoolsActivity"
+            pattern="org.eclipse.linuxtools.cdt.autotools/org.eclipse.linuxtools.cdt.autotools.actions.Invoke.*">
+      </activityPatternBinding>
 
 
 	<!--************ Pydev elements *********-->