CopyHandler

Clone
ixen <ixen@copyhandler.com>
committed
9238222
on 23 Mar 19
Adjusted installer and portable packager to use VS2017 redist instead of VS2015 (CH-340).
/jenkins/prepare-portable-package.bat (+6 -6)
4 4 call "%WORKSPACE%\scripts\jenkins\_get-output-dir.bat" || exit /b 1
5 5
6 6 SET TmpDir=%WORKSPACE%\temp\chzip-%BUILD_NUMBER%
7 7
8 8 mkdir "%TmpDir%"
9 9
10 10 rem Prepare 32bit build
11 11 xcopy "%WORKSPACE%\bin\release\ch.exe" "%TmpDir%\32bit\" || exit /B 1
12 12 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\32bit\" || exit /B 1
13 13 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\32bit\" || exit /B 1
14 14 xcopy "%WORKSPACE%\bin\release\regchext.exe" "%TmpDir%\32bit\" || exit /B 1
15 15 xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\32bit\" || exit /B 1
16 16 xcopy "%WORKSPACE%\bin\release\libchengine32u.dll" "%TmpDir%\32bit\" || exit /B 1
17 17 xcopy "%WORKSPACE%\bin\release\libserializer32u.dll" "%TmpDir%\32bit\" || exit /B 1
18 18 xcopy "%WORKSPACE%\bin\release\libstring32u.dll" "%TmpDir%\32bit\" || exit /B 1
19 19 xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\32bit\" || exit /B 1
20 20 xcopy "%WORKSPACE%\bin\release\libictranslate32u.dll" "%TmpDir%\32bit\" || exit /B 1
21 21 xcopy "%WORKSPACE%\bin\release\ictranslate.exe" "%TmpDir%\32bit\" || exit /B 1
22 22 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" || exit /B 1
23 23 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\32bit\" || exit /B 1
24   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\*" "%TmpDir%\32bit\" || exit /B 1
25   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\*" "%TmpDir%\32bit\" || exit /B 1
  24 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT\*" "%TmpDir%\32bit\" || exit /B 1
  25 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.MFC\*" "%TmpDir%\32bit\" || exit /B 1
26 26 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1
27 27 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86\*" "%TmpDir%\32bit\" || exit /B 1
28 28 xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\32bit\help" || exit /B 1
29 29 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\32bit\langs" || exit /B 1
30 30
31 31 rem Prepare 64bit build
32 32 xcopy "%WORKSPACE%\bin\release\ch64.exe" "%TmpDir%\64bit\" || exit /B 1
33 33 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\64bit\" || exit /B 1
34 34 xcopy "%WORKSPACE%\bin\release\chext64.dll" "%TmpDir%\64bit\" || exit /B 1
35 35 xcopy "%WORKSPACE%\bin\release\regchext64.exe" "%TmpDir%\64bit\" || exit /B 1
36 36 xcopy "%WORKSPACE%\bin\release\libchcore64u.dll" "%TmpDir%\64bit\" || exit /B 1
37 37 xcopy "%WORKSPACE%\bin\release\liblogger64u.dll" "%TmpDir%\64bit\" || exit /B 1
38 38 xcopy "%WORKSPACE%\bin\release\libchengine64u.dll" "%TmpDir%\64bit\" || exit /B 1
39 39 xcopy "%WORKSPACE%\bin\release\libserializer64u.dll" "%TmpDir%\64bit\" || exit /B 1
40 40 xcopy "%WORKSPACE%\bin\release\libstring64u.dll" "%TmpDir%\64bit\" || exit /B 1
41 41 xcopy "%WORKSPACE%\bin\release\libictranslate64u.dll" "%TmpDir%\64bit\" || exit /B 1
42 42 xcopy "%WORKSPACE%\bin\release\ictranslate64.exe" "%TmpDir%\64bit\" || exit /B 1
43 43 xcopy "%WORKSPACE%\bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" || exit /B 1
44 44 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\64bit\" || exit /B 1
45   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\*" "%TmpDir%\64bit\" || exit /B 1
46   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.MFC\*" "%TmpDir%\64bit\" || exit /B 1
  45 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\*" "%TmpDir%\64bit\" || exit /B 1
  46 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\*" "%TmpDir%\64bit\" || exit /B 1
47 47 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1
48 48 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\*" "%TmpDir%\64bit\" || exit /B 1
49 49 xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\64bit\help" || exit /B 1
50 50 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\64bit\langs" || exit /B 1
51 51
52 52 rem Prepare 32bit shell extension for 64bit build
53 53 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
54 54 xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
55 55 xcopy "%WORKSPACE%\bin\release\libchengine32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
56 56 xcopy "%WORKSPACE%\bin\release\libserializer32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
57 57 xcopy "%WORKSPACE%\bin\release\libstring32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
58 58 xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
59 59 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
60 60
61   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
62   xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  61 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  62 xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.MFC\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
63 63 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
64 64 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
65 65
66 66 cd %TmpDir%
67 67 "C:\Program Files\7-Zip\7z.exe" a -tzip "%OutDir%\ch-portable-%CHTextVersion%.zip" 32bit 64bit