Adding mercurial revision to setup.

2 files changed, 10 insertions, 3 deletions

diff --git a/Setup/Publish.cmd b/Setup/Publish.cmd
index 0e6caf7..9a1eedc 100644
--- a/Setup/Publish.cmd
+++ b/Setup/Publish.cmd
@@ -14,6 +14,8 @@ SET         SIGN_TOOL="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe
 SET         SIGN_HASH="C02FF227D5EE9F555C13D4C622697DF15C6FF871"

 SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"

 

+FOR /F "delims=" %%N IN ('hg id -i 2^> NUL') DO @SET HgNode=%%N%

+

 

 ECHO --- BUILD SOLUTION

 ECHO.

@@ -65,7 +67,7 @@ ECHO --- BUILD SETUP
 ECHO.

 

 RMDIR /Q /S ".\Temp" 2> NUL

-CALL %SETUP_TOOL% /O".\Temp" %FILE_SETUP%

+CALL %SETUP_TOOL% /DHgNode=%HgNode% /O".\Temp" %FILE_SETUP%

 IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%

 

 FOR /F %%I IN ('DIR ".\Temp\*.exe" /B') DO SET _SETUPEXE=%%I

diff --git a/Setup/WrtSettings.iss b/Setup/WrtSettings.iss
index 59e6d06..cac33f8 100644
--- a/Setup/WrtSettings.iss
+++ b/Setup/WrtSettings.iss
@@ -5,7 +5,12 @@
 #define AppCopyright   GetStringFileInfo('..\Binaries\WrtSettings.exe', 'LegalCopyright')

 #define AppBase        LowerCase(StringChange(AppName, ' ', ''))

 #define AppSetupFile   AppBase + StringChange(AppVersion, '.', '')

-#define AppVersionEx   StringChange(AppVersion, '0.00', '(latest)')

+

+#define AppVersionEx   StringChange(AppVersion, '0.00', '')

+#if "" != HgNode

+#  define AppVersionEx AppVersionEx + " (" + HgNode + ")"

+#endif

+

 

 [Setup]

 AppName={#AppName}

@@ -15,7 +20,7 @@ AppPublisher={#AppCompany}
 AppPublisherURL=http://jmedved.com/{#AppBase}/

 AppCopyright={#AppCopyright}

 VersionInfoProductVersion={#AppVersion}

-VersionInfoProductTextVersion={#AppVersion}

+VersionInfoProductTextVersion={#AppVersionEx}

 VersionInfoVersion={#AppFileVersion}

 DefaultDirName={pf}\{#AppCompany}\{#AppName}

 OutputBaseFilename={#AppSetupFile}