Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `ch.vc120.sln'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `ch.vc90.sln'. Fisheye: No comparison available. Pass `N' to diff? Index: ext/gmock/gmock.vc140.vcxproj =================================================================== diff -u -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- ext/gmock/gmock.vc140.vcxproj (.../gmock.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) +++ ext/gmock/gmock.vc140.vcxproj (.../gmock.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -39,7 +39,6 @@ gmock Win32Proj gmock - 8.1 Index: ext/sqlite3/sqlite3.vc140.vcxproj =================================================================== diff -u -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -39,7 +39,6 @@ sqlite3 Win32Proj sqlite3 - 8.1 Index: msbuild.proj =================================================================== diff -u -r122f5f17f602b989c626ab31bb7f32c4211f93bd -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- msbuild.proj (.../msbuild.proj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd) +++ msbuild.proj (.../msbuild.proj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -1,16 +1,16 @@ - - - - - - - - + + + + + + + + - - + + \ No newline at end of file Index: scripts/config.bat =================================================================== diff -u -rac73804e631159c780bb803583fed0cbec6d03b7 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- scripts/config.bat (.../config.bat) (revision ac73804e631159c780bb803583fed0cbec6d03b7) +++ scripts/config.bat (.../config.bat) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -9,14 +9,14 @@ SET OutputDir=%CurrentDir%\out SET TmpDir=%CurrentDir%\tmp -SET VSInstallDirX64=%ProgramFiles%\Microsoft Visual Studio 12.0 +SET VSInstallDirX64=%ProgramFiles%\Microsoft Visual Studio 14.0 SET ProgramFilesX86=%ProgramFiles% SET LC_MESSAGES=en_EN rem NOTE: Strange construct here because of strange behaviour of %ProgramFiles(x86)% which loses last parenthesis otherwise -if "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles%\Microsoft Visual Studio 12.0 -if NOT "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles(x86)%\Microsoft Visual Studio 12.0 +if "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles%\Microsoft Visual Studio 14.0 +if NOT "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0 if NOT "%ProgramFiles(x86)%" == "" SET ProgramFilesX86=%ProgramFiles(x86)% if not exist "%ScriptDir%\config.bat" ( @@ -44,7 +44,7 @@ SET SVNINDEXCMD= for %%X in (svnindex.cmd) do (set SVNINDEXCMD=%%~$PATH:X) -if "%SVNINDEXCMD%" == "" set SVNINDEXCMD=%ProgramFiles%\Debugging Tools for Windows (x64)\srcsrv\svnindex.cmd +if "%SVNINDEXCMD%" == "" set SVNINDEXCMD=%ProgramFiles%\Windows Kits\8.1\Debuggers\x64\srcsrv\svnindex.cmd if not exist "%SVNINDEXCMD%" ( echo svnindex.cmd not found in PATH environment variable nor in its default location. Please install Debugging tools for Windows. exit /b 1 Index: scripts/make_existing_release.bat =================================================================== diff -u -r3c1c924c0fdd122aee60269256386ec80417e171 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 3c1c924c0fdd122aee60269256386ec80417e171) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -17,12 +17,12 @@ goto error ) -echo * Initializing Visual Studio environment -if not exist "%VS120COMNTOOLS%\vsvars32.bat" ( +echo * Initializing MSBuild environment +if not exist "%VS140COMNTOOLS%\VsMSBuildCmd.bat" ( echo ERROR: Can't find the vsvars32.bat file. goto error ) else ( - call "%VS120COMNTOOLS%\vsvars32.bat" >nul + call "%VS140COMNTOOLS%\VsMSBuildCmd.bat" >nul ) set MainProjectDir=%CHRootDir% @@ -181,9 +181,11 @@ xcopy "bin\release\ictranslate.exe" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "scripts\portable_config\ch.xml" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.MFC\*" "%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 "%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 @@ -196,9 +198,11 @@ xcopy "bin\release\ictranslate64.exe" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 xcopy "scripts\portable_config\ch.xml" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.CRT\*" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.MFC\*" "%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 "%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 -r0b8cd61019142c114e4a2df16b20cf782b195c55 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- scripts/setup.iss (.../setup.iss) (revision 0b8cd61019142c114e4a2df16b20cf782b195c55) +++ scripts/setup.iss (.../setup.iss) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -23,10 +23,12 @@ #define ICTranslateFilename64 "ictranslate64.exe" #define SQLite32 "sqlite3_32.dll" #define SQLite64 "sqlite3_64.dll" -#define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86" -#define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64" -#define DbgHelp32 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\Remote Debugger\x86" -#define DbgHelp64 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\Remote Debugger\x64" +#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 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" [Setup] AppName={#MyAppName} @@ -107,12 +109,17 @@ Source: "..\bin\release\{#SQLite32}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\bin\release\{#SQLite64}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC120.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "{#MSRedistDir64}\Microsoft.VC120.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC120.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "{#MSRedistDir64}\Microsoft.VC120.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC140.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "{#MSRedistDir64}\Microsoft.VC140.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC140.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "{#MSRedistDir64}\Microsoft.VC140.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "{#UCrtDir32}\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +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 Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/ch/ch.vc120.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/ch/ch.vc120.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -39,7 +39,6 @@ {4B215B9A-58CA-4987-AC95-7DFC3043E100} ch MFCProj - 8.1 @@ -1914,13 +1913,13 @@ - + {cbbf380b-7b16-4a1e-8194-758dad7d8011} - + {5510b933-046f-4f75-8b46-5e8279c8ccde} - + {dd1f3242-7ee4-4f41-8b8d-d833300c445f} Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/ch/ch.vc90.vcproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chcmd/chcmd.vc120.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chcmd/chcmd.vc120.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chcmd/chcmd.vc90.vcproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chext/chext.vc120.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chext/chext.vc120.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Index: src/chext/chext.vc140.vcxproj =================================================================== diff -u -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) +++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -39,7 +39,6 @@ {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69} chext AtlProj - 8.1 @@ -672,10 +671,10 @@ - + {cbbf380b-7b16-4a1e-8194-758dad7d8011} - + {5510b933-046f-4f75-8b46-5e8279c8ccde} Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/chext/chext.vc90.vcproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/libchcore/libchcore.vc120.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/libchcore/libchcore.vc120.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 -rd6c3523b8a96c26c0c448dc35964d172661e9be5 --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision d6c3523b8a96c26c0c448dc35964d172661e9be5) @@ -39,7 +39,6 @@ {CBBF380B-7B16-4A1E-8194-758DAD7D8011} libchcore Win32Proj - 8.1 @@ -813,10 +812,10 @@ - + {d41831f5-b2a5-4c92-9f15-1d9ab04722cc} - + {5510b933-046f-4f75-8b46-5e8279c8ccde} Fisheye: Tag d6c3523b8a96c26c0c448dc35964d172661e9be5 refers to a dead (removed) revision in file `src/libchcore/libchcore.vc90.vcproj'. Fisheye: No comparison available. Pass `N' to diff?