diff options
author | Alexander Kurtakov | 2016-12-15 20:21:06 +0000 |
---|---|---|
committer | Arun Thondapu | 2016-12-19 13:56:49 +0000 |
commit | 302ccc4f96f012f41b5d946971a04ef50dd2721e (patch) | |
tree | 0cfe3eb7c68c4d5af188f706656e910ebd8c71bc | |
parent | 2d0711bbe78feb3cb98541d13b2a6edabe05c5d1 (diff) | |
download | rt.equinox.framework-302ccc4f96f012f41b5d946971a04ef50dd2721e.tar.gz rt.equinox.framework-302ccc4f96f012f41b5d946971a04ef50dd2721e.tar.xz rt.equinox.framework-302ccc4f96f012f41b5d946971a04ef50dd2721e.zip |
Bug 509313 - Update CDT configurations for launcher nativesY20161229-1000Y20161223-1030Y20161222-1000I20170102-2000I20170101-2000I20161231-2000I20161230-2000I20161229-2000I20161228-2000I20161227-2000I20161226-2000I20161225-2000I20161224-2000I20161223-2000I20161223-0615I20161222-2000I20161221-2000I20161221-0400I20161220-2000I20161220-0530I20161219-2000
* Updates for .cproject format changes.
* Add gdk-pixbuf include path.
* Remove space at end of glib include path making CDT to not resolve it.
* Switch to the modern X11 include path.
Change-Id: I167ebcd4abf8c659ef36d25d712bb68098bd4e6e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r-- | bundles/org.eclipse.equinox.launcher/.cproject | 220 | ||||
-rw-r--r-- | features/org.eclipse.equinox.executable.feature/.cproject | 13 |
2 files changed, 117 insertions, 116 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/.cproject b/bundles/org.eclipse.equinox.launcher/.cproject index c77b70e7c..6caac5f07 100644 --- a/bundles/org.eclipse.equinox.launcher/.cproject +++ b/bundles/org.eclipse.equinox.launcher/.cproject @@ -1,112 +1,110 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?fileVersion 4.0.0?> - -<cproject> -<storageModule moduleId="org.eclipse.cdt.core.settings"> -<cconfiguration id="converted.config.1529602833"> -<storageModule moduleId="scannerConfiguration"> -<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="true" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="true"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="makefileGenerator"> -<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -</storageModule> -<storageModule moduleId="org.eclipse.cdt.core.pathentry"> -<pathentry kind="src" path=""/> -<pathentry kind="out" path=""/> -<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> -</storageModule> -<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> -<buildTargets> -<target name="all-mingw" path="library/win32" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_mingw.mak</buildArguments> -<buildTarget>all</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -<target name="clean" path="library/win32" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_mingw.mak</buildArguments> -<buildTarget>clean</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -<target name="linux-all" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_linux.mak</buildArguments> -<buildTarget>all</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -<target name="clean" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_linux.mak</buildArguments> -<buildTarget>clean</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -<target name="all" path="library/carbon" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_macosx.mak</buildArguments> -<buildTarget>all</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -<target name="clean" path="library/carbon" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> -<buildCommand>make</buildCommand> -<buildArguments>-f make_macosx.mak</buildArguments> -<buildTarget>clean</buildTarget> -<stopOnError>false</stopOnError> -<useDefaultCommand>false</useDefaultCommand> -</target> -</storageModule> -<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1529602833" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig"> -<externalSettings/> -<extensions> -<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> -<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> -<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser"> -<attribute key="c++filt" value="c++filt"/> -</extension> -</extensions> -</storageModule> -</cconfiguration> -</storageModule> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> + <storageModule moduleId="org.eclipse.cdt.core.settings"> + <cconfiguration id="converted.config.1494934046"> + <storageModule moduleId="scannerConfiguration"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.pathentry"> + <pathentry kind="src" path=""/> + <pathentry kind="out" path=""/> + <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> + <buildTargets> + <target name="all-mingw" path="library/win32" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_mingw.mak</buildArguments> + <buildTarget>all</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + <target name="clean" path="library/win32" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_mingw.mak</buildArguments> + <buildTarget>clean</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + <target name="linux-all" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_linux.mak</buildArguments> + <buildTarget>all</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + <target name="clean" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_linux.mak</buildArguments> + <buildTarget>clean</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + <target name="all" path="library/carbon" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_macosx.mak</buildArguments> + <buildTarget>all</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + <target name="clean" path="library/carbon" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> + <buildCommand>make</buildCommand> + <buildArguments>-f make_macosx.mak</buildArguments> + <buildTarget>clean</buildTarget> + <stopOnError>false</stopOnError> + <useDefaultCommand>false</useDefaultCommand> + </target> + </buildTargets> + </storageModule> + <storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1494934046" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig"> + <externalSettings/> + <extensions> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser"/> + </extensions> + </storageModule> + </cconfiguration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> </cproject> diff --git a/features/org.eclipse.equinox.executable.feature/.cproject b/features/org.eclipse.equinox.executable.feature/.cproject index ed9f3ee00..b29d3652d 100644 --- a/features/org.eclipse.equinox.executable.feature/.cproject +++ b/features/org.eclipse.equinox.executable.feature/.cproject @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?fileVersion 4.0.0?><cproject> <storageModule moduleId="org.eclipse.cdt.core.settings"> <cconfiguration id="converted.config.1797282818"> <storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1797282818" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig"> @@ -109,20 +110,22 @@ </scannerInfoProvider> </profile> </storageModule> + <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> <storageModule moduleId="org.eclipse.cdt.core.pathentry"> <pathentry kind="mac" name="JNIEXPORT" path="" value=""/> <pathentry kind="mac" name="JNICALL" path="" value=""/> - <pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/> + <pathentry include="/usr/include/X11" kind="inc" path="" system="true"/> <pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/> <pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/> <pathentry include="/usr/include/gtk-2.0" kind="inc" path="" system="true"/> <pathentry include="/usr/lib64/gtk-2.0/include" kind="inc" path="" system="true"/> <pathentry include="/usr/include/atk-1.0" kind="inc" path="" system="true"/> - <pathentry include="/usr/include/glib-2.0 " kind="inc" path="" system="true"/> + <pathentry include="/usr/include/glib-2.0" kind="inc" path="" system="true"/> <pathentry include="/usr/lib64/glib-2.0/include" kind="inc" path="" system="true"/> + <pathentry include="/usr/include/gdk-pixbuf-2.0" kind="inc" path="" system="true"/> <pathentry kind="src" path=""/> <pathentry kind="out" path=""/> <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> </storageModule> - <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> -</cproject>
\ No newline at end of file + <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> +</cproject> |