From 3be0cb2f828e0d25cc203c4ae26c6160ada73883 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Tue, 11 Apr 2017 23:49:27 +1000
Subject: [PATCH] Update to correspond to changes in VSYASM.

---
 install_script.bat | 26 ++++++++++++++------------
 nasm.props         |  2 +-
 nasm.targets       |  3 ++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/install_script.bat b/install_script.bat
index 790c0c0..eb3042c 100644
--- a/install_script.bat
+++ b/install_script.bat
@@ -5,8 +5,8 @@ set NASMDL=http://www.nasm.us/pub/nasm/releasebuilds
 set NASMVERSION=2.12.02
 
 REM Store current directory and ensure working directory is the location of current .bat
-SET CALLDIR=%CD%
-cd %~dp0
+set CALLDIR=%CD%
+set SCRIPTDIR=%~dp0
 
 REM Initialise error check value
 SET ERROR=0
@@ -146,7 +146,8 @@ if not "%CURRDIR%"=="%CD%" (
 
 REM copy the BuildCustomizations to VCTargets folder
 echo Installing build customisations...
-copy /B /Y /V "./nasm.*" "%VCTargetsPath%\BuildCustomizations\" 1>NUL 2>NUL
+del /F /Q "%VCTargetsPath%\BuildCustomizations\nasm.*" 1>NUL 2>NUL
+copy /B /Y /V "%SCRIPTDIR%\nasm.*" "%VCTargetsPath%\BuildCustomizations\" 1>NUL 2>NUL
 if not exist "%VCTargetsPath%\BuildCustomizations\nasm.props" (
     echo Error: Failed to copy build customisations!
     echo    Ensure that this script is run in a shell with the necessary write privileges
@@ -162,30 +163,31 @@ if "%SYSARCH%"=="x32" (
     goto Terminate
 )
 echo Downloading required NASM release binary...
-powershell.exe -Command (New-Object Net.WebClient).DownloadFile('%NASMDOWNLOAD%', './nasm.zip') 1>NUL 2>NUL
-if not exist "./nasm.zip" (
+powershell.exe -Command (New-Object Net.WebClient).DownloadFile('%NASMDOWNLOAD%', '%SCRIPTDIR%\nasm.zip') 1>NUL 2>NUL
+if not exist "%SCRIPTDIR%\nasm.zip" (
     echo Error: Failed to download required NASM binary!
     echo    The following link could not be resolved "%NASMDOWNLOAD%"
     goto Terminate
 )
-powershell.exe -Command Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('"./nasm.zip"', '"./TempNASMUnpack"') 1>NUL 2>NUL
-if not exist "./TempNASMUnpack" (
+powershell.exe -Command Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('"%SCRIPTDIR%\nasm.zip"', '"%SCRIPTDIR%\TempNASMUnpack"') 1>NUL 2>NUL
+if not exist "%SCRIPTDIR%\TempNASMUnpack" (
     echo Error: Failed to unpack NASM download!
-    del /F /Q "./nasm.zip" 1>NUL 2>NUL
+    del /F /Q "%SCRIPTDIR%\nasm.zip" 1>NUL 2>NUL
     goto Terminate
 )
-del /F /Q "./nasm.zip" 1>NUL 2>NUL
+del /F /Q "%SCRIPTDIR%\nasm.zip" 1>NUL 2>NUL
 
 REM copy nasm executable to VC installation folder
 echo Installing required NASM release binary...
-copy /B /Y /V "./TempNASMUnpack\nasm-%NASMVERSION%\*.exe" "%VCINSTALLDIR%\" 1>NUL 2>NUL
+del /F /Q "%VCINSTALLDIR%\nasm.exe" 1>NUL 2>NUL
+copy /B /Y /V "%SCRIPTDIR%\TempNASMUnpack\nasm-%NASMVERSION%\nasm.exe" "%VCINSTALLDIR%\" 1>NUL 2>NUL
 if not exist "%VCINSTALLDIR%\nasm.exe" (
     echo Error: Failed to install NASM binary!
     echo    Ensure that this script is run in a shell with the necessary write privileges
-    rd /S /Q "./TempNASMUnpack" 1>NUL 2>NUL
+    rd /S /Q "%SCRIPTDIR%\TempNASMUnpack" 1>NUL 2>NUL
     goto Terminate
 )
-rd /S /Q "./TempNASMUnpack"
+rd /S /Q "%SCRIPTDIR%\TempNASMUnpack"
 echo Finished Successfully
 goto Exit
 
diff --git a/nasm.props b/nasm.props
index 27fed82..2a05d3b 100644
--- a/nasm.props
+++ b/nasm.props
@@ -12,7 +12,7 @@
     <NASM>
       <OutputFormat>$(IntDir)%(FileName).obj</OutputFormat>
       <CommandLineTemplate>"$(NasmPath)"nasm.exe -Xvc -f win$(PlatformArchitecture) [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
-      <ExecutionDescription>Assembling %(Identity)...</ExecutionDescription>
+      <ExecutionDescription>%(Identity)</ExecutionDescription>
     </NASM>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/nasm.targets b/nasm.targets
index 58627e6..badcc91 100644
--- a/nasm.targets
+++ b/nasm.targets
@@ -40,6 +40,7 @@
       </NASM_tlog>
     </ItemGroup>
     <Message
+      Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'"
       Importance="High"
       Text="%(NASM.ExecutionDescription)" />
     <WriteLinesToFile
@@ -58,7 +59,7 @@
       TreatWarningsAsErrors="%(NASM.TreatWarningsAsErrors)"
       CommandLineTemplate="%(NASM.CommandLineTemplate)"
       AdditionalOptions="%(NASM.AdditionalOptions)"
- />
+    />
   </Target>
   <Target
     Name="ComputeNASMOutput"