Batch improvements to extract version number and check paths valid

Author: bruderstein

installer/buildInstaller.bat

@@ -16,7 +16,18 @@ IF NOT EXIST "buildPaths.bat" (
 
 CALL buildPaths.bat
 
-SET PYTHONSCRIPTVERSION=1.0.0.0
+IF NOT EXIST "%PYTHONBUILDDIR%\pcbuild\python.exe" (
+	echo Your PYTHONBUILDDIR in buildPaths.bat does not contain PCBuild\python.exe.  Please set PYTHONBUILDDIR to the root of a built Python 2.7
+	goto error
+	)
+
+IF NOT EXIST "%PYTHONBUILDDIR%\pcbuild\python27.dll" (
+	echo Your PYTHONBUILDDIR in buildPaths.bat does not contain PCBuild\python27.dll.  Please set PYTHONBUILDDIR to the root of a built Python 2.7
+	goto error
+	)
+
+%PYTHONBUILDDIR%\pcbuild\python extractVersion.py > temp\version.txt
+SET /p PYTHONSCRIPTVERSION= < temp\version.txt
 
 
 echo Generating WiX information for ..\pythonlib\full
@@ -84,6 +95,10 @@ if NOT [%ERRORLEVEL%]==[0] (
  goto error
 )
 
+echo.
+echo.
+echo Installer created - build\PythonScript_%PYTHONSCRIPTVERSION%.msi
+
 goto end
 
 :error

installer/extractVersion.py

@@ -0,0 +1,18 @@
+"""Extracts the version number of PythonScript"""
+
+import sys, os
+import re
+
+pathToVersionFile = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '..\PythonScript\src\PythonScriptVersion.h')
+
+versionHeader = open(pathToVersionFile, 'r')
+versionRegex = re.compile(r'PYSCR_VERSION_STRING\s+"([0-9.]+)"')
+
+for line in versionHeader:
+	match = versionRegex.search(line)
+	if match:
+		print match.group(1),
+		break
+
+
+