Menu
▾
▴
[WiX-commits] wix/src/WixTasks Candle.cs,1.3,1.4 Lit.cs,1.2,1.3 wix.targets,1.2,1.3 wixtasks.build,1.2,1.3 wixtasks.net-2.0.build,1.1,1.2
|
From: Rob M. <ro...@us...> - 2006-01-18 10:52:29
|
Update of /cvsroot/wix/wix/src/WixTasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15800/src/WixTasks Modified Files: Candle.cs Lit.cs wix.targets wixtasks.build wixtasks.net-2.0.build Log Message: DerekC: - Fix a bug in the XsdGen code for special xml characters in comments. - Add decompiler support for the remaining standard MSI tables. - Fix the help information for dark/light/lit/candle for new short extension syntax. - Lots of other random little fixes. BobArnso: - Use whole sentences for localization, instead of building up sentences by using properties to specify different verbs and word forms, as many languages don't easily follow English word order. - Add ActionText/Template loc strings BobArnso: Add build requirements to WiX.chm, fixing sfbug:1318424. RobMen: Allow MIME to not be advertised independent of parent Extension. BobArnso: - UI fails with 2803 if you click the enabled modify button in maintenance mode - Add ARPNOMODIFY to WixUI_Minimal - Adjust MaintenanceTypeDlg modify text/button based on ARPNOMODIFY setting ScotK: Cleaning up server custom action memory allocation code and other stuff. BobArnson: Fix WixTasks build to copy wix.targets to output tree DerekC: Correctly modularize the RegLocator.Key and RemoveRegistry.Key columns. DerekC: Cleanup wix.xsd: - Remove minOccurs="1" and maxOccurs="1" (since they are the defaults). - Remove unnecessary mixed="true". - Remove unnecessary sequence from under the Fragment element. DerekC: Support grabbing binary registry keys in tallow. SBonev: Modify candle.exe to not compile the input files if -p is specified. This behavior is consisent with the current C/C++ compilers. DerekC: Fix invalid xml in a patching example inside wix.chm. DerekC: Remove the entry section id from wixout files since it is not used. This is a breaking change to the wixout file format. DerekC: Allow DocCompiler to correctly generate documentation for a deprecated element which does not specify a replacement element. RobMen: Add FeatureGroup and allow deeply nested FeatureGroups and ComponentGroups. DerekC: Make the Component/@Guid attribute mandatory. JohnLs: Fixes for the MSBuild related WixTasks.dll and wix.targets. SBonev: Modify the PreprocessorExtension to work with an XmlDocument instead of text. DerekC: Deprecate the FragmentRef element and support UIRef under UI. SBonev: Move CompilerCore.GetSourceLineNumbers to Preprocessor and make it static. Logically, this is a better place for it because the ln processing instructions are generated by the preprocessor. This also allows consumers other than compiler extensions, for example preprocessor extensions, to determine the source information for a given XmlNode. EdYoung: Change the compiler so that if a user specifies a multistring registry key, they actually get one, even if they only provide one or zero values to put in the value. BobArnso: Added instructions in "Building WiX" .CHM topic on modifying NAnt.exe.config to support .NET Framework 2.0. DerekC: Fix 2 bugs with registry identifier generation: 1. Registry keys may unintentionally collide if they share similar key and name values. For example a registry entry with a key ending with "EndOfKey" and name "Name" may collide with another entry with a key ending with "End" and name "OfKeyName". The problem is that the hashing algorithm does not insert a separator between the parts of the registry entry before hashing them. 2. Registry keys generated by COM registration will not appropriately collide with entries authored via Registry elements (if they should collide because they have identical component, root, key, and name values which differ only by case of the key or name). Before hashing the parts of the registry entry for Registry elements, the key and name parts were lowercased to ensure proper canonicalization. Unfortunately, the code for the COM elements like Class and ProgId did not canonicalize properly, so the identifier for two registry entries that are essentially identical may not collide (and thus provide the user with early feedback that an authoring error has occurred). Index: Lit.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/Lit.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Lit.cs 5 Dec 2005 22:52:41 -0000 1.2 --- Lit.cs 18 Jan 2006 10:50:51 -0000 1.3 *************** *** 157,161 **** commandLineBuilder.AppendIfTrue("-nologo", this.noLogo); ! commandLineBuilder.AppendSwitchIfNotNull("-out", this.outputFile); commandLineBuilder.AppendExtensions(this.extensions, this.Log); commandLineBuilder.AppendIfTrue("-ss", this.suppressSchemaValidation); --- 157,161 ---- commandLineBuilder.AppendIfTrue("-nologo", this.noLogo); ! commandLineBuilder.AppendSwitchIfNotNull("-out ", this.outputFile); commandLineBuilder.AppendExtensions(this.extensions, this.Log); commandLineBuilder.AppendIfTrue("-ss", this.suppressSchemaValidation); Index: Candle.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/Candle.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Candle.cs 5 Dec 2005 22:52:41 -0000 1.3 --- Candle.cs 18 Jan 2006 10:50:51 -0000 1.4 *************** *** 190,194 **** commandLineBuilder.AppendArrayIfNotNull("-I", this.includeSearchPaths); commandLineBuilder.AppendIfTrue("-nologo", this.noLogo); ! commandLineBuilder.AppendSwitchIfNotNull("-out", this.outputFile); commandLineBuilder.AppendIfTrue("-ss", this.suppressSchemaValidation); commandLineBuilder.AppendIfTrue("-ust", this.useSmallTableDefinitions); --- 190,194 ---- commandLineBuilder.AppendArrayIfNotNull("-I", this.includeSearchPaths); commandLineBuilder.AppendIfTrue("-nologo", this.noLogo); ! commandLineBuilder.AppendSwitchIfNotNull("-out ", this.outputFile); commandLineBuilder.AppendIfTrue("-ss", this.suppressSchemaValidation); commandLineBuilder.AppendIfTrue("-ust", this.useSmallTableDefinitions); Index: wixtasks.build =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/wixtasks.build,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wixtasks.build 5 Dec 2005 22:52:41 -0000 1.2 --- wixtasks.build 18 Jan 2006 10:50:51 -0000 1.3 *************** *** 6,12 **** </description> - <!-- Include the global build properties --> - <include buildfile="${environment::get-variable('SRCROOT')}\wix\wix.include" unless="${property::exists('wix.properties.defined')}" /> - <!-- ////////////////////////////////////////////////////////////////////////////////////////////////// --- 6,9 ---- *************** *** 47,51 **** <!-- Copy the .target file to the target directory --> ! <copy file="${wixtasks.file.wix.targets.source}" tofile="${wixtasks.file.wix.targets.source}" unless="${file::up-to-date(wixtasks.file.wix.targets.source, wixtasks.file.wix.targets.target)}" /> --- 44,48 ---- <!-- Copy the .target file to the target directory --> ! <copy file="${wixtasks.file.wix.targets.source}" tofile="${wixtasks.file.wix.targets.target}" unless="${file::up-to-date(wixtasks.file.wix.targets.source, wixtasks.file.wix.targets.target)}" /> Index: wixtasks.net-2.0.build =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/wixtasks.net-2.0.build,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wixtasks.net-2.0.build 5 Dec 2005 22:52:41 -0000 1.1 --- wixtasks.net-2.0.build 18 Jan 2006 10:50:51 -0000 1.2 *************** *** 18,24 **** </if> - <!-- Include the global build properties --> - <include buildfile="${environment::get-variable('SRCROOT')}\wix\wix.include" unless="${property::exists('wix.properties.defined')}" /> - <!-- ////////////////////////////////////////////////////////////////////////////////////////////////// --- 18,21 ---- Index: wix.targets =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/wix.targets,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wix.targets 20 Aug 2005 11:48:54 -0000 1.2 --- wix.targets 18 Jan 2006 10:50:51 -0000 1.3 *************** *** 1,216 **** <Project InitialTargets="CheckRequiredProperties" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ! <!-- Some properties must be set in the main project file, before using this .TARGETS file --> ! <Target ! Name="CheckRequiredProperties"> ! ! <Error Condition="'$(OutputName)'==''" ! Text="The "OutputName" property is not set in project "$(MSBuildProjectFile)". The OutputName defines the name of the output without a file extension. Please set this in the project file before the <Import> of the .Targets file."/> ! <Error Condition="'$(OutputType)'==''" ! Text="The "OutputType" property is not set in project "$(MSBuildProjectFile)". The OutputType defines whether an msi, merge module, or wix library is being built. Please set this in the project file before the <Import> of the .Targets file. Possible values are 'package', 'module', 'library', and 'object'."/> ! </Target> ! ! ! <UsingTask TaskName="Candle" AssemblyFile="wixtasks.dll" /> ! <UsingTask TaskName="Lit" AssemblyFile="wixtasks.dll" /> ! <UsingTask TaskName="Light" AssemblyFile="wixtasks.dll" /> ! <PropertyGroup> ! <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildBinPath)\Wix.targets</MSBuildAllProjects> ! </PropertyGroup> ! <!-- Define the default file extensions --> ! <PropertyGroup> ! <TargetExt Condition="'$(OutputType)'=='package'">.msi</TargetExt> ! <TargetExt Condition="'$(OutputType)'=='module'">.msm</TargetExt> ! <TargetExt Condition="'$(OutputType)'=='library'">.wixlib</TargetExt> ! <IntermediateExt Condition="'$(IntermediateExt)'==''">.wixobj</IntermediateExt> ! </PropertyGroup> ! <!-- Default output type and path properties --> ! <PropertyGroup> ! <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> ! <OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath> ! <OutDir>$(OutputPath)</OutDir> <!-- Example, bin\Debug\ --> ! <TargetName Condition=" '$(TargetName)' == '' ">$(OutputName)</TargetName> <!-- Example, MySetup --> ! <TargetFileName Condition=" '$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName><!-- Example, MySetup.msi --> ! <TargetPath Condition=" '$(TargetPath)' == '' ">$(OutDir)$(TargetFileName)</TargetPath> <!-- Example, bin\Debug\MySetup.msi --> ! <!-- Properties for the intermediate object output --> ! <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">obj\</BaseOutputPath> <!-- Example, obj\ --> ! <IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(BaseOutputPath)$(Configuration)\</IntermediateOutputPath><!-- Example, obj\Debug\ --> ! ! <!-- Specify the Candle .wixobj if it isn't defined. If there is not supposed to be object output (ie. Only linking), don't set the object output. --> ! <CompileObjOutput Condition=" '$(CompileObjOutput)' == '' And '$(NoObjOutputDefault)' != 'true' ">$(IntermediateOutputPath)$(OutputName)$(IntermediateExt)</CompileObjOutput><!-- Example, obj\Debug\MySetup.wixobj --> ! </PropertyGroup> ! <!-- Default Lib properties copied from the Compile properties. --> ! <PropertyGroup> ! <LibNoLogo Condition="'$(LibNoLogo)'==''">$(NoLogo)</LibNoLogo> ! <LibExtension Condition="'$(LibExtension)'==''">@(Extension)</LibExtension> ! <LibSuppressSchemaValidation Condition="'$(LibSuppressSchemaValidation)'==''">$(SuppressSchemaValidation)</LibSuppressSchemaValidation> ! <LibSuppressIntermediateFileVersionMatching Condition="'$(LibSuppressIntermediateFileVersionMatching)'==''">$(SuppressIntermediateFileVersionMatching)</LibSuppressIntermediateFileVersionMatching> ! <LibSuppressAllWarnings Condition="'$(LibSuppressAllWarnings)'==''">$(SuppressAllWarnings)</LibSuppressAllWarnings> ! <LibUseSmallTableDefinitions Condition="'$(LibUseSmallTableDefinitions)'==''">$(UseSmallTableDefinitions)</LibUseSmallTableDefinitions> ! <LibTreatWarningsAsErrors Condition="'$(LibTreatWarningsAsErrors)'==''">$(TreatWarningsAsErrors)</LibTreatWarningsAsErrors> ! <LibWarningLevel Condition="'$(LibWarningLevel)'==''">$(WarningLevel)</LibWarningLevel> ! <LibVerboseOutput Condition="'$(LibVerboseOutput)'==''">$(VerboseOutput)</LibVerboseOutput> ! <LibVerboseOutputLevel Condition="'$(LibVerboseOutputLevel)'==''">$(VerboseOutputLevel)</LibVerboseOutputLevel> ! </PropertyGroup> ! ! <!-- Default Linker properties copied from the Compile properties. --> ! <PropertyGroup> ! <LinkerNoLogo Condition="'$(LinkerNoLogo)'==''">$(NoLogo)</LinkerNoLogo> ! <LinkerExtension Condition="'$(LinkerExtension)'==''">@(Extension)</LinkerExtension> ! <LinkerSuppressSchemaValidation Condition="'$(LinkerSuppressSchemaValidation)'==''">$(SuppressSchemaValidation)</LinkerSuppressSchemaValidation> ! <LinkerSuppressIntermediateFileVersionMatching Condition="'$(LinkerSuppressIntermediateFileVersionMatching)'==''">$(SuppressIntermediateFileVersionMatching)</LinkerSuppressIntermediateFileVersionMatching> ! <LinkerSuppressAllWarnings Condition="'$(LinkerSuppressAllWarnings)'==''">$(SuppressAllWarnings)</LinkerSuppressAllWarnings> ! <LinkerUseSmallTableDefinitions Condition="'$(LinkerUseSmallTableDefinitions)'==''">$(UseSmallTableDefinitions)</LinkerUseSmallTableDefinitions> ! <LinkerTreatWarningsAsErrors Condition="'$(LinkerTreatWarningsAsErrors)'==''">$(TreatWarningsAsErrors)</LinkerTreatWarningsAsErrors> ! <LinkerWarningLevel Condition="'$(LinkerWarningLevel)'==''">$(WarningLevel)</LinkerWarningLevel> ! <LinkerVerboseOutput Condition="'$(LinkerVerboseOutput)'==''">$(VerboseOutput)</LinkerVerboseOutput> ! <LinkerVerboseOutputLevel Condition="'$(LinkerVerboseOutputLevel)'==''">$(VerboseOutputLevel)</LinkerVerboseOutputLevel> ! </PropertyGroup> ! <!-- Compile the wxs source. --> ! <PropertyGroup> ! <CompileDependsOn>PrepareForBuild</CompileDependsOn> ! </PropertyGroup> ! <Target ! Name="Compile" ! Inputs="@(Compile);$(MSBuildAllProjects)" ! Outputs="$(CompileObjOutput)" ! DependsOnTargets="$(CompileDependsOn)"> ! <Candle ! SourceFiles="@(Compile)" ! DefineConstants="$(DefineConstants)" ! PreprocessToStdOut="$(PreprocessToStdOut)" ! PreprocessToFile="$(PreprocessToFile)" ! IncludeSearchPaths="@(IncludeSearchPath)" ! NoLogo="$(NoLogo)" ! OutputFile="$(CompileObjOutput)" ! SuppressSchemaValidation="$(SuppressSchemaValidation)" ! UseSmallTableDefinitions="$(UseSmallTableDefinitions)" ! ShowSourceTrace="$(ShowSourceTrace)" ! Extensions="@(CompileExtension)" ! SuppressAllWarnings="$(SuppressAllWarnings)" ! TreatWarningsAsErrors="$(TreatWarningsAsErrors)" ! WarningLevel="$(WarningLevel)" ! VerboseOutput="$(VerboseOutput)" ! VerboseOutputLevel="$(VerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <PropertyGroup> ! <!-- Don't depend on the Compile task because Lib can be run from a different project than the compile. --> ! <LibDependsOn>PrepareForBuild</LibDependsOn> ! </PropertyGroup> ! <Target ! Name="Lib" ! Inputs="$(CompileObjOutput); ! @(WixObject); ! $(MSBuildAllProjects)" ! Outputs="$(OutDir)$(TargetFileName)" ! DependsOnTargets="$(LibDependsOn)" ! Condition=" '$(OutputType)' == 'library' "> ! <Lit ! ObjectFiles="@(WixObject);@(WixLibrary);$(CompileObjOutput)" ! NoLogo="$(LibNoLogo)" ! OutputFile="$(OutDir)$(TargetFileName)" ! Extensions="@(LibExtension)" ! SuppressSchemaValidation="$(LibSuppressSchemaValidation)" ! SuppressIntermediateFileVersionMatching="$(LibSuppressIntermediateFileVersionMatching)" ! SuppressAllWarnings="$(LibSuppressAllWarnings)" ! UseSmallTableDefinitions="$(LibUseSmallTableDefinitions)" ! TreatWarningsAsErrors="$(LibTreatWarningsAsErrors)" ! WarningLevel="$(LibWarningLevel)" ! VerboseOutput="$(LibVerboseOutput)" ! VerboseOutputLevel="$(LibVerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <PropertyGroup> ! <!-- Don't depend on the Compile task because Link can be run from a different project than the compile. --> ! <LinkDependsOn>PrepareForBuild</LinkDependsOn> ! </PropertyGroup> ! <Target ! Name="Link" ! Inputs="$(CompileObjOutput); ! @(WixObject); ! @(WixLibrary); ! $(MSBuildAllProjects)" ! Outputs="$(OutDir)$(TargetFileName)" ! DependsOnTargets="$(LinkDependsOn)" ! Condition=" '$(OutputType)'=='package' Or '$(OutputType)'=='module' "> ! <Light ! ObjectFiles="$(CompileObjOutput);@(WixObject);@(WixLibrary)" ! BaseInputPath="$(BaseInputPath)" ! CabinetCache="$(CabinetCache)" ! Extensions="@(LinkExtension)" ! BaseUncompressedImagesOutputPath="$(BaseUncompressedImagesOutputPath)" ! LocalizedStringFile="$(LocalizedStringFile)" ! NoLogo="$(LinkerNoLogo)" ! LeaveTemporaryFiles="$(LeaveTemporaryFiles)" ! ReuseCabinetCache="$(ReuseCabinetCache)" ! OutputFile="$(OutDir)$(TargetFileName)" ! OutputAsXml="$(OutputAsXml)" ! SuppressDefaultAdminSequenceActions="$(SuppressDefaultAdminSequenceActions)" ! SuppressDefaultAdvSequenceActions="$(SuppressDefaultAdvSequenceActions)" ! SuppressAssemblies="$(SuppressAssemblies)" ! SuppressFiles="$(SuppressFiles)" ! SuppressLayout="$(SuppressLayout)" ! SuppressSchemaValidation="$(LinkerSuppressSchemaValidation)" ! SuppressDefaultUISequenceActions="$(SuppressDefaultUISequenceActions)" ! SuppressIntermediateFileVersionMatching="$(LinkerSuppressIntermediateFileVersionMatching)" ! SuppressAllWarnings="$(LinkerSuppressAllWarnings)" ! UseSmallTableDefinitions="$(LinkerUseSmallTableDefinitions)" ! TreatWarningsAsErrors="$(LinkerTreatWarningsAsErrors)" ! WarningLevel="$(LinkerWarningLevel)" ! VerboseOutput="$(LinkerVerboseOutput)" ! VerboseOutputLevel="$(LinkerVerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <!-- Make the build directories. --> ! <Target ! Name="PrepareForBuild"> ! <MakeDir Directories="$(IntermediateOutputPath);$(OutDir)"/> ! </Target> ! <PropertyGroup> ! <BuildDependsOn>PrepareForBuild;Compile;Link</BuildDependsOn> ! </PropertyGroup> ! <Target ! Name="Build" ! DependsOnTargets="$(BuildDependsOn)"> ! </Target> ! <PropertyGroup> ! <RebuildDependsOn>Clean;Build</RebuildDependsOn> ! </PropertyGroup> ! <Target ! Name="Rebuild" ! DependsOnTargets="$(RebuildDependsOn)"> ! </Target> ! <!-- Clean task --> ! <PropertyGroup> ! <CleanDependsOn></CleanDependsOn> ! </PropertyGroup> ! <Target ! Name="Clean" ! DependsOnTargets="$(CleanDependsOn)"> ! <Delete Files= ! "$(OutDir)$(TargetFileName); ! $(CompileObjOutput)"/> ! </Target> </Project> --- 1,212 ---- <Project InitialTargets="CheckRequiredProperties" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ! <!-- Some properties must be set in the main project file, before using this .TARGETS file --> ! <Target Name="CheckRequiredProperties"> ! <Error Condition="'$(OutputName)'==''" ! Text="The "OutputName" property is not set in project "$(MSBuildProjectFile)". The OutputName defines the name of the output without a file extension. Please set this in the project file before the <Import> of the .Targets file."/> ! <Error Condition="'$(OutputType)'==''" ! Text="The "OutputType" property is not set in project "$(MSBuildProjectFile)". The OutputType defines whether an msi, merge module, or wix library is being built. Please set this in the project file before the <Import> of the .Targets file. Possible values are 'package', 'module', 'library', and 'object'."/> ! </Target> ! <UsingTask TaskName="Candle" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\wixtasks.dll" /> ! <UsingTask TaskName="Lit" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\wixtasks.dll" /> ! <UsingTask TaskName="Light" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\wixtasks.dll" /> ! <!-- This makes the project files a dependency of all targets so that things rebuild if they change --> ! <PropertyGroup> ! <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</MSBuildAllProjects> ! </PropertyGroup> ! <!-- Define the default file extensions --> ! <PropertyGroup> ! <TargetExt Condition="'$(OutputType)'=='package'">.msi</TargetExt> ! <TargetExt Condition="'$(OutputType)'=='module'">.msm</TargetExt> ! <TargetExt Condition="'$(OutputType)'=='library'">.wixlib</TargetExt> ! <IntermediateExt Condition="'$(IntermediateExt)'==''">.wixobj</IntermediateExt> ! </PropertyGroup> ! <!-- Default output type and path properties --> ! <PropertyGroup> ! <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> ! <OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath> ! <OutDir>$(OutputPath)</OutDir> <!-- Example, bin\Debug\ --> ! <TargetName Condition=" '$(TargetName)' == '' ">$(OutputName)</TargetName> <!-- Example, MySetup --> ! <TargetFileName Condition=" '$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName><!-- Example, MySetup.msi --> ! <TargetPath Condition=" '$(TargetPath)' == '' ">$(OutDir)$(TargetFileName)</TargetPath> <!-- Example, bin\Debug\MySetup.msi --> ! <!-- Properties for the intermediate object output --> ! <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">obj\</BaseOutputPath> <!-- Example, obj\ --> ! <IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(BaseOutputPath)$(Configuration)\</IntermediateOutputPath><!-- Example, obj\Debug\ --> ! <CompileObjOutput Condition="$(CompileObjOutput) == ''">@(Compile->'$(IntermediateOutputPath)%(Filename)$(IntermediateExt)')</CompileObjOutput> <!-- Example, obj\Debug\MySetup.wixobj --> ! </PropertyGroup> ! <!-- Default Lib properties copied from the Compile properties. --> ! <PropertyGroup> ! <LibNoLogo Condition="'$(LibNoLogo)'==''">$(NoLogo)</LibNoLogo> ! <LibExtension Condition="'$(LibExtension)'==''">@(Extension)</LibExtension> ! <LibSuppressSchemaValidation Condition="'$(LibSuppressSchemaValidation)'==''">$(SuppressSchemaValidation)</LibSuppressSchemaValidation> ! <LibSuppressIntermediateFileVersionMatching Condition="'$(LibSuppressIntermediateFileVersionMatching)'==''">$(SuppressIntermediateFileVersionMatching)</LibSuppressIntermediateFileVersionMatching> ! <LibSuppressAllWarnings Condition="'$(LibSuppressAllWarnings)'==''">$(SuppressAllWarnings)</LibSuppressAllWarnings> ! <LibUseSmallTableDefinitions Condition="'$(LibUseSmallTableDefinitions)'==''">$(UseSmallTableDefinitions)</LibUseSmallTableDefinitions> ! <LibTreatWarningsAsErrors Condition="'$(LibTreatWarningsAsErrors)'==''">$(TreatWarningsAsErrors)</LibTreatWarningsAsErrors> ! <LibWarningLevel Condition="'$(LibWarningLevel)'==''">$(WarningLevel)</LibWarningLevel> ! <LibVerboseOutput Condition="'$(LibVerboseOutput)'==''">$(VerboseOutput)</LibVerboseOutput> ! <LibVerboseOutputLevel Condition="'$(LibVerboseOutputLevel)'==''">$(VerboseOutputLevel)</LibVerboseOutputLevel> ! </PropertyGroup> ! ! <!-- Default Linker properties copied from the Compile properties. --> ! <PropertyGroup> ! <LinkerNoLogo Condition="'$(LinkerNoLogo)'==''">$(NoLogo)</LinkerNoLogo> ! <LinkerExtension Condition="'$(LinkerExtension)'==''">@(Extension)</LinkerExtension> ! <LinkerSuppressSchemaValidation Condition="'$(LinkerSuppressSchemaValidation)'==''">$(SuppressSchemaValidation)</LinkerSuppressSchemaValidation> ! <LinkerSuppressIntermediateFileVersionMatching Condition="'$(LinkerSuppressIntermediateFileVersionMatching)'==''">$(SuppressIntermediateFileVersionMatching)</LinkerSuppressIntermediateFileVersionMatching> ! <LinkerSuppressAllWarnings Condition="'$(LinkerSuppressAllWarnings)'==''">$(SuppressAllWarnings)</LinkerSuppressAllWarnings> ! <LinkerUseSmallTableDefinitions Condition="'$(LinkerUseSmallTableDefinitions)'==''">$(UseSmallTableDefinitions)</LinkerUseSmallTableDefinitions> ! <LinkerTreatWarningsAsErrors Condition="'$(LinkerTreatWarningsAsErrors)'==''">$(TreatWarningsAsErrors)</LinkerTreatWarningsAsErrors> ! <LinkerWarningLevel Condition="'$(LinkerWarningLevel)'==''">$(WarningLevel)</LinkerWarningLevel> ! <LinkerVerboseOutput Condition="'$(LinkerVerboseOutput)'==''">$(VerboseOutput)</LinkerVerboseOutput> ! <LinkerVerboseOutputLevel Condition="'$(LinkerVerboseOutputLevel)'==''">$(VerboseOutputLevel)</LinkerVerboseOutputLevel> ! </PropertyGroup> ! <!-- Compile the wxs source. --> ! <PropertyGroup> ! <CompileDependsOn>PrepareForBuild</CompileDependsOn> ! </PropertyGroup> ! <Target ! Name="Compile" ! Inputs="@(Compile);$(MSBuildAllProjects)" ! Outputs="$(IntermediateOutputPath)%(Compile.Filename).$(IntermediateExt)" ! DependsOnTargets="$(CompileDependsOn)" ! Condition="@(Compile) != ''"> ! <Candle ! SourceFiles="@(Compile)" ! DefineConstants="$(DefineConstants)" ! PreprocessToStdOut="$(PreprocessToStdOut)" ! PreprocessToFile="$(PreprocessToFile)" ! IncludeSearchPaths="@(IncludeSearchPath)" ! NoLogo="$(NoLogo)" ! OutputFile="$(CompileObjOutput)" ! SuppressSchemaValidation="$(SuppressSchemaValidation)" ! UseSmallTableDefinitions="$(UseSmallTableDefinitions)" ! ShowSourceTrace="$(ShowSourceTrace)" ! Extensions="@(CompileExtension)" ! SuppressAllWarnings="$(SuppressAllWarnings)" ! TreatWarningsAsErrors="$(TreatWarningsAsErrors)" ! WarningLevel="$(WarningLevel)" ! VerboseOutput="$(VerboseOutput)" ! VerboseOutputLevel="$(VerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <PropertyGroup> ! <!-- Don't depend on the Compile task because Lib can be run from a different project than the compile. --> ! <LibDependsOn>PrepareForBuild</LibDependsOn> ! </PropertyGroup> ! <Target ! Name="Lib" ! Inputs="$(CompileObjOutput); ! @(WixObject); ! $(MSBuildAllProjects)" ! Outputs="$(OutDir)$(TargetFileName)" ! DependsOnTargets="$(LibDependsOn)" ! Condition=" '$(OutputType)' == 'library' "> ! <Lit ! ObjectFiles="@(WixObject);@(WixLibrary);$(CompileObjOutput)" ! NoLogo="$(LibNoLogo)" ! OutputFile="$(OutDir)$(TargetFileName)" ! Extensions="@(LibExtension)" ! SuppressSchemaValidation="$(LibSuppressSchemaValidation)" ! SuppressIntermediateFileVersionMatching="$(LibSuppressIntermediateFileVersionMatching)" ! SuppressAllWarnings="$(LibSuppressAllWarnings)" ! UseSmallTableDefinitions="$(LibUseSmallTableDefinitions)" ! TreatWarningsAsErrors="$(LibTreatWarningsAsErrors)" ! WarningLevel="$(LibWarningLevel)" ! VerboseOutput="$(LibVerboseOutput)" ! VerboseOutputLevel="$(LibVerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <PropertyGroup> ! <!-- Don't depend on the Compile task because Link can be run from a different project than the compile. --> ! <LinkDependsOn>PrepareForBuild</LinkDependsOn> ! </PropertyGroup> ! <Target ! Name="Link" ! Inputs="$(CompileObjOutput); ! @(WixObject); ! @(WixLibrary); ! $(MSBuildAllProjects)" ! Outputs="$(OutDir)$(TargetFileName)" ! DependsOnTargets="$(LinkDependsOn)" ! Condition=" '$(OutputType)'=='package' Or '$(OutputType)'=='module' "> ! <Light ! ObjectFiles="$(CompileObjOutput);@(WixObject);@(WixLibrary)" ! BaseInputPath="$(BaseInputPath)" ! CabinetCache="$(CabinetCache)" ! Extensions="@(LinkExtension)" ! BaseUncompressedImagesOutputPath="$(BaseUncompressedImagesOutputPath)" ! LocalizedStringFile="$(LocalizedStringFile)" ! NoLogo="$(LinkerNoLogo)" ! LeaveTemporaryFiles="$(LeaveTemporaryFiles)" ! ReuseCabinetCache="$(ReuseCabinetCache)" ! OutputFile="$(OutDir)$(TargetFileName)" ! OutputAsXml="$(OutputAsXml)" ! SuppressDefaultAdminSequenceActions="$(SuppressDefaultAdminSequenceActions)" ! SuppressDefaultAdvSequenceActions="$(SuppressDefaultAdvSequenceActions)" ! SuppressAssemblies="$(SuppressAssemblies)" ! SuppressFiles="$(SuppressFiles)" ! SuppressLayout="$(SuppressLayout)" ! SuppressSchemaValidation="$(LinkerSuppressSchemaValidation)" ! SuppressDefaultUISequenceActions="$(SuppressDefaultUISequenceActions)" ! SuppressIntermediateFileVersionMatching="$(LinkerSuppressIntermediateFileVersionMatching)" ! SuppressAllWarnings="$(LinkerSuppressAllWarnings)" ! UseSmallTableDefinitions="$(LinkerUseSmallTableDefinitions)" ! TreatWarningsAsErrors="$(LinkerTreatWarningsAsErrors)" ! WarningLevel="$(LinkerWarningLevel)" ! VerboseOutput="$(LinkerVerboseOutput)" ! VerboseOutputLevel="$(LinkerVerboseOutputLevel)" ! ToolPath="$(ToolPath)" ! /> ! </Target> ! <!-- Make the build directories. --> ! <Target ! Name="PrepareForBuild"> ! <MakeDir Directories="$(IntermediateOutputPath);$(OutDir)"/> ! </Target> ! <PropertyGroup> ! <BuildDependsOn>PrepareForBuild;Compile;Link</BuildDependsOn> ! </PropertyGroup> ! <Target ! Name="Build" ! DependsOnTargets="$(BuildDependsOn)"> ! </Target> ! <PropertyGroup> ! <RebuildDependsOn>Clean;Build</RebuildDependsOn> ! </PropertyGroup> ! <Target ! Name="Rebuild" ! DependsOnTargets="$(RebuildDependsOn)"> ! </Target> ! <!-- Clean task --> ! <PropertyGroup> ! <CleanDependsOn></CleanDependsOn> ! </PropertyGroup> ! <Target ! Name="Clean" ! DependsOnTargets="$(CleanDependsOn)"> ! <Delete Files= ! "$(OutDir)$(TargetFileName); ! $(CompileObjOutput)"/> ! </Target> </Project> |