Menu
▾
▴
[WiX-commits] wix/src/WixTasks ReplaceString.cs, NONE, 1.1 ResolveWixReferences.cs, 1.1, 1.2 WixTasks.csproj, 1.18, 1.19 wix.targets, 1.40, 1.41
|
From: Rob M. <ro...@us...> - 2009-05-22 11:07:31
|
Update of /cvsroot/wix/wix/src/WixTasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3912/src/WixTasks Modified Files: ResolveWixReferences.cs WixTasks.csproj wix.targets Added Files: ReplaceString.cs Log Message: BobArnso: Fix SFBug:2792525 - Missing punctuation in WixUI_en-us.wxs AaronSte: Remove VS WiX detection and blocking logic from WiX setup. EricStJ: SFBUG:2792176 - Do not use ConvertToAbsolutePath. BobArnso: Re-fix SFBug:2786736 - Conditionalize for MSBuild 2.0 gold in addition to 2.0 SPx and 3.5 EricStJ: SFBUG:2777114 - Replacing TargetPath and TargetPdbPath with tokens to enable delayed expansion of the properties. Modifying votive to use the tokens. Index: WixTasks.csproj =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/WixTasks.csproj,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** WixTasks.csproj 8 May 2009 09:33:52 -0000 1.18 --- WixTasks.csproj 22 May 2009 11:07:24 -0000 1.19 *************** *** 26,29 **** --- 26,30 ---- <Compile Include="heatfile.cs" /> <Compile Include="heatproject.cs" /> + <Compile Include="ReplaceString.cs" /> <Compile Include="ResolveWixReferences.cs" /> <Compile Include="WixAssignCulture.cs" /> Index: ResolveWixReferences.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/ResolveWixReferences.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResolveWixReferences.cs 8 May 2009 09:33:52 -0000 1.1 --- ResolveWixReferences.cs 22 May 2009 11:07:24 -0000 1.2 *************** *** 178,181 **** --- 178,184 ---- } + // Normalize the item path + resolvedReference.ItemSpec = resolvedReference.GetMetadata("FullPath"); + return resolvedReference; } --- NEW FILE: ReplaceString.cs --- (This appears to be a binary file; contents omitted.) Index: wix.targets =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/wix.targets,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wix.targets 15 May 2009 11:27:20 -0000 1.40 --- wix.targets 22 May 2009 11:07:24 -0000 1.41 *************** *** 94,101 **** <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> --- 94,101 ---- <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " /> <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> *************** *** 107,110 **** --- 107,111 ---- <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)"/> + <UsingTask TaskName="ReplaceString" AssemblyFile="$(WixTasksPath)"/> <!-- *************** *** 634,644 **** </ResolveWixReferences> - <!-- Normalize the paths to ensure remove duplicates catches everything --> - <ConvertToAbsolutePath Paths="@(_AllResolvedWixExtensionPaths)"> - <Output TaskParameter="AbsolutePaths" ItemName="_AllResolvedWixExtensionFullPaths" /> - </ConvertToAbsolutePath> - <!-- Remove duplicate extension items that would cause build errors --> ! <RemoveDuplicates Inputs="@(_AllResolvedWixExtensionFullPaths)"> <Output TaskParameter="Filtered" ItemName="_ResolvedWixExtensionPaths" /> </RemoveDuplicates> --- 635,640 ---- </ResolveWixReferences> <!-- Remove duplicate extension items that would cause build errors --> ! <RemoveDuplicates Inputs="@(_AllResolvedWixExtensionPaths)"> <Output TaskParameter="Filtered" ItemName="_ResolvedWixExtensionPaths" /> </RemoveDuplicates> *************** *** 653,657 **** --> <PropertyGroup> ! <PreBuildEventDependsOn></PreBuildEventDependsOn> </PropertyGroup> <Target --- 649,653 ---- --> <PropertyGroup> ! <PreBuildEventDependsOn>GetTargetPath</PreBuildEventDependsOn> </PropertyGroup> <Target *************** *** 660,664 **** Condition=" '$(PreBuildEvent)' != '' "> ! <Exec WorkingDirectory="$(OutDir)" Command="$(PreBuildEvent)" /> </Target> --- 656,676 ---- Condition=" '$(PreBuildEvent)' != '' "> ! <ReplaceString ! Text="$(PreBuildEvent)" ! OldValue="!(TargetPath)" ! NewValue="$(TargetPath)"> ! ! <Output TaskParameter="Text" PropertyName="ExpandedPreBuildEvent" /> ! </ReplaceString> ! ! <ReplaceString ! Text="$(ExpandedPreBuildEvent)" ! OldValue="!(TargetPdbPath)" ! NewValue="$(TargetPdbPath)"> ! ! <Output TaskParameter="Text" PropertyName="ExpandedPreBuildEvent" /> ! </ReplaceString> ! ! <Exec WorkingDirectory="$(OutDir)" Command="$(ExpandedPreBuildEvent)" /> </Target> *************** *** 894,900 **** ================================================================================================ --> <Target Name="GetTargetPath" ! DependsOnTargets="PrepareForBuild" Outputs="$(TargetPath)" /> --- 906,918 ---- ================================================================================================ --> + <PropertyGroup> + <GetTargetPathDependsOn> + PrepareForBuild; + AssignCultures + </GetTargetPathDependsOn> + </PropertyGroup> <Target Name="GetTargetPath" ! DependsOnTargets="$(GetTargetPathDependsOn)" Outputs="$(TargetPath)" /> *************** *** 945,948 **** --- 963,967 ---- <Error + Code="WIXTARGETS104" Text="MSBuild cannot resolve the reference to the Visual C++ project '%(VCProjectReference.Identity)' when building a stand-alone MSBuild project. To correctly resolve this reference, please build the solution file containing these projects." Condition=" '$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true' " /> *************** *** 1000,1011 **** <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixLibraryPaths" /> </ResolveWixReferences> ! ! <!-- Normalize the paths to ensure remove duplicates catches everything --> ! <ConvertToAbsolutePath Paths="@(_AllResolvedWixLibraryPaths)"> ! <Output TaskParameter="AbsolutePaths" ItemName="_AllResolvedWixLibraryFullPaths" /> ! </ConvertToAbsolutePath> ! <!-- Remove duplicate library items that would cause build errors --> ! <RemoveDuplicates Inputs="@(_AllResolvedWixLibraryFullPaths)"> <Output TaskParameter="Filtered" ItemName="_ResolvedWixLibraryPaths" /> </RemoveDuplicates> --- 1019,1025 ---- <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixLibraryPaths" /> </ResolveWixReferences> ! <!-- Remove duplicate library items that would cause build errors --> ! <RemoveDuplicates Inputs="@(_AllResolvedWixLibraryPaths)"> <Output TaskParameter="Filtered" ItemName="_ResolvedWixLibraryPaths" /> </RemoveDuplicates> *************** *** 1408,1412 **** ================================================================================================ --> ! <Target Name="AssignCultures"> <WixAssignCulture Cultures="$(Cultures)" --- 1422,1429 ---- ================================================================================================ --> ! <Target ! Name="AssignCultures" ! Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module')"> ! <WixAssignCulture Cultures="$(Cultures)" *************** *** 1850,1854 **** --> <PropertyGroup> ! <PostBuildEventDependsOn></PostBuildEventDependsOn> </PropertyGroup> <Target --- 1867,1871 ---- --> <PropertyGroup> ! <PostBuildEventDependsOn>GetTargetPath</PostBuildEventDependsOn> </PropertyGroup> <Target *************** *** 1858,1862 **** DependsOnTargets="$(PostBuildEventDependsOn)"> ! <Exec WorkingDirectory="$(OutDir)" Command="$(PostBuildEvent)" /> </Target> --- 1875,1895 ---- DependsOnTargets="$(PostBuildEventDependsOn)"> ! <ReplaceString ! Text="$(PostBuildEvent)" ! OldValue="!(TargetPath)" ! NewValue="$(TargetPath)"> ! ! <Output TaskParameter="Text" PropertyName="ExpandedPostBuildEvent" /> ! </ReplaceString> ! ! <ReplaceString ! Text="$(ExpandedPostBuildEvent)" ! OldValue="!(TargetPdbPath)" ! NewValue="$(TargetPdbPath)"> ! ! <Output TaskParameter="Text" PropertyName="ExpandedPostBuildEvent" /> ! </ReplaceString> ! ! <Exec WorkingDirectory="$(OutDir)" Command="$(ExpandedPostBuildEvent)" /> </Target> |