Plugins: Add DecompileJVM, DecompileIL and DisassembleNative plugin (2)

diff --git a/Plugins/Commands/dumpbin/dumpbin.bat b/Plugins/Commands/dumpbin/dumpbin.bat
index b917846..6efe244 100644 (file)
--- a/Plugins/Commands/dumpbin/dumpbin.bat
+++ b/Plugins/Commands/dumpbin/dumpbin.bat
@@ -1,13 +1,19 @@
 @echo off
+setlocal enabledelayedexpansion
 if exist "%APPDATA%\WinMerge\Commands\dumpbin\dumpbinpath.txt" (
   for /f "usebackq tokens=*" %%i in (%APPDATA%\WinMerge\Commands\dumpbin\dumpbinpath.txt) do set DUMPBIN_PATH=%%i
 )
-if not exist "%DUMPBIN_PATH%" (
-  for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
-    set InstallDir=%%i
+if not exist "!DUMPBIN_PATH!" (
+  if exist "%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" (
+    for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -property installationPath`) do (
+      set InstallDir=%%i
+    )
   )
-  if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
-    call "%InstallDir%\Common7\Tools\vsdevcmd.bat"
+  if exist "!InstallDir!\Common7\Tools\vsdevcmd.bat" (
+    call "!InstallDir!\Common7\Tools\vsdevcmd.bat" > NUL
+  ) else (
+    echo Visual Studio not installed
+    goto :eof
   )
   mkdir "%APPDATA%\WinMerge\Commands\dumpbin\" 2> NUL
   where dumpbin.exe > "%APPDATA%\WinMerge\Commands\dumpbin\dumpbinpath.txt"
@@ -15,4 +21,4 @@ if not exist "%DUMPBIN_PATH%" (
     for /f "usebackq tokens=*" %%i in (%APPDATA%\WinMerge\Commands\dumpbin\dumpbinpath.txt) do set DUMPBIN_PATH=%%i
   )
 )
-"%DUMPBIN_PATH%" %*
+"!DUMPBIN_PATH!" %*

diff --git a/Plugins/Commands/ildasm/ildasm.bat b/Plugins/Commands/ildasm/ildasm.bat
index 4c4a864..c9eaf87 100644 (file)
--- a/Plugins/Commands/ildasm/ildasm.bat
+++ b/Plugins/Commands/ildasm/ildasm.bat
@@ -1,13 +1,19 @@
 @echo off
+setlocal enabledelayedexpansion
 if exist "%APPDATA%\WinMerge\Commands\ildasm\ildasmpath.txt" (
   for /f "usebackq tokens=*" %%i in (%APPDATA%\WinMerge\Commands\ildasm\ildasmpath.txt) do set ILDASM_PATH=%%i
 )
-if not exist "%ILDASM_PATH%" (
-  for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -property installationPath`) do (
-    set InstallDir=%%i
+if not exist "!ILDASM_PATH!" (
+  if exist "%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" (
+    for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -property installationPath`) do (
+      set InstallDir=%%i
+    )
   )
-  if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
-    call "%InstallDir%\Common7\Tools\vsdevcmd.bat"
+  if exist "!InstallDir!\Common7\Tools\vsdevcmd.bat" (
+    call "!InstallDir!\Common7\Tools\vsdevcmd.bat" > NUL
+  ) else (
+    echo Visual Studio not installed
+    goto :eof
   )
   mkdir "%APPDATA%\WinMerge\Commands\ildasm\" 2> NUL
   where ildasm.exe > "%APPDATA%\WinMerge\Commands\ildasm\ildasmpath.txt"
@@ -15,4 +21,4 @@ if not exist "%ILDASM_PATH%" (
     for /f "usebackq tokens=*" %%i in (%APPDATA%\WinMerge\Commands\ildasm\ildasmpath.txt) do set ILDASM_PATH=%%i
   )
 )
-"%ILDASM_PATH%" %*
+"!ILDASM_PATH!" %*