Author: msierad
Date: 2006-12-11 18:04:56 -0500 (Mon, 11 Dec 2006)
New Revision: 69371
Added:
trunk/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
Modified:
trunk/mcs/tools/xbuild/ChangeLog
trunk/mcs/tools/xbuild/Makefile
trunk/mcs/tools/xbuild/tests/standalone/0001.csproj
trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
Log:
2006-12-12 Marek Sieradzki <[EMAIL PROTECTED]>
* xbuild/Microsoft.Common.targets: Added.
* xbuild/Microsoft.CSharp.targets: Move common part to
Microsoft.Common.targets.
Modified: trunk/mcs/tools/xbuild/ChangeLog
===================================================================
--- trunk/mcs/tools/xbuild/ChangeLog 2006-12-11 23:02:59 UTC (rev 69370)
+++ trunk/mcs/tools/xbuild/ChangeLog 2006-12-11 23:04:56 UTC (rev 69371)
@@ -1,3 +1,10 @@
+2006-12-12 Marek Sieradzki <[EMAIL PROTECTED]>
+
+ * xbuild/Microsoft.Common.targets: Added.
+
+ * xbuild/Microsoft.CSharp.targets: Move common part to
+ Microsoft.Common.targets.
+
2006-12-11 Marek Sieradzki <[EMAIL PROTECTED]>
* xbuild/Microsoft.Common.tasks: Fix a typo (GetFrameworkPath).
Modified: trunk/mcs/tools/xbuild/Makefile
===================================================================
--- trunk/mcs/tools/xbuild/Makefile 2006-12-11 23:02:59 UTC (rev 69370)
+++ trunk/mcs/tools/xbuild/Makefile 2006-12-11 23:04:56 UTC (rev 69371)
@@ -16,7 +16,7 @@
$(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)
-# $(INSTALL_DATA) xbuild/Microsoft.Common.targets $(DESTDIR)$(EXTRAS_DIR)
+ $(INSTALL_DATA) xbuild/Microsoft.Common.targets $(DESTDIR)$(EXTRAS_DIR)
# cp xbuild/Microsoft.CSharp.targets xbuild/Microsoft.CSharp.Targets
# $(INSTALL_DATA) xbuild/Microsoft.CSharp.Targets $(DESTDIR)$(EXTRAS_DIR)
@@ -29,5 +29,6 @@
xbuild/Microsoft.Common.tasks \
xbuild/Microsoft.Build.xsd \
xbuild/Microsoft.CSharp.targets \
+ xbuild/Microsoft.Common.targets \
xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd \
xbuild/MSBuild/Microsoft.Build.Core.xsd
Modified: trunk/mcs/tools/xbuild/tests/standalone/0001.csproj
===================================================================
--- trunk/mcs/tools/xbuild/tests/standalone/0001.csproj 2006-12-11 23:02:59 UTC
(rev 69370)
+++ trunk/mcs/tools/xbuild/tests/standalone/0001.csproj 2006-12-11 23:04:56 UTC
(rev 69371)
@@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";
DefaultTargets="Main" >
<Target Name="Main" >
- <Message Text="test" Condition="@(A, '@(B)') == $(Prop1)" />
+ <Message Text="test" Condition="false or true" />
</Target>
</Project>
Modified: trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
===================================================================
--- trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-12-11
23:02:59 UTC (rev 69370)
+++ trunk/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets 2006-12-11
23:04:56 UTC (rev 69371)
@@ -1,46 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <!-- xbuild Import support is flawed so we need to put everything
into one file. -->
- <!-- COMMON -->
-
<PropertyGroup>
- <TargetExt Condition="'$(OutputType)' ==
'Winexe'">.exe</TargetExt>
- <TargetExt Condition="'$(OutputType)' == 'Exe'">.exe</TargetExt>
- <TargetExt Condition="'$(OutputType)' ==
'Library'">.dll</TargetExt>
- <TargetExt Condition="'$(OutputType)' ==
'Netmodule'">.netmodule</TargetExt>
- </PropertyGroup>
-
- <PropertyGroup>
- <AllowUnsafeBlocks Condition="'$(AllowUnsafeBlocks)' ==
''">false</AllowUnsafeBlocks>
- <AssemblyName Condition="'$(AssemblyName)' ==
''">$(RootNamespace)</AssemblyName>
- <!--<OutputPath Condition="'$(OutputPath)' !=
''">$(OutputPath)\</OutputPath>-->
- <WarningLevel Condition="'$(WarningLevel)' == ''"
>2</WarningLevel>
- </PropertyGroup>
-
- <Target Name="PrepareForBuild">
- <Message Importance="High" Text="Configuration:
$(Configuration) Platform: $(Platform)"/>
-
- <MakeDir
- Condition="'$(OutputPath)' != ''"
- Directories="$(OutputPath)"
- />
- </Target>
-
- <Target Name="ResolveAssemblyReferences">
- <ResolveAssemblyReference
- Assemblies="@(Reference)"
- SearchPaths=" "
- >
- <Output TaskParameter="ResolvedFiles"
ItemName="ResolvedFiles"/>
- </ResolveAssemblyReference>
- </Target>
-
- <Target Name="Build"
DependsOnTargets="PrepareForBuild;ResolveAssemblyReferences;CoreCompile"/>
-
- <!-- END OF COMMON -->
-
-
- <PropertyGroup>
<DefaultLanguageSourceExtension>.cs</DefaultLanguageSourceExtension>
<Language>C#</Language>
</PropertyGroup>
@@ -104,4 +64,6 @@
</Target>
+ <Import Project="Microsoft.Common.targets" />
+
</Project>
Added: trunk/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
===================================================================
--- trunk/mcs/tools/xbuild/xbuild/Microsoft.Common.targets 2006-12-11
23:02:59 UTC (rev 69370)
+++ trunk/mcs/tools/xbuild/xbuild/Microsoft.Common.targets 2006-12-11
23:04:56 UTC (rev 69371)
@@ -0,0 +1,37 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+
+ <PropertyGroup>
+ <TargetExt Condition="'$(OutputType)' ==
'Winexe'">.exe</TargetExt>
+ <TargetExt Condition="'$(OutputType)' == 'Exe'">.exe</TargetExt>
+ <TargetExt Condition="'$(OutputType)' ==
'Library'">.dll</TargetExt>
+ <TargetExt Condition="'$(OutputType)' ==
'Netmodule'">.netmodule</TargetExt>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <AllowUnsafeBlocks Condition="'$(AllowUnsafeBlocks)' ==
''">false</AllowUnsafeBlocks>
+ <AssemblyName Condition="'$(AssemblyName)' ==
''">$(RootNamespace)</AssemblyName>
+ <!--<OutputPath Condition="'$(OutputPath)' !=
''">$(OutputPath)\</OutputPath>-->
+ <WarningLevel Condition="'$(WarningLevel)' == ''"
>2</WarningLevel>
+ </PropertyGroup>
+
+ <Target Name="PrepareForBuild">
+ <Message Importance="High" Text="Configuration:
$(Configuration) Platform: $(Platform)"/>
+
+ <MakeDir
+ Condition="'$(OutputPath)' != ''"
+ Directories="$(OutputPath)"
+ />
+ </Target>
+
+ <Target Name="ResolveAssemblyReferences">
+ <ResolveAssemblyReference
+ Assemblies="@(Reference)"
+ SearchPaths=" "
+ >
+ <Output TaskParameter="ResolvedFiles"
ItemName="ResolvedFiles"/>
+ </ResolveAssemblyReference>
+ </Target>
+
+ <Target Name="Build"
DependsOnTargets="PrepareForBuild;ResolveAssemblyReferences;CoreCompile"/>
+
+</Project>
Property changes on: trunk/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
