Author: msierad
Date: 2006-09-20 09:24:24 -0400 (Wed, 20 Sep 2006)
New Revision: 65710
Modified:
trunk/mcs/tools/xbuild/Makefile
trunk/mcs/tools/xbuild/README
trunk/mcs/tools/xbuild/tests/standalone/hello_world/test1.csproj
trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
Log:
2006-09-20 Marek Sieradzki <[EMAIL PROTECTED]>
* xbuild/Microsoft.CSharp.targets: Support AssemblyName and
WarningLevel.
Modified: trunk/mcs/tools/xbuild/Makefile
===================================================================
--- trunk/mcs/tools/xbuild/Makefile 2006-09-20 13:21:34 UTC (rev 65709)
+++ trunk/mcs/tools/xbuild/Makefile 2006-09-20 13:24:24 UTC (rev 65710)
@@ -16,6 +16,8 @@
$(INSTALL_DATA) xbuild/Microsoft.Common.tasks $(DESTDIR)$(EXTRAS_DIR)
$(INSTALL_DATA) xbuild/Microsoft.Build.xsd $(DESTDIR)$(EXTRAS_DIR)
$(INSTALL_DATA) xbuild/Microsoft.CSharp.targets $(DESTDIR)$(EXTRAS_DIR)
+ cp xbuild/Microsoft.CSharp.targets xbuild/Microsoft.CSharp.Targets
+ $(INSTALL_DATA) xbuild/Microsoft.CSharp.Targets $(DESTDIR)$(EXTRAS_DIR)
$(MKINSTALLDIRS) $(DESTDIR)$(EXTRAS_DIR)/MSBuild
$(INSTALL_DATA) xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd
$(DESTDIR)$(EXTRAS_DIR)/MSBuild
Modified: trunk/mcs/tools/xbuild/README
===================================================================
--- trunk/mcs/tools/xbuild/README 2006-09-20 13:21:34 UTC (rev 65709)
+++ trunk/mcs/tools/xbuild/README 2006-09-20 13:24:24 UTC (rev 65710)
@@ -5,7 +5,4 @@
Microsoft.Build.Tasks
Microsoft.Build.Utilities
-There are .targets files that can be used to build XBuild. To do it you must
have finished build in xbuild/bin/Debug.
-Microsoft.Build.csproj is not a regular VS2005 project.
-
It is licensed on MIT X11 license.
Modified: trunk/mcs/tools/xbuild/tests/standalone/hello_world/test1.csproj
===================================================================
--- trunk/mcs/tools/xbuild/tests/standalone/hello_world/test1.csproj
2006-09-20 13:21:34 UTC (rev 65709)
+++ trunk/mcs/tools/xbuild/tests/standalone/hello_world/test1.csproj
2006-09-20 13:24:24 UTC (rev 65710)
@@ -33,4 +33,4 @@
<Compile Include="AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
===================================================================
--- trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-09-20
13:21:34 UTC (rev 65709)
+++ trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-09-20
13:24:24 UTC (rev 65710)
@@ -1,11 +1,33 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <Target Name="GenerateFullAssemblyName">
+ <CreateProperty Value="$(AssemblyName).dll"
Condition="'$(OutputType)' == 'Library'" >
+ <Output TaskParameter="Value"
PropertyName="FullAssemblyName" />
+ </CreateProperty>
- <Target Name="Build">
+ <CreateProperty Value="$(AssemblyName).exe"
Condition="'$(OutputType)' == 'Exe'" >
+ <Output TaskParameter="Value"
PropertyName="FullAssemblyName" />
+ </CreateProperty>
+
+ <CreateProperty Value="$(AssemblyName).exe"
Condition="'$(OutputType)' == 'Winexe'" >
+ <Output TaskParameter="Value"
PropertyName="FullAssemblyName" />
+ </CreateProperty>
+ </Target>
+
+ <Target Name="AssignWarningLevel">
+ <CreateProperty Value="2" Condition="'$(WarningLevel)' == ''">
+ <Output TaskParameter="Value"
PropertyName="WarningLevel"/>
+ </CreateProperty>
+ </Target>
+
+
+ <Target Name="Build"
DependsOnTargets="GenerateFullAssemblyName;AssignWarningLevel" >
<Csc
DefineConstants="$(DefineConstants)"
+ OutputAssembly="$(FullAssemblyName)"
References="@(Reference)"
Sources="@(Compile)"
TargetType="$(OutputType)"
+ WarningLevel="$(WarningLevel)"
/>
</Target>
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
