Author: msierad
Date: 2006-10-05 17:23:50 -0400 (Thu, 05 Oct 2006)
New Revision: 66320
Modified:
trunk/mcs/tools/xbuild/ChangeLog
trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
Log:
2006-09-05 Marek Sieradzki <[EMAIL PROTECTED]>
* xbuild/Microsoft.CSharp.targets: Make $(OutputPath) directory before
compiling and put output in this directory.
Modified: trunk/mcs/tools/xbuild/ChangeLog
===================================================================
--- trunk/mcs/tools/xbuild/ChangeLog 2006-10-05 20:24:53 UTC (rev 66319)
+++ trunk/mcs/tools/xbuild/ChangeLog 2006-10-05 21:23:50 UTC (rev 66320)
@@ -1,3 +1,8 @@
+2006-09-05 Marek Sieradzki <[EMAIL PROTECTED]>
+
+ * xbuild/Microsoft.CSharp.targets: Make $(OutputPath) directory before
+ compiling and put output in this directory.
+
2006-09-30 Marek Sieradzki <[EMAIL PROTECTED]>
* xbuild/Microsoft.CSharp.targets: Use new ResolveAssemblyReference
Modified: trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
===================================================================
--- trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-10-05
20:24:53 UTC (rev 66319)
+++ trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-10-05
21:23:50 UTC (rev 66320)
@@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+
<PropertyGroup>
<TargetExt Condition="'$(OutputType)' ==
'Winexe'">.exe</TargetExt>
<TargetExt Condition="'$(OutputType)' == 'Exe'">.exe</TargetExt>
@@ -8,12 +9,17 @@
<PropertyGroup>
<AllowUnsafeBlocks Condition="'$(AllowUnsafeBlocks)' ==
''">false</AllowUnsafeBlocks>
+ <AssemblyName Condition="'$(AssemblyName)' ==
''">$(RootNamespace)</AssemblyName>
+ <!--<OutputPath Condition="'$(OutputPath)' !=
''">$(OutputPath)\</OutputPath>-->
<WarningLevel Condition="'$(WarningLevel)' == ''"
>2</WarningLevel>
</PropertyGroup>
- <!-- We are passing references just as they are to Csc task. It can
only work with references like:
- System, System.Xml. (that exist in compiler's directory)
ResolveAssemblyReferences task should be given
- the references and should output list of .dll/.exe files that should be
passed to Csc task.-->
+ <Target Name="PrepareForBuild">
+ <MakeDir
+ Condition="'$(OutputPath)' != ''"
+ Directories="$(OutputPath)"
+ />
+ </Target>
<Target Name="ResolveAssemblyReferences">
<ResolveAssemblyReference
@@ -23,12 +29,12 @@
</ResolveAssemblyReference>
</Target>
- <Target Name="Build" DependsOnTargets="ResolveAssemblyReferences">
+ <Target Name="Build"
DependsOnTargets="PrepareForBuild;ResolveAssemblyReferences">
<Csc
AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
DefineConstants="$(DefineConstants)"
NoConfig="true"
- OutputAssembly="$(AssemblyName)$(TargetExt)"
+
OutputAssembly="$(OutputPath)$(AssemblyName)$(TargetExt)"
References="@(ResolvedFiles)"
Sources="@(Compile)"
TargetType="$(OutputType)"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
