* xbuild/Microsoft.Common.targets (BuildingResources): Refactor to

(PrepareResources): .. this.
(PrepareResourcesDependsOn): New.
(GetFrameworkPaths): Extract from PrepareForBuild target.

svn path=/trunk/mcs/; revision=155181

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index 6f864fda66f3004cb9303743d52b904e43d2ffad..2047fd8a9781f56ade197d1b6e97139a8d38468a 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-10  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/Microsoft.Common.targets (BuildingResources): Refactor to
+       (PrepareResources): .. this.
+       (PrepareResourcesDependsOn): New.
+       (GetFrameworkPaths): Extract from PrepareForBuild target.
+
 2010-04-08  Ankit Jain  <jankit@novell.com>
 
        * xbuild/Microsoft.VisualBasic.targets: Fix OutputAssembly

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
index 9d0c322d46b3e4c789486e3f8283bb23563fb5ef..3fb08e25e44e333d4f95020aeadc6c658ee8c0c3 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
@@ -89,7 +89,9 @@
                <MakeDir 
                        Directories="$(OutDir);$(IntermediateOutputPath)"
                />
+       </Target>
 
+       <Target Name="GetFrameworkPaths">
                <GetFrameworkPath>
                        <Output Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
                                TaskParameter="FrameworkVersion35Path"
@@ -256,11 +258,11 @@
        <PropertyGroup>
                <CoreBuildDependsOn>
                        PrepareForBuild;
+                       GetFrameworkPaths;
                        PreBuildEvent;
                        ResolveReferences;
                        CopyFilesMarkedCopyLocal;
-                       BuildResources;
-                       CompileLicxFiles;
+                       PrepareResources;
                        Compile;
                        PrepareForRun;
                        DeployOutputFiles;
@@ -303,9 +305,18 @@
        </PropertyGroup>
        <Target Name="PrepareForRun" DependsOnTargets="$(PrepareForRunDependsOn)"/>
 
-       <Target Name="BuildResources"
-               DependsOnTargets="AssignTargetPaths;SplitResourcesByCulture;CreateManifestResourceNames;CopyNonResxEmbeddedResources;GenerateResources;GenerateSatelliteAssemblies">
-       </Target>
+       <PropertyGroup>
+               <PrepareResourcesDependsOn>
+                       AssignTargetPaths;
+                       SplitResourcesByCulture;
+                       CreateManifestResourceNames;
+                       CopyNonResxEmbeddedResources;
+                       GenerateResources;
+                       GenerateSatelliteAssemblies;
+                       CompileLicxFiles
+               </PrepareResourcesDependsOn>
+       </PropertyGroup>
+       <Target Name="PrepareResources" DependsOnTargets="$(PrepareResourcesDependsOn)" />
 
        <Target Name="SplitResourcesByCulture" DependsOnTargets="AssignTargetPaths">
                <!-- Extract .licx files into @(LicxFiles) -->
@@ -443,7 +454,7 @@
        </Target>
 
        <Target Name="DeployOutputFiles"
-               DependsOnTargets="BuildResources;CoreCompile;_CopyDeployFilesToOutputDirectory;_CopyAppConfigFile">
+               DependsOnTargets="PrepareResources;CoreCompile;_CopyDeployFilesToOutputDirectory;_CopyAppConfigFile">
 
                <Copy 
                        SourceFiles="$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb"