CopyHandler

Clone
ixen <ixen@copyhandler.com>
committed
fc8216e
on 20 Mar 19
Adjusted installer and jenkins scripts to use VS2017 libraries when preparing deployment (CH-340)
/jenkins/prepare-portable-package.bat (+14 -8)
1 1 @echo off
2 2
3 3 rem Script prepares the portable CH package after build
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   SET VSInstallDirX86=C:\Program Files (x86)\Microsoft Visual Studio 12.0
  8 SET VSInstallDirX86=C:\Program Files (x86)\Microsoft Visual Studio 14.0
9 9
10 10 mkdir "%TmpDir%"
11 11
12 12 rem Prepare 32bit build
13 13 xcopy "%WORKSPACE%\bin\release\ch.exe" "%TmpDir%\32bit\" || exit /B 1
14 14 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\32bit\" || exit /B 1
15 15 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\32bit\" || exit /B 1
16 16 xcopy "%WORKSPACE%\bin\release\regchext.exe" "%TmpDir%\32bit\" || exit /B 1
17 17 xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\32bit\" || exit /B 1
18 18 xcopy "%WORKSPACE%\bin\release\libchengine32u.dll" "%TmpDir%\32bit\" || exit /B 1
19 19 xcopy "%WORKSPACE%\bin\release\libserializer32u.dll" "%TmpDir%\32bit\" || exit /B 1
20 20 xcopy "%WORKSPACE%\bin\release\libstring32u.dll" "%TmpDir%\32bit\" || exit /B 1
21 21 xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\32bit\" || exit /B 1
22 22 xcopy "%WORKSPACE%\bin\release\libictranslate32u.dll" "%TmpDir%\32bit\" || exit /B 1
23 23 xcopy "%WORKSPACE%\bin\release\ictranslate.exe" "%TmpDir%\32bit\" || exit /B 1
24 24 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" || exit /B 1
25 25 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\32bit\" || exit /B 1
26   xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\32bit\" || exit /B 1
27   xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.MFC\*" "%TmpDir%\32bit\" || exit /B 1
28   xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1
  26 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\*" "%TmpDir%\32bit\" || exit /B 1
  27 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\*" "%TmpDir%\32bit\" || exit /B 1
  28 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1
  29 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86\*" "%TmpDir%\32bit\" || exit /B 1
29 30 xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\32bit\help" || exit /B 1
30 31 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\32bit\langs" || exit /B 1
31 32
32 33 rem Prepare 64bit build
33 34 xcopy "%WORKSPACE%\bin\release\ch64.exe" "%TmpDir%\64bit\" || exit /B 1
34 35 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\64bit\" || exit /B 1
35 36 xcopy "%WORKSPACE%\bin\release\chext64.dll" "%TmpDir%\64bit\" || exit /B 1
36 37 xcopy "%WORKSPACE%\bin\release\regchext64.exe" "%TmpDir%\64bit\" || exit /B 1
37 38 xcopy "%WORKSPACE%\bin\release\libchcore64u.dll" "%TmpDir%\64bit\" || exit /B 1
38 39 xcopy "%WORKSPACE%\bin\release\liblogger64u.dll" "%TmpDir%\64bit\" || exit /B 1
39 40 xcopy "%WORKSPACE%\bin\release\libchengine64u.dll" "%TmpDir%\64bit\" || exit /B 1
40 41 xcopy "%WORKSPACE%\bin\release\libserializer64u.dll" "%TmpDir%\64bit\" || exit /B 1
41 42 xcopy "%WORKSPACE%\bin\release\libstring64u.dll" "%TmpDir%\64bit\" || exit /B 1
42 43 xcopy "%WORKSPACE%\bin\release\libictranslate64u.dll" "%TmpDir%\64bit\" || exit /B 1
43 44 xcopy "%WORKSPACE%\bin\release\ictranslate64.exe" "%TmpDir%\64bit\" || exit /B 1
44 45 xcopy "%WORKSPACE%\bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" || exit /B 1
45 46 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\64bit\" || exit /B 1
46   xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.CRT\*" "%TmpDir%\64bit\" || exit /B 1
47   xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.MFC\*" "%TmpDir%\64bit\" || exit /B 1
48   xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1
  47 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\*" "%TmpDir%\64bit\" || exit /B 1
  48 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.MFC\*" "%TmpDir%\64bit\" || exit /B 1
  49 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1
  50 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\*" "%TmpDir%\32bit\" || exit /B 1
49 51 xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\64bit\help" || exit /B 1
50 52 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\64bit\langs" || exit /B 1
51 53
52 54 rem Prepare 32bit shell extension for 64bit build
53 55 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
54 56 xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
55 57 xcopy "%WORKSPACE%\bin\release\libchengine32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
56 58 xcopy "%WORKSPACE%\bin\release\libserializer32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
57 59 xcopy "%WORKSPACE%\bin\release\libstring32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
58 60 xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
59 61 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
60   xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
61 62
  63 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  64 xcopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  65 xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  66 xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1
  67
62 68 cd %TmpDir%
63 69 "C:\Program Files\7-Zip\7z.exe" a -tzip "%OutDir%\ch-portable-%CHTextVersion%.zip" 32bit 64bit