From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 19 Aug 2010 08:25:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.1.0~40
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=1ab314f533e2942e0898ad5fda346a48312b351a;hp=-c

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

1ab314f533e2942e0898ad5fda346a48312b351a
diff --combined .cproject
index d3926f3,766f365..2b699b9
--- a/.cproject
+++ b/.cproject
@@@ -40,6 -40,7 +40,7 @@@
  								<option defaultValue="true" id="macosx.cpp.link.option.shared.2082905640" name="Shared (-dynamiclib)" superClass="macosx.cpp.link.option.shared" valueType="boolean"/>
  							</tool>
  							<tool id="cdt.managedbuild.tool.gnu.assembler.macosx.base.1871976203" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
+ 								<option id="gnu.both.asm.option.include.paths.998378482" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
  								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1256561366" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
  							</tool>
  							<tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.1171332498" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
@@@ -98,6 -99,7 +99,7 @@@
  									<listOptionValue builtIn="false" value="HAVE_XSLTSAVERESULTTOSTRING=1"/>
  								</option>
  								<option id="gnu.c.compiler.option.include.paths.773210380" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+ 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/yaz/include}&quot;"/>
  									<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
  									<listOptionValue builtIn="false" value="/usr/local/include"/>
  								</option>
@@@ -105,17 -107,11 +107,12 @@@
  							</tool>
  						</toolChain>
  					</folderInfo>
- 					<fileInfo id="cdt.managedbuild.toolchain.gnu.macosx.base.368006805.1041315687" name="client.c" rcbsApplicability="disable" resourcePath="client/client.c" toolsToInvoke="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.1367873707.2080555490">
- 						<tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.1367873707.2080555490" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.1367873707"/>
- 					</fileInfo>
  					<sourceEntries>
  						<entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
  						<entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="util"/>
  						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="client"/>
- 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
- 						<entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
  						<entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="test"/>
 +						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
  					</sourceEntries>
  				</configuration>
  			</storageModule>
@@@ -307,6 -303,89 +304,89 @@@
  						</scannerInfoProvider>
  					</profile>
  				</scannerConfigBuildInfo>
+ 				<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.566575041;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.747936463;cdt.managedbuild.tool.gnu.c.compiler.input.1402339125">
+ 					<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.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.791362720;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.2071622157;cdt.managedbuild.tool.gnu.c.compiler.input.986509299">
  					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
  					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@@ -390,6 -469,89 +470,89 @@@
  						</scannerInfoProvider>
  					</profile>
  				</scannerConfigBuildInfo>
+ 				<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.761048058;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.1367873707;cdt.managedbuild.tool.gnu.c.compiler.input.1402339125">
+ 					<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.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.791362720;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.2071622157;cdt.managedbuild.tool.gnu.c.compiler.input.1402339125">
  					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
  					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@@ -473,7 -635,7 +636,7 @@@
  						</scannerInfoProvider>
  					</profile>
  				</scannerConfigBuildInfo>
- 				<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.761048058;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.1367873707;cdt.managedbuild.tool.gnu.c.compiler.input.1402339125">
+ 				<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.368006805;cdt.managedbuild.toolchain.gnu.macosx.base.368006805.566575041;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.747936463;cdt.managedbuild.tool.gnu.c.compiler.input.364396502">
  					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
  					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
  						<buildOutputProvider>