A bunch of development script improvements

TestDebug/build64.bat

@@ -1,9 +1,15 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
+SetLocal EnableDelayedExpansion
 
-:build
-"%NSIS_PATH%\makensis.exe" /DAMD64 /V4 "%~dp0\NSutils-Debug.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /V4 /DAMD64 "%~dp0\NSutils-Debug.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%

TestDebug/buildA.bat

@@ -1,9 +1,15 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
+SetLocal EnableDelayedExpansion
 
-:build
-"%NSIS_PATH%\makensis.exe" /DANSI /V4 "%~dp0\NSutils-Debug.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /V4 /DANSI "%~dp0\NSutils-Debug.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%

TestDebug/buildW.bat

@@ -1,9 +1,15 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
+SetLocal EnableDelayedExpansion
 
-:build
-"%NSIS_PATH%\makensis.exe" /V4 "%~dp0\NSutils-Debug.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /V4 "%~dp0\NSutils-Debug.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%

_acquire_pluginapi.bat

@@ -4,7 +4,7 @@ set NSIS_REPO=%~dp0..\..
 xcopy "%NSIS_REPO%\Contrib\ExDLL\pluginapi.*"  "nsis\" /DYI
 xcopy "%NSIS_REPO%\Contrib\ExDLL\nsis_tchar.h" "nsis\" /DYI
 xcopy "%NSIS_REPO%\Source\exehead\api.h"       "nsis\" /DYI
-if not exist "nsis\*.*" if not exist "%NSIS_REPO%" echo ERROR: NSIS sources not found. Clone NSIS repository to "%NSIS_REPO%" & pause & exit /B 2
+if not exist "nsis\*.*" if not exist "%NSIS_REPO%" echo ERROR: NSIS sources not found. Clone NSIS repository to "%NSIS_REPO%" && pause && exit /B 2
 
 echo.
 exit /B 0

_build_Release_mingw.bat

@@ -3,10 +3,14 @@ REM :: Marius Negrutiu ([email protected])
 @echo off
 echo.
 
-if not exist "%MSYS2%" set MSYS2=C:\msys2
-if not exist "%MSYS2%" set MSYS2=C:\msys64
-set MINGW32=%MSYS2%\mingw32
-set MINGW64=%MSYS2%\mingw64
+if not exist "%MINGW32%\bin\gcc.exe" set MINGW32=%MINGW32_INSTDIR%
+if not exist "%MINGW32%\bin\gcc.exe" set MINGW32=%SYSTEMROOT%\msys64\mingw32
+if not exist "%MINGW32%\bin\gcc.exe" set MINGW32=%SYSTEMROOT%\msys2\mingw32
+
+if not exist "%MINGW64%\bin\gcc.exe" set MINGW64=%MINGW64_INSTDIR%
+if not exist "%MINGW64%\bin\gcc.exe" set MINGW64=%SYSTEMROOT%\msys64\mingw64
+if not exist "%MINGW64%\bin\gcc.exe" set MINGW64=%SYSTEMROOT%\msys2\mingw64
+
 set ORIGINAL_PATH=%PATH%
 
 cd /d "%~dp0"
@@ -16,7 +20,7 @@ call _acquire_pluginapi.bat
 if %errorlevel% neq 0 exit /B %errorlevel%
 
 :x86
-if not exist "%MINGW32%" echo ERROR: Missing "%MINGW32%" & pause & exit /B 2
+if not exist "%MINGW32%\bin\gcc.exe" echo ERROR: Missing "%MINGW32%" && pause && exit /B 2
 set PATH=%MINGW32%\bin;%ORIGINAL_PATH%
 
 echo.
@@ -25,23 +29,21 @@ set OUTDIR=Release-mingw-x86-ansi
 echo %OUTDIR%
 title %OUTDIR%
 echo -------------------------------------------------------------------
-title Release-mingw-x86-ansi
 mingw32-make.exe ARCH=X86 CHAR=ANSI OUTDIR=%OUTDIR% -fMakefile.mingw clean all
-if %errorlevel% neq 0 echo errorlevel == %errorlevel% & pause & goto :EOF
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 echo.
 echo -------------------------------------------------------------------
 set OUTDIR=Release-mingw-x86-unicode
 echo %OUTDIR%
 title %OUTDIR%
 echo -------------------------------------------------------------------
-title Release-mingw-x86-unicode
 mingw32-make.exe ARCH=X86 CHAR=Unicode OUTDIR=%OUTDIR% -fMakefile.mingw clean all
-if %errorlevel% neq 0 echo errorlevel == %errorlevel% & pause & goto :EOF
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 
 :amd64
-if not exist "%MINGW64%" echo ERROR: Missing "%MINGW64%" & pause & exit /B 2
+if not exist "%MINGW64%\bin\gcc.exe" echo ERROR: Missing "%MINGW64%" && pause && exit /B 2
 set PATH=%MINGW64%\bin;%ORIGINAL_PATH%
 
 echo.
@@ -50,9 +52,8 @@ set OUTDIR=Release-mingw-amd64-unicode
 echo %OUTDIR%
 title %OUTDIR%
 echo -------------------------------------------------------------------
-title Release-mingw-amd64-unicode
 mingw32-make.exe ARCH=X64 CHAR=Unicode OUTDIR=%OUTDIR% -fMakefile.mingw clean all
-if %errorlevel% neq 0 echo errorlevel == %errorlevel% & pause & goto :EOF
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 echo.
 REM pause

test/NSutils-Test-build.bat

@@ -1,21 +1,25 @@
 REM :: Marius Negrutiu :: 2019/08/25
 @echo off
+SetLocal EnableDelayedExpansion
 
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
 
-:build
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
 
 Title Build: amd64-unicode
-"%NSIS_PATH%\makensis.exe" /DAMD64 /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+"%NSIS%\makensis.exe" /V4 /DAMD64 "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 Title Build: x86-ansi
-"%NSIS_PATH%\makensis.exe" /DANSI /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+"%NSIS%\makensis.exe" /V4 /DANSI "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 Title Build: x86-unicode
-"%NSIS_PATH%\makensis.exe" /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+"%NSIS%\makensis.exe" /V4 "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%

test/NSutils-Test.nsi

@@ -15,10 +15,15 @@ Target ${_TARGET_}
 !include "FileFunc.nsh"
 !include "Win\WinNT.nsh"
 
-# NSutils.dll location
-;!AddPluginDir /x86-ansi      "..\Release-mingw-x86-ansi"
-;!AddPluginDir /x86-unicode   "..\Release-mingw-x86-unicode"
-;!AddPluginDir /amd64-unicode "..\Release-mingw-amd64-unicode"
+# NSutils.dll development location
+!ifdef DEVEL
+!if ! /FileExists "..\Release-mingw-${_TARGET_}\NSutils.dll"
+	!error "Missing \Release-mingw-${_TARGET_}\NSutils.dll"
+!endif
+!AddPluginDir /amd64-unicode "..\Release-mingw-amd64-unicode"
+!AddPluginDir /x86-unicode   "..\Release-mingw-x86-unicode"
+!AddPluginDir /x86-ansi      "..\Release-mingw-x86-ansi"
+!endif
 
 !define /ifndef TRUE 1
 !define /ifndef FALSE 0

test/build64.bat

@@ -1,12 +1,18 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
-
-:build
-"%NSIS_PATH%\makensis.exe" /DAMD64 /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+SetLocal EnableDelayedExpansion
+
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /DDEVEL /V4 /DAMD64 "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 REM echo ----------------------------------------------------------
 REM set exe=NSutils-Test-amd64-unicode.exe

test/buildA.bat

@@ -1,12 +1,18 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
-
-:build
-"%NSIS_PATH%\makensis.exe" /DANSI /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+SetLocal EnableDelayedExpansion
+
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /DDEVEL /V4 /DANSI "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 REM echo ----------------------------------------------------------
 REM set exe=NSutils-Test-x86-ansi.exe

test/buildW.bat

@@ -1,12 +1,18 @@
 @echo off
-if exist "W:\GIT\NSIS\NSISbin"      set NSIS_PATH=W:\GIT\NSIS\NSISbin& goto :build
-if exist "%PROGRAMFILES%\NSIS"      set NSIS_PATH=%PROGRAMFILES%\NSIS& goto :build
-if exist "%PROGRAMFILES(X86)%\NSIS" set NSIS_PATH=%PROGRAMFILES(X86)%\NSIS& goto :build
-echo ERROR: NSIS not found & pause & exit /B 2
-
-:build
-"%NSIS_PATH%\makensis.exe" /V4 "%~dp0\NSutils-Test.nsi"
-if %errorlevel% neq 0 pause & exit /B %errorlevel%
+SetLocal EnableDelayedExpansion
+
+if not exist "%NSIS%\makensis.exe" pushd "%~dp0..\.." && set NSIS=!CD!&& popd
+if not exist "%NSIS%\makensis.exe" set NSIS=%NSIS_INSTDIR%
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES%\NSIS
+if not exist "%NSIS%\makensis.exe" set NSIS=%PROGRAMFILES(X86)%\NSIS
+if not exist "%NSIS%\makensis.exe" echo ERROR: NSIS not found ^(Tip: NSIS_INSTDIR can be defined to point to NSIS binaries^) && pause && exit /B 2
+
+echo ********************************************************************************
+echo %NSIS%\makensis.exe
+echo ********************************************************************************
+
+"%NSIS%\makensis.exe" /DDEVEL /V4 "%~dp0\NSutils-Test.nsi"
+if %errorlevel% neq 0 pause && exit /B %errorlevel%
 
 REM echo ----------------------------------------------------------
 REM set exe=NSutils-Test-x86-unicode.exe