Bug 321443 - First implementation of new build model.

Includes adaptation of the Arduino build model where many of these ideas started to the new model. And start of the Qt build system which uses it. Change-Id: Icb212185773ebc4d415e8a9862101744703ff80b
eclipse-cdt · Aug 31, 2015 · 64c5782 · 64c5782
1 parent f505c21
commit 64c5782
Show file tree

Hide file tree

Showing 39 changed files with 1,664 additions and 1,013 deletions.
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
-Bundle-Version: 5.11.0.qualifier
+Bundle-Version: 5.12.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.core.browser,
+ org.eclipse.cdt.core.build,
  org.eclipse.cdt.core.cdtvariables,
  org.eclipse.cdt.core.dom,
  org.eclipse.cdt.core.dom.ast,
@@ -73,7 +74,11 @@ Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.internal.core.indexer;x-internal:=true,
  org.eclipse.cdt.internal.core.language;x-friends:="org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.core.language.settings.providers;x-internal:=true,
- org.eclipse.cdt.internal.core.model;x-friends:="org.eclipse.cdt.ui,org.eclipse.cdt.debug.core,org.eclipse.cdt.debug.ui,org.eclipse.cdt.codan.ui",
+ org.eclipse.cdt.internal.core.model;
+  x-friends:="org.eclipse.cdt.ui,
+   org.eclipse.cdt.debug.core,
+   org.eclipse.cdt.debug.ui,
+   org.eclipse.cdt.codan.ui",
  org.eclipse.cdt.internal.core.model.ext;x-friends:="org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.core.parser;x-internal:=true,
  org.eclipse.cdt.internal.core.parser.problem;x-internal:=true,
@@ -122,6 +127,7 @@ Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)";visib
  org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
  org.eclipse.ltk.core.refactoring;bundle-version="3.4.0",
  org.eclipse.text;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="4.4.2"
+ com.ibm.icu;bundle-version="4.4.2",
+ com.google.gson;bundle-version="2.2.4"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
@@ -683,6 +683,7 @@
    <extension-point id="LanguageSettingsProvider" name="%LanguageSettingsProvider.name" schema="schema/LanguageSettingsProvider.exsd"/>
    <extension-point id="UNCPathConverter" name="%uncPathConverter.name" schema="schema/UNCPathConverter.exsd"/>
    <extension-point id="ProblemMarkerFilter" name="%problemMarkerFilter.name" schema="schema/ProblemMarkerFilter.exsd"/>
+   <extension-point id="ToolChain" name="ToolChain" schema="schema/ToolChain.exsd"/>
 
    <extension
          point="org.eclipse.cdt.core.templateProcessTypes">
@@ -856,5 +857,22 @@
             ordering="first">
       </filterMatcher>
    </extension>
+   <extension
+         point="org.eclipse.cdt.core.ToolChain">
+      <toolChain
+            adaptor="org.eclipse.cdt.core.build.GCCToolChain"
+            id="org.eclipse.cdt.core.gcc">
+      </toolChain>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.cdt.core.build.CBuildConfiguration"
+            class="org.eclipse.cdt.core.build.GCCToolChain$Factory">
+         <adapter
+               type="org.eclipse.cdt.core.build.GCCToolChain">
+         </adapter>
+      </factory>
+   </extension>
 
 </plugin>
diff --git a/core/org.eclipse.cdt.core/pom.xml b/core/org.eclipse.cdt.core/pom.xml
@@ -11,7 +11,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <version>5.11.0-SNAPSHOT</version>
+  <version>5.12.0-SNAPSHOT</version>
   <artifactId>org.eclipse.cdt.core</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/...t.arduino.core/schema/consoleService.exsd → ...rg.eclipse.cdt.core/schema/ToolChain.exsd b/...t.arduino.core/schema/consoleService.exsd → ...rg.eclipse.cdt.core/schema/ToolChain.exsd
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.arduino.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.cdt.core" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.cdt.arduino.core" id="consoleService" name="Arduino Launch Console Service"/>
-      </appinfo>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.cdt.core" id="ToolChain" name="ToolChain"/>
+      </appInfo>
       <documentation>
          [Enter description of this extension point.]
       </documentation>
    </annotation>
 
    <element name="extension">
       <annotation>
-         <appinfo>
+         <appInfo>
             <meta.element />
-         </appinfo>
+         </appInfo>
       </annotation>
       <complexType>
-         <sequence>
-            <element ref="provider"/>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="toolChain"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -39,60 +39,72 @@
                <documentation>
 
                </documentation>
-               <appinfo>
+               <appInfo>
                   <meta.attribute translatable="true"/>
-               </appinfo>
+               </appInfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
-   <element name="provider">
+   <element name="toolChain">
+      <annotation>
+         <documentation>
+            A toolchain that implements the CToolChain interface and identified with the id attribute.
+         </documentation>
+      </annotation>
       <complexType>
-         <attribute name="class" type="string" use="required">
+         <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
-
+                  id for the toolchain.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="adaptor" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The adaptor class for the toolchain. This is passed to getAdaptor on the CBuildConfiguration object.
                </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.cdt.arduino.core.internal.launch.ArduinoLaunchConsoleService"/>
-               </appinfo>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.build.CToolChain:"/>
+               </appInfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="since"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter the first release in which this extension point appears.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="examples"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter extension point usage example here.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="apiinfo"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter API information here.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="implementation"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter information about supplied implementation of this extension point.]
       </documentation>