Bug 980183 - Add support for eclipse CDT 8.3. r=botond NPOTB
authorBenoit Girard <b56girard@gmail.com>
Fri, 07 Mar 2014 14:54:45 -0500
changeset 190819 0827b0fbb8aa2b04c3dc2583a1050e9d1cac8755
parent 190818 8e02bf51cb69487012ed06607ada59a82c9799e0
child 190820 d01bf8596d3bebdd119767d91aa02026e834af3f
child 190823 9fafd0e46813675d5375d7dee1186062c69d5928
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs980183
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 980183 - Add support for eclipse CDT 8.3. r=botond NPOTB
python/mozbuild/mozbuild/backend/cpp_eclipse.py
--- a/python/mozbuild/mozbuild/backend/cpp_eclipse.py
+++ b/python/mozbuild/mozbuild/backend/cpp_eclipse.py
@@ -248,19 +248,17 @@ CPROJECT_TEMPLATE_FOOTER = """          
         </storageModule>
         <storageModule moduleId="scannerConfiguration">
                 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                 <scannerConfigBuildInfo instanceId="0.1674256904">
                         <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                 </scannerConfigBuildInfo>
         </storageModule>
         <storageModule moduleId="refreshScope" versionNumber="2">
-                <configuration configurationName="Default">
-                        <resource resourceType="PROJECT" workspacePath="/Gecko"/>
-                </configuration>
+                <configuration configurationName="Default"/>
         </storageModule>
         <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 </cproject>
 """
 
 WORKSPACE_LANGUAGE_SETTINGS_TEMPLATE = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <plugin>
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
@@ -293,16 +291,20 @@ LANGUAGE_SETTINGS_TEMPLATE = """<?xml ve
                                                   we need to make sure headers are parsed with MOZILLA_INTERNAL_API to make sure
                                                   the indexer gets the version that is used in most of the true. This means that
                                                   MOZILLA_EXTERNAL_API code will suffer.
                                                 -->
                                                 <entry kind="macro" name="MOZILLA_INTERNAL_API" value="1"/>
                                         </resource>
                                 </language>
                         </provider>
+                        <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-859273372804152468" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -std=c++11" prefer-non-shared="true" store-entries-with-project="true">
+                             <language-scope id="org.eclipse.cdt.core.gcc"/>
+                             <language-scope id="org.eclipse.cdt.core.g++"/>
+                        </provider>
                         <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
                 </extension>
         </configuration>
 </project>
 """
 
 LAUNCH_CONFIG_TEMPLATE = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
@@ -320,17 +322,17 @@ LAUNCH_CONFIG_TEMPLATE = """<?xml versio
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="@LAUNCH_ARGS@"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="@LAUNCH_PROGRAM@"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="Gecko"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="gecko"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
 <booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/gecko"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>