From fcff5d36f97132b33c3b7feff665b7813acb3837 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Thu, 12 Oct 2017 15:41:14 +0200
Subject: [PATCH] + add files to .gitignore + enhanced version number tests

---
 .gitignore               | 28 ++++++++++++++----------
 test/TestFileVersion.cmd | 46 +++++++++++++++++++++++++++++++---------
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15e0688a0..ba6095ab0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,15 +29,21 @@ Thumbs.db
 /Build/.vs
 /Build/Packages
 /Build/temp_zip*
+/Build/Bin/Password.txt
+/Build/Bin/Certum.cer
+/Build/Bin/Certum.p12
+/Build/sign.bat
+/Build/Signing/Certum.cer
+/Build/Signing/Certum.p12
+/Build/Signing/kSign.exe
+/Build/Signing/kSignCMD.exe
+/Build/Signing/Password.txt
 /distrib/Notepad3*.exe
-Build/Bin/Password.txt
-Build/Bin/Certum.cer
-Build/Bin/Certum.p12
-Build/sign.bat
-Build/Signing/Certum.cer
-Build/Signing/Certum.p12
-Build/Signing/kSign.exe
-Build/Signing/kSignCMD.exe
-Build/Signing/Password.txt
-Notepad3.VC.db
-Notepad3.VC.VC.opendb
+/res/Notepad3.exe.manifest.conf
+/src/VersionEx.h
+/Versions/build.txt
+/Notepad3.VC.db
+/Notepad3.VC.VC.opendb
+/np3portableapp/Notepad3Portable/App/Notepad3
+/np3portableapp/Notepad3Portable/Notepad3Portable.exe
+/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd
index 6fd4f5727..e518f7ffe 100644
--- a/test/TestFileVersion.cmd
+++ b/test/TestFileVersion.cmd
@@ -18,20 +18,37 @@ set VERSHOULD=2.%YY%.%MM%%DD%.%BUILD%
 
 :: --------------------------------------------------------------------------------------------------------------------
 
-set TEST_SUCCEEDED=false
+set TEST_RESULT=failure
 
 set FILEVER=
+set FILEVER32=
 if exist "%NP3_WIN32_DIR%Notepad3.exe" call :GETFILEVER "%NP3_WIN32_DIR%Notepad3.exe"
+if defined FILEVER set FILEVER32=%FILEVER%
+set FILEVER=
+set FILEVER64=
 if exist "%NP3_X64_DIR%Notepad3.exe" call :GETFILEVER "%NP3_X64_DIR%Notepad3.exe"
-if defined FILEVER call :COMPAREVER "%VERSHOULD%" "%FILEVER%"
+if defined FILEVER set FILEVER64=%FILEVER%
+
+if defined FILEVER32 set TEST_RESULT=success
+if defined FILEVER64 set TEST_RESULT=success
+call :COMPAREVER "%VERSHOULD%" "%FILEVER32%" "%FILEVER64%"
 
 :: ====================================================================================================================
 goto :END
 :: --------------------------------------------------------------------------------------------------------------------
 
 :COMPAREVER
-if ["%~1"] EQU ["%~2"] (
-    set TEST_SUCCEEDED=true
+if ["%~2"] NEQ [""] (
+  if ["%~1"] NEQ ["%~2"] (
+      echo ERROR: Expected version "%~1", found version "%~2" in 32-bit exe 
+      set TEST_RESULT=failure
+  )
+)
+if ["%~3"] NEQ [""] (
+  if ["%~1"] NEQ ["%~3"] (
+      echo ERROR: Expected version "%~1", found version "%~3" in 64-bit exe
+      set TEST_RESULT=failure
+  )
 )
 goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------
@@ -76,11 +93,20 @@ goto:EOF
 
 :: ====================================================================================================================
 :END
-echo.VERSHOULD = %VERSHOULD%
-echo.FILEVER = %FILEVER%
-echo.TEST_SUCCEEDED = %TEST_SUCCEEDED%
-:: - make TEST_SUCCEEDED survive 'endlocal'
-endlocal & set TEST_SUCCEEDED=%TEST_SUCCEEDED%
+echo Expected Version = %VERSHOULD%
+if ["%FILEVER32%"] NEQ [""] (
+  echo 32-bit exe Version = %FILEVER32%
+) else (
+  echo No 32-bit exe Version found
+)
+if ["%FILEVER64%"] NEQ [""] (
+  echo 64-bit exe Version = %FILEVER64%
+) else (
+  echo No 64-bit exe Version found
+)
+echo Version Test Result: %TEST_RESULT%
+:: - make TEST_RESULT survive 'endlocal'
+endlocal & set TEST_RESULT=%TEST_RESULT%
 ::pause
-if [%TEST_SUCCEEDED%] NEQ [true] exit /B 1
+if [%TEST_RESULT%] NEQ [success] exit /B 1
 :: ====================================================================================================================