Cleanup white space.

Author: Sibras

README.md

@@ -7,19 +7,6 @@ VSNASM
 [![license](https://img.shields.io/github/license/ShiftMediaProject/VSNASM.svg)](https://github.com/ShiftMediaProject/VSNASM)
 [![donate](https://img.shields.io/badge/donate-link-brightgreen.svg)](https://shiftmediaproject.github.io/8-donate/)
 
-## New Version 2.0
-
-### Major Update with Parallel Build Support
-
-**Changes**
-
-- Added support for PARALLEL NASM builds
-- Proper change detection for NASM files  
-  (rebuilds when the NASM file or its dependencies have changed)
-- Incremental Builds working reliably
-- Clean is working properly
-  (doesn't start building NASM files when you clean the project)
-
 ## About
 
 This project provides a set of build customisations that can be used within Visual Studio to compile assembly code using NASM.

nasm.targets

@@ -7,77 +7,64 @@
       <Targets>_NASM</Targets>
     </AvailableItemName>
   </ItemGroup>
-
   <PropertyGroup>
     <ComputeLinkInputsTargets>
       $(ComputeLinkInputsTargets);
       ComputeNASMOutput;
     </ComputeLinkInputsTargets>
   </PropertyGroup>
-
   <PropertyGroup>
     <ComputeLibInputsTargets>
       $(ComputeLibInputsTargets);
       ComputeNASMOutput;
     </ComputeLibInputsTargets>
   </PropertyGroup>
-
   <PropertyGroup>
     <ComputeImpLibInputsTargets>
       $(ComputeImpLibInputsTargets);
       ComputeNASMOutput;
     </ComputeImpLibInputsTargets>
   </PropertyGroup>
-  
   <UsingTask
     TaskName="NASM"
     TaskFactory="XamlTaskFactory"
     AssemblyName="Microsoft.Build.Tasks.v4.0">
     <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
   </UsingTask>
-
   <!-- *******************************************************************************************
         NASM
        ******************************************************************************************* -->
-
   <PropertyGroup Condition="'$(NASMAfterTargets)'!='' or '$(NASMBeforeTargets)'!=''">
     <NASMToolBeforeTargets>$(NASMBeforeTargets)</NASMToolBeforeTargets>
     <NASMToolAfterTargets>$(NASMAfterTargets)</NASMToolAfterTargets>
   </PropertyGroup>
-
   <!--If no before/after targets are set, then set the default-->
   <PropertyGroup Condition="'$(NASMAfterTargets)'=='' and '$(NASMBeforeTargets)'==''">
     <NASMToolBeforeTargets>Midl</NASMToolBeforeTargets>
     <NASMToolAfterTargets>PreBuildEvent</NASMToolAfterTargets>
     <NASMBeforeTargets>PostBuildEvent</NASMBeforeTargets>
     <NASMAfterTargets>BscMake</NASMAfterTargets>
   </PropertyGroup>
-
   <!--  If Selective File Build is enabled, then dont let custom interupt the build order-->
   <PropertyGroup Condition="'$(SelectedFiles)'!=''">
     <NASMToolBeforeTargets></NASMToolBeforeTargets>
     <NASMToolAfterTargets></NASMToolAfterTargets>
     <NASMBeforeTargets></NASMBeforeTargets>
     <NASMAfterTargets></NASMAfterTargets>
   </PropertyGroup>
-  
   <Target Name="_NASM"
           BeforeTargets="$(NASMToolBeforeTargets)"
           AfterTargets="$(NASMToolAfterTargets)"
           DependsOnTargets="SelectNASM;ComputeNASMOutput">
-
     <PropertyGroup>
       <CustomBuildToolArchitecture Condition="'$(CustomBuildToolArchitecture)' == ''">Native32Bit</CustomBuildToolArchitecture>
     </PropertyGroup>
-
     <ItemGroup>
       <NASM Update="@(NASM)">
         <Inputs>%(NASM.FullPath);%(NASM.AdditionalDependencies);$(MSBuildProjectFile)</Inputs>
         <AdditionalInputs>%(NASM.FullPath);%(NASM.AdditionalDependencies);$(MSBuildProjectFile)</AdditionalInputs>
-
         <Message>%(NASM.ExecutionDescription)</Message>
-
-        <!-- option fragments used for [AllOptions] -->
+        <!-- Option fragments used for [AllOptions] -->
         <_NasmOpt_Debug></_NasmOpt_Debug>
         <_NasmOpt_Prefix></_NasmOpt_Prefix>
         <_NasmOpt_Postfix></_NasmOpt_Postfix>
@@ -86,7 +73,6 @@
         <_NasmOpt_Defines></_NasmOpt_Defines>
         <_NasmOpt_Undefines></_NasmOpt_Undefines>
         <_NasmOpt_Werror></_NasmOpt_Werror>
-
         <_NasmOpt_Debug Condition="'%(NASM.GenerateDebugInformation)' == 'true'">-g</_NasmOpt_Debug>
         <_NasmOpt_Prefix Condition="'%(NASM.SymbolsPrefix)' != ''">--prefix %(NASM.SymbolsPrefix)</_NasmOpt_Prefix>
         <_NasmOpt_Postfix Condition="'%(NASM.SymbolsPostfix)' != ''">--postfix %(NASM.SymbolsPostfix)</_NasmOpt_Postfix>
@@ -97,20 +83,17 @@
         <_NasmOpt_Werror Condition="'%(NASM.TreatWarningsAsErrors)' == 'true'">-Werror</_NasmOpt_Werror>
       </NASM>
     </ItemGroup>
-
     <ItemGroup>
       <NASM Update="@(NASM)">
         <_NasmAllOptions>-o "%(NASM.Outputs)" %(NASM._NasmOpt_Debug) %(NASM._NasmOpt_Prefix) %(NASM._NasmOpt_Postfix) %(NASM._NasmOpt_IncludePaths) %(NASM._NasmOpt_PreIncludeFiles) %(NASM._NasmOpt_Defines) %(NASM._NasmOpt_Undefines) %(NASM._NasmOpt_Werror)</_NasmAllOptions>
       </NASM>
     </ItemGroup>
-
     <ItemGroup>
       <NASM Update="@(NASM)">
         <Command>$([System.String]::Copy('%(NASM.CommandLineTemplate)').Replace('[AllOptions]', '%(NASM._NasmAllOptions)').Replace('[AdditionalOptions]', '%(NASM.AdditionalOptions)'))</Command>
       </NASM>
     </ItemGroup>
-
-    <!-- delete old ParallelCustomBuild tlogs, same as CustomBuild -->
+    <!-- Delete old ParallelCustomBuild tlogs, same as CustomBuild -->
     <GetOutOfDateItems
       Sources                   ="@(_EmptyItemGroup)"
       OutputsMetadataName       ="Outputs"
@@ -120,7 +103,6 @@
       TLogNamePrefix            ="ParallelNasmBuild"
       TrackFileAccess           ="$(TrackFileAccess)"
       />
-
     <!-- Get out of date items for NASM (full build case) -->
     <GetOutOfDateItems
       Condition                 ="'$(SelectedFiles)' == ''"
@@ -134,18 +116,15 @@
       CheckForInterdependencies ="true">
       <Output TaskParameter="OutOfDateSources" ItemName="_NasmBuild" />
     </GetOutOfDateItems>
-
     <!-- Selected-files build: just take all NASM items -->
     <ItemGroup Condition ="'$(SelectedFiles)' != ''">
       <_NasmBuild Include="@(NASM)" />
     </ItemGroup>
-
     <!-- Build items which can be built in parallel (ignored for selected-files build) -->
     <ItemGroup Condition="'$(SelectedFiles)' == ''">
       <_ParallelNasmBuild Include="@(_NasmBuild)"
                           Condition="'%(_NasmBuild.BuildInParallel)' == 'true' and '%(_NasmBuild.DependsOnAnotherItemOutput)' != 'true'" />
     </ItemGroup>
-
     <ParallelCustomBuild
       Condition       ="'@(_ParallelNasmBuild)' != ''"
       Sources         ="@(_ParallelNasmBuild)"
@@ -156,13 +135,11 @@
       StdErrEncoding  ="%(_ParallelNasmBuild.StdErrEncoding)"
       UseMsbuildResourceManager ="$(UseMsbuildResourceManager)"
     />
-
-    <!-- build the remaining items sequentially -->
+    <!-- Build the remaining items sequentially -->
     <ItemGroup Condition="'@(_ParallelNasmBuild)' != ''">
       <_NasmBuild Remove="@(_ParallelNasmBuild)" />
       <_ParallelNasmBuild Remove="@(_ParallelNasmBuild)" />
     </ItemGroup>
-
     <CustomBuild Condition ="'@(_NasmBuild)' != ''"
       Sources                     ="@(_NasmBuild)"
       BuildSuffix                 ="$(_BuildSuffix)"
@@ -171,13 +148,10 @@
       StdOutEncoding              ="%(_NasmBuild.StdOutEncoding)"
       StdErrEncoding              ="%(_NasmBuild.StdErrEncoding)">
     </CustomBuild>
-
     <ItemGroup Condition="'@(_NasmBuild)' != ''">
       <_NasmBuild Remove="@(_NasmBuild)" />
     </ItemGroup>
-
   </Target>
-
   <Target Name="SelectNASM" DependsOnTargets="_SelectedFiles">
     <ItemGroup Condition="'@(SelectedFiles)'!=''">
       <NASM Remove="@(NASM)" Condition="'%(Identity)'!='@(SelectedFiles)'"/>
@@ -191,10 +165,7 @@
       </NASM>
     </ItemGroup>
   </Target>
-  
-
   <Target Name="ComputeNASMOutput" DependsOnTargets="SelectNASM" >
-    
     <ItemGroup >
       <NASMOutputs Include="@(NASM->Metadata('Outputs'))" Condition="'@(NASM)' != ''"/>
 
@@ -206,7 +177,6 @@
         <OutputItemType Condition="'$(ConfigurationType)'!='StaticLibrary'">Link</OutputItemType>
       </NASMOutputs>
     </ItemGroup>
-
     <!-- Add NASM Outputs to lib, link or other tools -->
     <CreateItem
         Include="@(NASMOutputs)"
@@ -219,15 +189,10 @@
           Condition="'%(NASMOutputs.OutputItemType)' == 'Link' and '$(GenerateImportLib)'=='true'"
           ItemName="ImpLib"/>
     </CreateItem>
-
     <MakeDir Directories="@(NASMOutputs->'%(RootDir)%(Directory)')" />
-
     <!-- Cleanup -->
     <ItemGroup>
       <NASMOutputs Remove="@(NASMOutputs)" />
     </ItemGroup>
-    
   </Target>
-
-
 </Project>

nasm.xml

@@ -18,7 +18,6 @@
       <Category Name="All Options" DisplayName="All Options" Subtype="Search" />
       <Category Name="Command Line" DisplayName="Command Line" Subtype="CommandLine" />
     </Rule.Categories>
-    
     <!-- General -->
     <StringListProperty
       Name="IncludePaths"
@@ -74,7 +73,6 @@
           HasConfigurationCondition="true" />
       </DynamicEnumProperty.DataSource>
     </DynamicEnumProperty>
-    
     <BoolProperty
         Name="BuildInParallel"
         Category="General"
@@ -96,15 +94,13 @@
         F1Keyword="VC.Project.VCCustomBuildTool.MaxProcesses"
         Description="Maximum number of items to execute together during parallel build. A value of 0 divides items evenly into parallel batches. A value of 1 disables batching. Larger batches will improve performance if the custom build tool processes items quickly.">
     </IntProperty>
-    
     <!-- Assembler Options -->
-    
     <StringProperty
       Name="Outputs"
       Category="Assembler Options"
       DisplayName="Output File Name"
       Description="Specify Output Filename."
-      HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.1"  
+      HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.1"
       Switch="-o &quot;[value]&quot;" />
     <BoolProperty
       Name="GenerateDebugInformation"
@@ -119,28 +115,25 @@
       DisplayName="Symbols Prefix"
       Description="Prepend the given argument to all global or extern variables."
       HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.27"
-      IncludeInCommandLine="False" 
+      IncludeInCommandLine="False"
       Switch="--prefix [value]" />
     <StringProperty
       Name="SymbolsPostfix"
       Category="Assembler Options"
       DisplayName="Symbols Postfix"
       Description="Append the given argument to all global or extern variables."
       HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.27"
-      IncludeInCommandLine="False" 
+      IncludeInCommandLine="False"
       Switch="--postfix [value]" />
     <BoolProperty
       Name="TreatWarningsAsErrors"
       Category="Assembler Options"
       DisplayName="Treat Warnings As Errors"
       Description="Returns an error code if warnings are generated."
       HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.24"
-      IncludeInCommandLine="False" 
+      IncludeInCommandLine="False"
       Switch="-Werror" />
-
-
     <!-- Preprocessor -->
-
     <StringListProperty
       Name="PreprocessorDefinitions"
       Category="Preprocessor"
@@ -155,9 +148,7 @@
       Description="Undefines a text macro with the given name."
       HelpUrl="http://www.nasm.us/doc/nasmdoc2.html#section-2.1.19"
       Switch="-U[value]" />
-      
     <!-- Command Line -->
-
     <StringProperty
       Name="Inputs"
       Category="Command Line"
@@ -176,10 +167,7 @@
       DisplayName="Additional Options"
       Description="Additional Options">
     </StringProperty>
-
-      
     <!-- Hidden -->
-
     <StringProperty
       Name="CommandLineTemplate"
       DisplayName="Command Line"
@@ -195,7 +183,6 @@
       DisplayName="Additional Dependencies"
       IncludeInCommandLine="False"
       Visible="False" />
-      
   </Rule>
   <ItemType
     Name="NASM"