Menu
▾
▴
[nant-commits] CVS: nant/src/NAnt.Console App.config,1.13,1.14
|
From: Gert D. <dri...@us...> - 2005-12-02 10:22:40
|
Update of /cvsroot/nant/nant/src/NAnt.Console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10901/src/NAnt.Console Modified Files: App.config Log Message: Reorder frameworks with identical names to have most lilkely candidates processed first. Index: App.config =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Console/App.config,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** App.config 2 Dec 2005 08:55:53 -0000 1.13 --- App.config 2 Dec 2005 10:22:31 -0000 1.14 *************** *** 170,179 **** family="net" version="2.0" ! description="Microsoft .NET Framework 2.0 Beta 1" runtimeengine="" sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" ! frameworkdirectory="${path::combine(installRoot, 'v2.0.40607')}" ! frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.40607')}" ! clrversion="2.0.40607" > <task-assemblies> --- 170,179 ---- family="net" version="2.0" ! description="Microsoft .NET Framework 2.0" runtimeengine="" sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" ! frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}" ! frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}" ! clrversion="2.0.50727" > <task-assemblies> *************** *** 330,339 **** family="net" version="2.0" ! description="Microsoft .NET Framework 2.0" runtimeengine="" sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" ! frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}" ! frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}" ! clrversion="2.0.50727" > <task-assemblies> --- 330,339 ---- family="net" version="2.0" ! description="Microsoft .NET Framework 2.0 Beta 1" runtimeengine="" sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" ! frameworkdirectory="${path::combine(installRoot, 'v2.0.40607')}" ! frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.40607')}" ! clrversion="2.0.40607" > <task-assemblies> *************** *** 637,641 **** frameworkdirectory="${frameworkDirectory}" frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" ! clrversion="2.0.40607" > <task-assemblies> --- 637,641 ---- frameworkdirectory="${frameworkDirectory}" frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" ! clrversion="2.0.50727" > <task-assemblies> *************** *** 726,906 **** failonerror="false" /> - - <if test="${property::exists('mono.version')}"> - <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" /> - </if> - - <!-- - if the DefaultCLR registry value does not exist in - HKLM\Novell\Mono, then try the HKML\Mono registry - key as this was used for the Mono 1.0 installer - --> - <if test="${not property::exists('mono.version')}"> - <readregistry - property="mono.version" - key="SOFTWARE\Mono\DefaultCLR" - hive="LocalMachine" - /> - <property name="monokey" value="SOFTWARE\Mono\${mono.version}" /> - </if> - - <readregistry - property="sdkInstallRoot" - key="${monokey}\SdkInstallRoot" - hive="LocalMachine" /> - <readregistry - property="frameworkAssemblyDirectory" - key="${monokey}\FrameworkAssemblyDirectory" - hive="LocalMachine" /> - <readregistry - property="configDir" - key="${monokey}\MonoConfigDir" - hive="LocalMachine" /> - </target> - </project> - <properties> - </properties> - <environment> - <env name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" /> - <env name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" /> - </environment> - <tasks> - <task name="al"> - <attribute name="exename">al</attribute> - <attribute name="useruntimeengine">true</attribute> - </task> - <task name="csc"> - <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute> - <attribute name="useruntimeengine">true</attribute> - <attribute name="supportspackagereferences">true</attribute> - <attribute name="supportsnowarnlist">true</attribute> - <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute> - <attribute name="supportskeycontainer">true</attribute> - <attribute name="supportskeyfile">true</attribute> - </task> - <task name="vbc"> - <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute> - <attribute name="useruntimeengine">true</attribute> - </task> - <task name="resgen"> - <attribute name="exename">${resgen.tool}</attribute> - <attribute name="useruntimeengine">true</attribute> - </task> - <task name="delay-sign"> - <attribute name="exename">sn</attribute> - <attribute name="useruntimeengine">true</attribute> - </task> - <task name="license"> - <attribute name="hascommandlinecompiler">false</attribute> - </task> - <task name="ilasm"> - <attribute name="exename">ilasm</attribute> - <attribute name="useruntimeengine">true</attribute> - </task> - </tasks> - </framework> - <framework - name="mono-2.0" - family="mono" - version="2.0" - description="Mono 2.0 Profile" - runtimeengine="${runtimeEngine}" - sdkdirectory="${sdkDirectory}" - frameworkdirectory="${frameworkDirectory}" - frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" - clrversion="2.0.50215" - > - <task-assemblies> - <!-- include Mono specific assemblies --> - <include name="tasks/mono/*.dll" /> - <!-- include Mono 1.0 specific assemblies --> - <include name="tasks/mono/2.0/**/*.dll" /> - </task-assemblies> - <project> - <!-- quick and dirty check to see if pkg-config is available (and configured) --> - <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" /> - <if test="${pkgconfig.available}"> - <if test="${pkg-config::exists('mono')}"> - <call target="configure-from-pkg-config" /> - </if> - <if test="${not pkg-config::exists('mono')}"> - <call target="configure-from-registry" /> - </if> - </if> - <if test="${not pkgconfig.available}"> - <call target="configure-from-registry" /> - </if> - - <!-- determine if we're dealing with a Mono 1.0.x release --> - <if test="${version::get-major(version::parse(mono.version)) == 1 and version::get-minor(version::parse(mono.version)) == 0}"> - <!-- - in Mono 1.0.x, the framework tools are located - in the <install root>\lib directory, except for - mbas and mcs - --> - <property name="frameworkDirectory" value="${frameworkAssemblyDirectory}" /> - <property name="sdkDirectory" value="${frameworkAssemblyDirectory}" /> - <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" /> - <property name="resgen.tool" value="monoresgen" /> - <property name="csc.supportsdocgeneration" value="false" /> - - <!-- - Mono 1.0.1 installer incorrectly adds '\mono' to - "MonoConfigDir" registry value - --> - <if test="${string::ends-with(configDir, 'etc\mono')}"> - <property name="configDir" value="${string::replace(configDir, 'etc\mono', 'etc')}" /> - </if> - </if> - - <!-- determine if we're NOT dealing with a Mono 1.0.x release --> - <if test="${version::get-major(version::parse(mono.version)) != 1 or version::get-minor(version::parse(mono.version)) != 0}"> - <!-- - in Mono 1.1.x (and higher ?), all the framework - tools are located in the <install root>\lib\mono\<profile> - directory - however, for now only (g)mcs and wsdl2 are available - for the 2.0 profile, for the other tools we should - use the 1.0 profile version - --> - <!-- - <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" /> - <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" /> - --> - <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" /> - <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" /> - <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" /> - <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory --> - <if test="${not file::exists(runtimeEngine)}"> - <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" /> - </if> - <property name="resgen.tool" value="resgen" /> - <property name="csc.supportsdocgeneration" value="true" /> - </if> - - <target name="configure-from-pkg-config"> - <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" /> - <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" /> - <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" /> - <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc/mono')}/" /> - </target> - - <target name="configure-from-registry"> - <!-- - first try using the DefaultCLR in HKLM\Novell\Mono, - this is used by the Mono 1.0.1 installer (and later?) - --> - <readregistry - property="mono.version" - key="SOFTWARE\Novell\Mono\DefaultCLR" - hive="LocalMachine" - failonerror="false" - /> - <if test="${property::exists('mono.version')}"> <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" /> </if> ! <!-- if the DefaultCLR registry value does not exist in --- 726,734 ---- failonerror="false" /> <if test="${property::exists('mono.version')}"> <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" /> </if> ! <!-- if the DefaultCLR registry value does not exist in *************** *** 1153,1157 **** frameworkdirectory="${frameworkDirectory}" frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" ! clrversion="2.0.50727" > <task-assemblies> --- 981,985 ---- frameworkdirectory="${frameworkDirectory}" frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" ! clrversion="2.0.40607" > <task-assemblies> *************** *** 1242,1250 **** failonerror="false" /> ! <if test="${property::exists('mono.version')}"> <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" /> </if> ! <!-- if the DefaultCLR registry value does not exist in --- 1070,1078 ---- failonerror="false" /> ! <if test="${property::exists('mono.version')}"> <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" /> </if> ! <!-- if the DefaultCLR registry value does not exist in *************** *** 1461,1465 **** frameworkdirectory="${frameworkdirectory}" frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" ! clrversion="2.0.40607" > <task-assemblies> --- 1289,1293 ---- frameworkdirectory="${frameworkdirectory}" frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" ! clrversion="2.0.50727" > <task-assemblies> *************** *** 1617,1621 **** frameworkdirectory="${frameworkdirectory}" frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" ! clrversion="2.0.50727" > <task-assemblies> --- 1445,1449 ---- frameworkdirectory="${frameworkdirectory}" frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" ! clrversion="2.0.40607" > <task-assemblies> |