Index: scripts/jenkins/prepare-portable-package.bat =================================================================== diff -u -N -rdc6fd9369a96f87d13abce9d111414b7642c0b67 -r407a3dd62453d99d6e4f6d98c656a7bce85d9615 --- scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision dc6fd9369a96f87d13abce9d111414b7642c0b67) +++ scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision 407a3dd62453d99d6e4f6d98c656a7bce85d9615) @@ -9,6 +9,7 @@ mkdir "%TmpDir%" +rem Prepare 32bit build xcopy "%WORKSPACE%\bin\release\ch.exe" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\32bit\" || exit /B 1 @@ -24,6 +25,7 @@ xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\32bit\help" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\32bit\langs" || exit /B 1 +rem Prepare 64bit build xcopy "%WORKSPACE%\bin\release\ch64.exe" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\chext64.dll" "%TmpDir%\64bit\" || exit /B 1 @@ -39,5 +41,11 @@ xcopy /E /I "%WORKSPACE%\bin\release\help" "%TmpDir%\64bit\help" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\64bit\langs" || exit /B 1 +rem Prepare 32bit shell extension for 64bit build +xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 + cd %TmpDir% "C:\Program Files\7-Zip\7z.exe" a -tzip "%OutDir%\ch-portable-%CHTextVersion%.zip" 32bit 64bit