Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
reset .cproject
Conflicts:
.cproject

1  2 
.cproject
src/pazpar2_config.c

diff --cc .cproject
+++ b/.cproject
  <?fileVersion 4.0.0?>
  
  <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 -<storageModule moduleId="org.eclipse.cdt.core.settings">
 -<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1356961937">
 -<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1356961937" moduleId="org.eclipse.cdt.core.settings" name="Default">
 -<externalSettings/>
 -<extensions>
 -<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 -<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 -<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 -<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 -<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 -</extensions>
 -</storageModule>
 -<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 -<configuration artifactName="pazpar2" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1356961937" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
 -<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1356961937.1219887468" name="/" resourcePath="">
 -<toolChain id="cdt.managedbuild.toolchain.gnu.base.206055726" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
 -<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.482825983" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
 -<builder id="cdt.managedbuild.target.gnu.builder.base.643507095" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 -<tool id="cdt.managedbuild.tool.gnu.archiver.base.1263665083" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 -<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.910233928" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>
 -<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1026132090" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
 -<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1231290145" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 -</tool>
 -<tool id="cdt.managedbuild.tool.gnu.c.linker.base.245863139" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base">
 -<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1230367126" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 -<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 -<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 -</inputType>
 -</tool>
 -<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1781810952" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/>
 -<tool id="cdt.managedbuild.tool.gnu.assembler.base.1246822424" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
 -<inputType id="cdt.managedbuild.tool.gnu.assembler.input.831263694" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 -</tool>
 -</toolChain>
 -</folderInfo>
 -</configuration>
 -</storageModule>
 -<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 -<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 -<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 -<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="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="makefileGenerator">
 -<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 -<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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1356961937;cdt.managedbuild.toolchain.gnu.base.1356961937.1219887468;cdt.managedbuild.tool.gnu.c.compiler.base.1026132090;cdt.managedbuild.tool.gnu.c.compiler.input.1231290145">
 -<autodiscovery enabled="true" problemReportingEnabled="false" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 -<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="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="makefileGenerator">
 -<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 -<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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 -<buildOutputProvider>
 -<openAction enabled="true" filePath=""/>
 -<parser enabled="true"/>
 -</buildOutputProvider>
 -<scannerInfoProvider id="specsFile">
 -<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 -<parser enabled="true"/>
 -</scannerInfoProvider>
 -</profile>
 -</scannerConfigBuildInfo>
 -</storageModule>
 -</cconfiguration>
 -</storageModule>
 -<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 -<project id="pazpar2.null.242426401" name="pazpar2"/>
 -</storageModule>
 +      <storageModule moduleId="org.eclipse.cdt.core.settings">
 +              <cconfiguration id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082">
 +                      <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 +                              <externalSettings/>
 +                              <extensions>
 +                                      <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                              </extensions>
 +                      </storageModule>
 +                      <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 +                      <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 +                      <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 +                              <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082" name="Debug" parent="cdt.managedbuild.config.gnu.macosx.exe.debug">
 +                                      <folderInfo id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082." name="/" resourcePath="">
 +                                              <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug.642779913" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
 +                                                      <targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug.206052691" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"/>
 +                                                      <builder buildPath="${workspace_loc:/pazpar2.master/Debug}" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
 +                                                      <tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.937721886" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug">
 +                                                              <inputType id="cdt.managedbuild.tool.macosx.c.linker.input.377427532" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
 +                                                                      <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 +                                                                      <additionalInput kind="additionalinput" paths="$(LIBS)"/>
 +                                                              </inputType>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug.301077445" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug"/>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug.558303931" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug">
 +                                                              <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1188834286" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.1147822956" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug.1794369284" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug">
 +                                                              <option id="gnu.cpp.compilermacosx.exe.debug.option.optimization.level.1086120406" name="Optimization Level" superClass="gnu.cpp.compilermacosx.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 +                                                              <option id="gnu.cpp.compiler.macosx.exe.debug.option.debugging.level.1239380339" name="Debug Level" superClass="gnu.cpp.compiler.macosx.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug">
 +                                                              <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.macosx.exe.debug.option.optimization.level.1726497609" name="Optimization Level" superClass="gnu.c.compiler.macosx.exe.debug.option.optimization.level" valueType="enumerated"/>
 +                                                              <option id="gnu.c.compiler.macosx.exe.debug.option.debugging.level.88106198" name="Debug Level" superClass="gnu.c.compiler.macosx.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 +                                                              <option id="gnu.c.compiler.option.include.paths.16758435" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 +                                                                      <listOptionValue builtIn="false" value="&quot;${workspace_loc:/yaz/include}&quot;"/>
 +                                                              </option>
 +                                                              <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1159745856" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 +                                                      </tool>
 +                                              </toolChain>
 +                                      </folderInfo>
-                                       <folderInfo id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.48114312" name="/" resourcePath="src">
-                                               <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug.1120388387" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.debug" unusedChildren="">
-                                                       <tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.407949997" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.937721886"/>
-                                                       <tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug.2115682336" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug.301077445"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug.1441890307" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug.558303931">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.2113422069" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-                                                       </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.341888168" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base.1147822956"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug.791617477" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug.1794369284"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.743084521" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1792646124" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-                                                       </tool>
-                                               </toolChain>
-                                       </folderInfo>
-                                       <sourceEntries>
-                                               <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
-                                               <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="test"/>
-                                       </sourceEntries>
 +                              </configuration>
 +                      </storageModule>
-                       <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 +                      <storageModule moduleId="scannerConfiguration">
 +                              <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 +                              <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="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="makefileGenerator">
 +                                              <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                      <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
 +                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 +                                      <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="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="makefileGenerator">
 +                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                              <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                              </scannerConfigBuildInfo>
 +                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
 +                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 +                                      <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="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="makefileGenerator">
 +                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                              <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                              </scannerConfigBuildInfo>
-                               <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.48114312;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.743084521;cdt.managedbuild.tool.gnu.c.compiler.input.1792646124">
-                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-                                       <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="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="makefileGenerator">
-                                                       <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-                                               <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                               </scannerConfigBuildInfo>
 +                      </storageModule>
++                      <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
++                      <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 +              </cconfiguration>
 +              <cconfiguration id="cdt.managedbuild.config.macosx.exe.release.397760623">
 +                      <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.macosx.exe.release.397760623" moduleId="org.eclipse.cdt.core.settings" name="Release">
 +                              <externalSettings/>
 +                              <extensions>
 +                                      <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                                      <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 +                              </extensions>
 +                      </storageModule>
 +                      <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 +                      <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 +                      <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 +                              <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.macosx.exe.release.397760623" name="Release" parent="cdt.managedbuild.config.macosx.exe.release">
 +                                      <folderInfo id="cdt.managedbuild.config.macosx.exe.release.397760623." name="/" resourcePath="">
 +                                              <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.release.740147803" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.release">
 +                                                      <targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.release.2059998902" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.release"/>
 +                                                      <builder buildPath="${workspace_loc:/pazpar2.master/Release}" id="cdt.managedbuild.target.gnu.builder.macosx.exe.release.893517025" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.release"/>
 +                                                      <tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release.217097143" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release">
 +                                                              <inputType id="cdt.managedbuild.tool.macosx.c.linker.input.1144641815" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
 +                                                                      <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 +                                                                      <additionalInput kind="additionalinput" paths="$(LIBS)"/>
 +                                                              </inputType>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release.80891690" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release"/>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release.2095159044" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release">
 +                                                              <inputType id="cdt.managedbuild.tool.gnu.assembler.input.538196723" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.785295904" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release.1602863758" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release">
 +                                                              <option id="gnu.cpp.compiler.macosx.exe.release.option.optimization.level.188273471" name="Optimization Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
 +                                                              <option id="gnu.cpp.compiler.macosx.exe.release.option.debugging.level.1795172740" name="Debug Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 +                                                      </tool>
 +                                                      <tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release">
 +                                                              <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.macosx.exe.release.option.optimization.level.590469295" name="Optimization Level" superClass="gnu.c.compiler.macosx.exe.release.option.optimization.level" valueType="enumerated"/>
 +                                                              <option id="gnu.c.compiler.macosx.exe.release.option.debugging.level.1332521313" name="Debug Level" superClass="gnu.c.compiler.macosx.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 +                                                              <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.144338339" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 +                                                      </tool>
 +                                              </toolChain>
 +                                      </folderInfo>
 +                              </configuration>
 +                      </storageModule>
-                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-                       <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 +                      <storageModule moduleId="scannerConfiguration">
 +                              <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 +                              <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="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="makefileGenerator">
 +                                              <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                      <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                      <buildOutputProvider>
 +                                              <openAction enabled="true" filePath=""/>
 +                                              <parser enabled="true"/>
 +                                      </buildOutputProvider>
 +                                      <scannerInfoProvider id="specsFile">
 +                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                              <parser enabled="true"/>
 +                                      </scannerInfoProvider>
 +                              </profile>
 +                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
 +                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 +                                      <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="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="makefileGenerator">
 +                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                              <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                              </scannerConfigBuildInfo>
 +                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
 +                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 +                                      <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="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="makefileGenerator">
 +                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
 +                                              <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
 +                                              <buildOutputProvider>
 +                                                      <openAction enabled="true" filePath=""/>
 +                                                      <parser enabled="true"/>
 +                                              </buildOutputProvider>
 +                                              <scannerInfoProvider id="specsFile">
 +                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
 +                                                      <parser enabled="true"/>
 +                                              </scannerInfoProvider>
 +                                      </profile>
 +                              </scannerConfigBuildInfo>
-                               <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.48114312;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.743084521;cdt.managedbuild.tool.gnu.c.compiler.input.1792646124">
-                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-                                       <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="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="makefileGenerator">
-                                                       <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-                                               <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.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                               </scannerConfigBuildInfo>
 +                      </storageModule>
++                      <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
++                      <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 +              </cconfiguration>
 +      </storageModule>
 +      <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 +              <project id="pazpar2.master.cdt.managedbuild.target.macosx.exe.943143256" name="Executable" projectType="cdt.managedbuild.target.macosx.exe"/>
 +      </storageModule>
  </cproject>
Simple merge