Index: scripts/jenkins/prepare-portable-package.bat =================================================================== diff -u -N -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -rdc6fd9369a96f87d13abce9d111414b7642c0b67 --- scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision dc6fd9369a96f87d13abce9d111414b7642c0b67) @@ -13,6 +13,7 @@ xcopy "%WORKSPACE%\License.txt" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\libchcore32u.dll" "%TmpDir%\32bit\" || exit /B 1 +xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\libictranslate32u.dll" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\ictranslate.exe" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" || exit /B 1 @@ -27,6 +28,7 @@ xcopy "%WORKSPACE%\License.txt" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\chext64.dll" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\libchcore64u.dll" "%TmpDir%\64bit\" || exit /B 1 +xcopy "%WORKSPACE%\bin\release\liblogger64u.dll" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\libictranslate64u.dll" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\ictranslate64.exe" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" || exit /B 1 Index: scripts/setup.iss =================================================================== diff -u -N -rc87c0a05f25b00a6a8be71e4cb7587bb426fb78d -rdc6fd9369a96f87d13abce9d111414b7642c0b67 --- scripts/setup.iss (.../setup.iss) (revision c87c0a05f25b00a6a8be71e4cb7587bb426fb78d) +++ scripts/setup.iss (.../setup.iss) (revision dc6fd9369a96f87d13abce9d111414b7642c0b67) @@ -15,6 +15,8 @@ #define ShellExtFilename64 "chext64.dll" #define LibCHCoreFilename32 "libchcore32u.dll" #define LibCHCoreFilename64 "libchcore64u.dll" +#define LibLoggerFilename32 "liblogger32u.dll" +#define LibLoggerFilename64 "liblogger64u.dll" #define LibictranslateFilename32 "libictranslate32u.dll" #define LibictranslateFilename64 "libictranslate64u.dll" #define ICTranslateFilename32 "ictranslate.exe" @@ -96,6 +98,8 @@ Source: "..\bin\release\{#ShellExtFilename64}"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete regserver replacesameversion; Check: Is64BitInstallMode Source: "..\bin\release\{#LibCHCoreFilename32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Source: "..\bin\release\{#LibCHCoreFilename64}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode +Source: "..\bin\release\{#LibLoggerFilename32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode +Source: "..\bin\release\{#LibLoggerFilename64}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "..\bin\release\{#LibictranslateFilename32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Source: "..\bin\release\{#LibictranslateFilename64}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "..\bin\release\{#ICTranslateFilename32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Index: src/liblogger/TAsyncMultiLogger.cpp =================================================================== diff -u -N -r8f634460db3f225ca24f2e447b3730d4f0614166 -rdc6fd9369a96f87d13abce9d111414b7642c0b67 --- src/liblogger/TAsyncMultiLogger.cpp (.../TAsyncMultiLogger.cpp) (revision 8f634460db3f225ca24f2e447b3730d4f0614166) +++ src/liblogger/TAsyncMultiLogger.cpp (.../TAsyncMultiLogger.cpp) (revision dc6fd9369a96f87d13abce9d111414b7642c0b67) @@ -121,6 +121,7 @@ } catch (const std::exception& e) { + e; ATLTRACE(e.what()); } } Index: src/liblogger/stdafx.cpp =================================================================== diff -u -N -rcca174e74e108de1f5729e4cc6c46d2b9a5e25a7 -rdc6fd9369a96f87d13abce9d111414b7642c0b67 --- src/liblogger/stdafx.cpp (.../stdafx.cpp) (revision cca174e74e108de1f5729e4cc6c46d2b9a5e25a7) +++ src/liblogger/stdafx.cpp (.../stdafx.cpp) (revision dc6fd9369a96f87d13abce9d111414b7642c0b67) @@ -3,6 +3,3 @@ // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file