[WiX-commits] wix/src/votive/Registration Register.reg.pp, 1.4, 1.5 RegisterVotive.bat, 1.4, 1.5

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/src/votive/Registration
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8819/src/votive/Registration

Modified Files:
	Register.reg.pp RegisterVotive.bat 
Log Message:
ScotK: Refactor the way XmlFile works.

Index: RegisterVotive.bat
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/Registration/RegisterVotive.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RegisterVotive.bat	13 Sep 2006 08:13:29 -0000	1.4
--- RegisterVotive.bat	27 Sep 2006 05:11:21 -0000	1.5
***************
*** 9,12 ****
--- 9,22 ----
  setlocal
  
+ :: Make sure the SDK is installed (the experimental hive is registered).
+ reg query HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0Exp\Setup\VS /v EnvironmentPath > NUL 2> NUL
+ if not %errorlevel% == 0 (
+ 	echo VS SDK for Visual Studio 2005 is not installed. Skipping registration.
+ 	goto End
+ )
+ 
+ :: Try to get the paths to the Visual Studio devenv.exe
+ for /f "tokens=3*" %%a in ('reg query HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0Exp\Setup\VS /v EnvironmentPath ^| find "EnvironmentPath"') do set DEVENVPATH_2005=%%a %%b
+ 
  :: GUIDs
  set PACKAGE_GUID={E0EE8E7D-F498-459E-9E90-2B3D73124AD5}
***************
*** 18,22 ****
  
  :: Directories
- set DEVENVPATH_2005=
  set SCONCE_TARGETDIR=%TARGETROOT%\wix\x86\debug\lang-neutral\
  set SCONCE_TARGETPATH=%SCONCE_TARGETDIR%sconce.dll
--- 28,31 ----
***************
*** 24,43 ****
  set VOTIVE_TARGETPATH=%VOTIVE_TARGETDIR%votive.dll
  set WIXTOOLSDIR=%TARGETROOT%\wix\x86\debug\lang-neutral\
! set TEMPLATESDIR=%TARGETROOT%\wix\x86\debug\lang-neutral\
! 
! :: Make sure the SDK is installed (the experimental hive is registered).
! reg query HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0Exp\Setup\VS /v EnvironmentPath > NUL 2> NUL
! if not %errorlevel% == 0 (
! 	echo VS SDK for Visual Studio 2005 is not installed. Skipping registration.
! 	goto End
! )
! 
! :: Try to get the paths to the Visual Studio devenv.exe
! for /f "tokens=3*" %%a in ('reg query HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0Exp\Setup\VS /v EnvironmentPath ^| find "EnvironmentPath"') do set DEVENVPATH_2005=%%a %%b
  
  :: Write the .reg files and use reg.exe to import the files
  set REG_FILE=%~dp0Register.reg
  echo Writing package registry settings for Visual Studio 2005...
! "%VOTIVE_PREPROCESSOR%" -bs "%~dp0Register.reg.pp" "%REG_FILE%" DLLPATH="%VOTIVE_TARGETPATH%" DLLDIR="%VOTIVE_TARGETDIR%\" SCONCEPATH="%SCONCE_TARGETPATH%" TEMPLATESDIR="%TEMPLATESDIR%\" WIXTOOLSDIR="%WIXTOOLSDIR%\" DEVENVPATH="%DEVENVPATH_2005%" PACKAGE_GUID=%PACKAGE_GUID% PROJECT_GUID=%PROJECT_GUID% XML_EDITOR_GUID=%XML_EDITOR_GUID_2005% VS_VERSION=8.0 VS_VERSION_YEAR=2005
  reg import "%REG_FILE%"
  if exist "%REG_FILE%" del /q /f "%REG_FILE%"
--- 33,43 ----
  set VOTIVE_TARGETPATH=%VOTIVE_TARGETDIR%votive.dll
  set WIXTOOLSDIR=%TARGETROOT%\wix\x86\debug\lang-neutral\
! set ITEMTEMPLATESDIR=%DEVENVPATH_2005%\ItemTemplates\WiX\
! set PROJECTTEMPLATESDIR=%DEVENVPATH_2005%\ProjectTemplates\WiX\
  
  :: Write the .reg files and use reg.exe to import the files
  set REG_FILE=%~dp0Register.reg
  echo Writing package registry settings for Visual Studio 2005...
! "%VOTIVE_PREPROCESSOR%" -bs "%~dp0Register.reg.pp" "%REG_FILE%" DLLPATH="%VOTIVE_TARGETPATH%" DLLDIR="%VOTIVE_TARGETDIR%\" SCONCEPATH="%SCONCE_TARGETPATH%" ITEMTEMPLATESDIR="%ITEMTEMPLATESDIR%\" PROJECTTEMPLATESDIR="%PROJECTTEMPLATESDIR%\" WIXTOOLSDIR="%WIXTOOLSDIR%\" DEVENVPATH="%DEVENVPATH_2005%" PACKAGE_GUID=%PACKAGE_GUID% PROJECT_GUID=%PROJECT_GUID% XML_EDITOR_GUID=%XML_EDITOR_GUID_2005% VS_VERSION=8.0 VS_VERSION_YEAR=2005
  reg import "%REG_FILE%"
  if exist "%REG_FILE%" del /q /f "%REG_FILE%"

Index: Register.reg.pp
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/Registration/Register.reg.pp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsdGFB6R and /tmp/cvsJ8kQtU differ