Menu
▾
▴
[nant-commits] CVS: nant/src/NAnt.Console App.config,1.10,1.11
|
From: Gert D. <dri...@us...> - 2005-11-09 20:11:01
|
Update of /cvsroot/nant/nant/src/NAnt.Console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30457/src/NAnt.Console Modified Files: App.config Log Message: Mono's CLR version for the 2.0 profile has now also been update to match .NET 2.0 RTM. Index: App.config =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Console/App.config,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** App.config 5 Nov 2005 09:13:25 -0000 1.10 --- App.config 9 Nov 2005 20:10:51 -0000 1.11 *************** *** 881,884 **** --- 881,1178 ---- </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> + <!-- + first try using the DefaultCLR in HKLM\Novell\Mono, + this is used by the Mono 1.0.1 installer (and later?) + --> + <readregistry + property="defaultCLR" + key="SOFTWARE\Novell\Mono\DefaultCLR" + hive="LocalMachine" + failonerror="false" + /> + + <if test="${property::exists('defaultCLR')}"> + <property name="monokey" value="SOFTWARE\Novell\Mono\${defaultCLR}" /> + </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('defaultCLR')}"> + <readregistry + property="defaultCLR" + key="SOFTWARE\Mono\DefaultCLR" + hive="LocalMachine" + /> + <property name="monokey" value="SOFTWARE\Mono\${defaultCLR}" /> + </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" /> + + <!-- determine if we're dealing with a Mono 1.0.x release --> + <if test="${version::get-major(version::parse(defaultCLR)) == 1 and version::get-minor(version::parse(defaultCLR)) == 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(defaultCLR)) != 1 or version::get-minor(version::parse(defaultCLR)) != 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> + </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> + </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.50727" + > + <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> + <!-- + first try using the DefaultCLR in HKLM\Novell\Mono, + this is used by the Mono 1.0.1 installer (and later?) + --> + <readregistry + property="defaultCLR" + key="SOFTWARE\Novell\Mono\DefaultCLR" + hive="LocalMachine" + failonerror="false" + /> + + <if test="${property::exists('defaultCLR')}"> + <property name="monokey" value="SOFTWARE\Novell\Mono\${defaultCLR}" /> + </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('defaultCLR')}"> + <readregistry + property="defaultCLR" + key="SOFTWARE\Mono\DefaultCLR" + hive="LocalMachine" + /> + <property name="monokey" value="SOFTWARE\Mono\${defaultCLR}" /> + </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" /> + + <!-- determine if we're dealing with a Mono 1.0.x release --> + <if test="${version::get-major(version::parse(defaultCLR)) == 1 and version::get-minor(version::parse(defaultCLR)) == 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(defaultCLR)) != 1 or version::get-minor(version::parse(defaultCLR)) != 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> + </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> + </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="sscli-1.0" family="sscli" *************** *** 1166,1169 **** --- 1460,1539 ---- </tasks> </framework> + <framework + name="mono-2.0" + family="mono" + version="2.0" + description="Mono 2.0 Profile" + runtimeengine="${path::combine(prefix, 'bin/mono')}" + sdkdirectory="${frameworkdirectory}" + frameworkdirectory="${frameworkdirectory}" + frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" + clrversion="2.0.50727" + > + <task-assemblies> + <!-- include Mono specific assemblies --> + <include name="tasks/mono/*.dll" /> + <!-- include Mono 2.0 specific assemblies --> + <include name="tasks/mono/2.0/**/*.dll" /> + </task-assemblies> + <project> + <if test="${not pkg-config::exists('mono')}"> + <fail>Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.</fail> + </if> + <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" /> + <if test="${not(pkg-config::is-atleast-version('mono', '1.1'))}"> + <property name="frameworkdirectory" value="${path::combine(prefix, 'bin')}" /> + <property name="resgen.tool" value="monoresgen" /> + <property name="csc.supportsdocgeneration" value="false" /> + </if> + <if test="${pkg-config::is-atleast-version('mono', '1.1')}"> + <!-- + 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(prefix, 'lib/mono/1.0')}" /> + <property name="resgen.tool" value="resgen" /> + <property name="csc.supportsdocgeneration" value="true" /> + </if> + </project> + <tasks> + <task name="al"> + <attribute name="exename">al</attribute> + <attribute name="useruntimeengine">true</attribute> + </task> + <task name="csc"> + <attribute name="exename">${path::combine(prefix, 'lib/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> + </task> + <task name="vbc"> + <!-- there is no mbas for the 2.0 profile yet --> + <attribute name="exename">${path::combine(prefix, 'lib/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> </platform> </frameworks> |