Fisheye: Tag 1cbea44490be75319be043e12953072020e7d5c0 refers to a dead (removed) revision in file `ext/sqlite3/sqlite3.vcproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1cbea44490be75319be043e12953072020e7d5c0 refers to a dead (removed) revision in file `ext/sqlite3/sqlite3.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1cbea44490be75319be043e12953072020e7d5c0 refers to a dead (removed) revision in file `ext/sqlite3/sqlite3.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Index: scripts/make_existing_release.bat =================================================================== diff -u -rd6c3523b8a96c26c0c448dc35964d172661e9be5 -r1cbea44490be75319be043e12953072020e7d5c0 --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 1cbea44490be75319be043e12953072020e7d5c0) @@ -183,8 +183,7 @@ xcopy "scripts\portable_config\ch.xml" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC140.CRT\*" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC140.MFC\*" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbgcore.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%ProgramFilesX86%\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%UniversalCRTSdkDir%\Redist\ucrt\DLLs\x86\*.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy /E /I "bin\release\help" "%TmpDir%\32bit\help" >>"%TmpDir%\command.log" || SET Res=1 xcopy /E /I "bin\release\langs" "%TmpDir%\32bit\langs" >>"%TmpDir%\command.log" || SET Res=1 @@ -200,8 +199,7 @@ xcopy "scripts\portable_config\ch.xml" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC140.CRT\*" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC140.MFC\*" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbgcore.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%ProgramFilesX86%\Windows Kits\8.1\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "%UniversalCRTSdkDir%\Redist\ucrt\DLLs\x64\*.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy /E /I "bin\release\help" "%TmpDir%\64bit\help" >>"%TmpDir%\command.log" || SET Res=1 xcopy /E /I "bin\release\langs" "%TmpDir%\64bit\langs" >>"%TmpDir%\command.log" || SET Res=1 Index: scripts/setup.iss =================================================================== diff -u -rd6c3523b8a96c26c0c448dc35964d172661e9be5 -r1cbea44490be75319be043e12953072020e7d5c0 --- scripts/setup.iss (.../setup.iss) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) +++ scripts/setup.iss (.../setup.iss) (revision 1cbea44490be75319be043e12953072020e7d5c0) @@ -25,8 +25,8 @@ #define SQLite64 "sqlite3_64.dll" #define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86" #define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64" -#define DbgHelp32 "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\Remote Debugger\x86" -#define DbgHelp64 "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\Remote Debugger\x64" +#define DbgHelp32 "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86" +#define DbgHelp64 "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64" #define UCrtDir32 "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86" #define UCrtDir64 "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64" @@ -117,9 +117,7 @@ Source: "{#UCrtDir64}\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "{#DbgHelp32}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "{#DbgHelp32}\dbgcore.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "{#DbgHelp64}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "{#DbgHelp64}\dbgcore.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -rd6c3523b8a96c26c0c448dc35964d172661e9be5 -r1cbea44490be75319be043e12953072020e7d5c0 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 1cbea44490be75319be043e12953072020e7d5c0) @@ -915,6 +915,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -923,10 +924,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -935,6 +938,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -945,6 +949,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -953,10 +958,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -965,6 +972,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -975,6 +983,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -983,10 +992,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -995,6 +1006,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -1005,6 +1017,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1013,10 +1026,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1025,6 +1040,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -1678,6 +1694,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1686,10 +1703,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1698,6 +1717,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -1708,6 +1728,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1716,10 +1737,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1728,6 +1751,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -1738,6 +1762,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1746,10 +1771,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1758,6 +1785,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. @@ -1768,6 +1796,7 @@ Making help file... Making help file... copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1776,10 +1805,12 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo. copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h" +SET PATH=%PATH%;$(VS_ExecutablePath) hhc "%(FullPath)" if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError mkdir "$(OutDir)help" >nul 2>nul @@ -1788,6 +1819,7 @@ :HelpError echo %(FullPath)(1) : error:Problem encountered creating help file echo. +exit 1 :HelpDone echo.