diff options
12 files changed, 1556 insertions, 21 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp index 349a66169..285f9bbbb 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp +++ b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp @@ -1,6 +1,8 @@ #include "lib7z_facade.h" +#ifndef Q_OS_WIN #include "StdAfx.h" +#endif #include "Common/MyInitGuid.h" diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h index 45236a5f1..305aac1fd 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h @@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ - static REGISTER_ARC_NAME(x) g_RegisterArc; - + static REGISTER_ARC_NAME(x) g_RegisterArc; \ + void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } #endif diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h index 786b4a4ce..d53c4344a 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h @@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ - static REGISTER_CODEC_NAME(x) g_RegisterCodec; + static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ + void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ RegisterCodec(&g_CodecsInfo[i]); }}; \ - static REGISTER_CODECS_NAME(x) g_RegisterCodecs; - + static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ + void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } #endif diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/installer_framework_changes.txt b/installerbuilder/libinstaller/3rdparty/7zip/unix/installer_framework_changes.txt new file mode 100644 index 000000000..b9e1616f2 --- /dev/null +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/installer_framework_changes.txt @@ -0,0 +1,511 @@ +There are deleted files and very small changes to get the integration process of new versions very simple. +--diff-filter=M means "modified" and +--diff-filter=D means "deleted" files + +=== output of: git diff --diff-filter=M === + +diff --git a/C/AesOpt.c b/C/AesOpt.c +index 60cfd86..c0bd8bc 100644 +--- a/C/AesOpt.c ++++ b/C/AesOpt.c +@@ -5,7 +5,7 @@ + + #ifdef MY_CPU_X86_OR_AMD64 + #if _MSC_VER >= 1500 +-#define USE_INTEL_AES ++//#define USE_INTEL_AES + #endif + #endif + +diff --git a/CPP/7zip/Common/RegisterArc.h b/CPP/7zip/Common/RegisterArc.h +index bc2a034..9b8cbd3 100644 +--- a/CPP/7zip/Common/RegisterArc.h ++++ b/CPP/7zip/Common/RegisterArc.h +@@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); + + #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ + REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ +- static REGISTER_ARC_NAME(x) g_RegisterArc; +- ++ static REGISTER_ARC_NAME(x) g_RegisterArc; \ ++ void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } + #endif +diff --git a/CPP/7zip/Common/RegisterCodec.h b/CPP/7zip/Common/RegisterCodec.h +index 786b4a4..d53c434 100644 +--- a/CPP/7zip/Common/RegisterCodec.h ++++ b/CPP/7zip/Common/RegisterCodec.h +@@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); + + #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ + REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ +- static REGISTER_CODEC_NAME(x) g_RegisterCodec; ++ static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ ++ void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } + + #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x + #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ + REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ + RegisterCodec(&g_CodecsInfo[i]); }}; \ +- static REGISTER_CODECS_NAME(x) g_RegisterCodecs; +- ++ static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ ++ void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } + #endif +diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h +index eb3c52d..f483e39 100644 +--- a/CPP/Common/MyString.h ++++ b/CPP/Common/MyString.h +@@ -7,6 +7,8 @@ + + #include "MyVector.h" + ++#include <windows.h> ++ + template <class T> + inline int MyStringLen(const T *s) + { + +=== output of: git diff --diff-filter=D --name-only === +Asm/x64/7zCrcT8U.asm +Asm/x86/7zCrcT8U.asm +CPP/7zip/Bundles/Alone/makefile +CPP/7zip/Bundles/Alone/makefile.depend +CPP/7zip/Bundles/Alone/makefile.list +CPP/7zip/Bundles/Alone7z/makefile +CPP/7zip/Bundles/Alone7z/makefile.depend +CPP/7zip/Bundles/Alone7z/makefile.list +CPP/7zip/Bundles/AloneGCOV/makefile +CPP/7zip/Bundles/Format7zFree/makefile +CPP/7zip/Bundles/Format7zFree/makefile.depend +CPP/7zip/Bundles/Format7zFree/makefile.list +CPP/7zip/Bundles/SFXCon/Main.cpp +CPP/7zip/Bundles/SFXCon/makefile +CPP/7zip/Bundles/SFXCon/makefile.depend +CPP/7zip/Bundles/SFXCon/makefile.list +CPP/7zip/CMAKE/CMakeLists_7zFM.txt +CPP/7zip/CMAKE/CMakeLists_7zG.txt +CPP/7zip/CMAKE/CMakeLists_7za.txt +CPP/7zip/CMAKE/CMakeLists_ALL.txt +CPP/7zip/CMAKE/CMakeLists_Format7zFree.txt +CPP/7zip/CMAKE/generate.sh +CPP/7zip/CMAKE/generate_xcode.sh +CPP/7zip/Compress/LZMA_Alone/makefile +CPP/7zip/Compress/Rar/makefile +CPP/7zip/Compress/Rar/makefile.depend +CPP/7zip/Compress/Rar/makefile.list +CPP/7zip/PREMAKE/generate.sh +CPP/7zip/PREMAKE/premake4.lua +CPP/7zip/QMAKE/7ZA/7ZA.pro +CPP/7zip/QMAKE/7ZA/7ZA_osx.pro +CPP/7zip/QMAKE/test_emul/test_emul.pro +CPP/7zip/TEST/TestUI/makefile +CPP/7zip/TEST/TestUI/makefile.depend +CPP/7zip/TEST/TestUI/makefile.list +CPP/7zip/UI/Client7z/makefile +CPP/7zip/UI/Client7z/makefile.depend +CPP/7zip/UI/Client7z/makefile.list +CPP/7zip/UI/ClientCodec/makefile +CPP/7zip/UI/ClientCodec/makefile.depend +CPP/7zip/UI/ClientCodec/makefile.list +CPP/7zip/UI/Console/makefile +CPP/7zip/UI/Console/makefile.depend +CPP/7zip/UI/Console/makefile.list +CPP/7zip/UI/Explorer/ContextMenu.h +CPP/7zip/UI/Explorer/MyMessages.cpp +CPP/7zip/UI/Explorer/MyMessages.h +CPP/7zip/UI/FileManager/App.cpp +CPP/7zip/UI/FileManager/App.h +CPP/7zip/UI/FileManager/AppState.h +CPP/7zip/UI/FileManager/BrowseDialog.h +CPP/7zip/UI/FileManager/ClassDefs.cpp +CPP/7zip/UI/FileManager/ComboDialog.cpp +CPP/7zip/UI/FileManager/ComboDialog.h +CPP/7zip/UI/FileManager/ComboDialogRes.h +CPP/7zip/UI/FileManager/ComboDialog_rc.cpp +CPP/7zip/UI/FileManager/CopyDialog.cpp +CPP/7zip/UI/FileManager/CopyDialog.h +CPP/7zip/UI/FileManager/CopyDialogRes.h +CPP/7zip/UI/FileManager/CopyDialog_rc.cpp +CPP/7zip/UI/FileManager/DialogSize.h +CPP/7zip/UI/FileManager/ExtractCallback.cpp +CPP/7zip/UI/FileManager/ExtractCallback.h +CPP/7zip/UI/FileManager/FM.cpp +CPP/7zip/UI/FileManager/FM_rc.cpp +CPP/7zip/UI/FileManager/FSDrives.cpp +CPP/7zip/UI/FileManager/FSDrives.h +CPP/7zip/UI/FileManager/FSFolder.cpp +CPP/7zip/UI/FileManager/FSFolder.h +CPP/7zip/UI/FileManager/FSFolderCopy.cpp +CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp +CPP/7zip/UI/FileManager/FileFolderPluginOpen.h +CPP/7zip/UI/FileManager/FormatUtils.cpp +CPP/7zip/UI/FileManager/FormatUtils.h +CPP/7zip/UI/FileManager/HelpUtils.h +CPP/7zip/UI/FileManager/IFolder.h +CPP/7zip/UI/FileManager/LangUtils.cpp +CPP/7zip/UI/FileManager/LangUtils.h +CPP/7zip/UI/FileManager/ListViewDialog.cpp +CPP/7zip/UI/FileManager/ListViewDialog.h +CPP/7zip/UI/FileManager/ListViewDialogRes.h +CPP/7zip/UI/FileManager/ListViewDialog_rc.cpp +CPP/7zip/UI/FileManager/MessagesDialog.cpp +CPP/7zip/UI/FileManager/MessagesDialog.h +CPP/7zip/UI/FileManager/MessagesDialogRes.h +CPP/7zip/UI/FileManager/MessagesDialog_rc.cpp +CPP/7zip/UI/FileManager/MyLoadMenu.cpp +CPP/7zip/UI/FileManager/MyLoadMenu.h +CPP/7zip/UI/FileManager/NetFolder.h.OUT +CPP/7zip/UI/FileManager/OpenCallback.cpp +CPP/7zip/UI/FileManager/OpenCallback.h +CPP/7zip/UI/FileManager/OverwriteDialog.cpp +CPP/7zip/UI/FileManager/OverwriteDialog.h +CPP/7zip/UI/FileManager/OverwriteDialogRes.h +CPP/7zip/UI/FileManager/OverwriteDialog_rc.cpp +CPP/7zip/UI/FileManager/Panel.cpp +CPP/7zip/UI/FileManager/Panel.h +CPP/7zip/UI/FileManager/PanelCopy.cpp +CPP/7zip/UI/FileManager/PanelCrc.cpp +CPP/7zip/UI/FileManager/PanelCrc.cpp.back +CPP/7zip/UI/FileManager/PanelFolderChange.cpp +CPP/7zip/UI/FileManager/PanelItemOpen.cpp +CPP/7zip/UI/FileManager/PanelItems.cpp +CPP/7zip/UI/FileManager/PanelListNotify.cpp +CPP/7zip/UI/FileManager/PanelMenu.cpp +CPP/7zip/UI/FileManager/PanelOperations.cpp +CPP/7zip/UI/FileManager/PanelSelect.cpp +CPP/7zip/UI/FileManager/PanelSort.cpp +CPP/7zip/UI/FileManager/PanelSplitFile.cpp +CPP/7zip/UI/FileManager/PasswordDialog.cpp +CPP/7zip/UI/FileManager/PasswordDialog.h +CPP/7zip/UI/FileManager/PasswordDialogRes.h +CPP/7zip/UI/FileManager/PasswordDialog_rc.cpp +CPP/7zip/UI/FileManager/PluginInterface.h +CPP/7zip/UI/FileManager/PluginLoader.h +CPP/7zip/UI/FileManager/ProgramLocation.cpp +CPP/7zip/UI/FileManager/ProgramLocation.h +CPP/7zip/UI/FileManager/ProgressDialog2.cpp +CPP/7zip/UI/FileManager/ProgressDialog2.h +CPP/7zip/UI/FileManager/ProgressDialog2Res.h +CPP/7zip/UI/FileManager/ProgressDialog2_rc.cpp +CPP/7zip/UI/FileManager/ProgressDialogRes.h +CPP/7zip/UI/FileManager/PropertyName.cpp +CPP/7zip/UI/FileManager/PropertyName.h +CPP/7zip/UI/FileManager/PropertyNameRes.h +CPP/7zip/UI/FileManager/RegistryAssociations.cpp +CPP/7zip/UI/FileManager/RegistryAssociations.h +CPP/7zip/UI/FileManager/RegistryPlugins.h +CPP/7zip/UI/FileManager/RegistryUtils.cpp +CPP/7zip/UI/FileManager/RegistryUtils.h +CPP/7zip/UI/FileManager/RootFolder.cpp +CPP/7zip/UI/FileManager/RootFolder.h +CPP/7zip/UI/FileManager/SplitDialog.cpp +CPP/7zip/UI/FileManager/SplitDialog.h +CPP/7zip/UI/FileManager/SplitDialogRes.h +CPP/7zip/UI/FileManager/SplitDialog_rc.cpp +CPP/7zip/UI/FileManager/SplitUtils.cpp +CPP/7zip/UI/FileManager/SplitUtils.h +CPP/7zip/UI/FileManager/StringUtils.cpp +CPP/7zip/UI/FileManager/StringUtils.h +CPP/7zip/UI/FileManager/SysIconUtils.cpp +CPP/7zip/UI/FileManager/SysIconUtils.h +CPP/7zip/UI/FileManager/TextPairs.cpp +CPP/7zip/UI/FileManager/TextPairs.h +CPP/7zip/UI/FileManager/UpdateCallback100.cpp +CPP/7zip/UI/FileManager/UpdateCallback100.h +CPP/7zip/UI/FileManager/ViewSettings.cpp +CPP/7zip/UI/FileManager/ViewSettings.h +CPP/7zip/UI/FileManager/err +CPP/7zip/UI/FileManager/makefile +CPP/7zip/UI/FileManager/makefile.depend +CPP/7zip/UI/FileManager/makefile.list +CPP/7zip/UI/FileManager/res/Add2PNG.h +CPP/7zip/UI/FileManager/res/AddPNG.h +CPP/7zip/UI/FileManager/res/Copy2PNG.h +CPP/7zip/UI/FileManager/res/CopyPNG.h +CPP/7zip/UI/FileManager/res/Delete2PNG.h +CPP/7zip/UI/FileManager/res/DeletePNG.h +CPP/7zip/UI/FileManager/res/Extract2PNG.h +CPP/7zip/UI/FileManager/res/ExtractPNG.h +CPP/7zip/UI/FileManager/res/Info2PNG.h +CPP/7zip/UI/FileManager/res/InfoPNG.h +CPP/7zip/UI/FileManager/res/Move2PNG.h +CPP/7zip/UI/FileManager/res/MovePNG.h +CPP/7zip/UI/FileManager/res/ParentFolder.h +CPP/7zip/UI/FileManager/res/Test2PNG.h +CPP/7zip/UI/FileManager/res/TestPNG.h +CPP/7zip/UI/FileManager/resource.h +CPP/7zip/UI/FileManager/resourceGui.h +CPP/7zip/UI/FileManager/wxFM.cpp +CPP/7zip/UI/GUI/makefile +CPP/7zip/UI/GUI/makefile.depend +CPP/7zip/UI/GUI/makefile.list +CPP/7zip/UI/P7ZIP/FileDir.o +CPP/7zip/UI/P7ZIP/FileFind.o +CPP/7zip/UI/P7ZIP/IntToString.o +CPP/7zip/UI/P7ZIP/MyString.o +CPP/7zip/UI/P7ZIP/MyVector.o +CPP/7zip/UI/P7ZIP/StringConvert.o +CPP/7zip/UI/P7ZIP/Threads.o +CPP/7zip/UI/P7ZIP/makefile +CPP/7zip/UI/P7ZIP/makefile.depend +CPP/7zip/UI/P7ZIP/makefile.list +CPP/7zip/UI/P7ZIP/wine_date_and_time.o +CPP/7zip/UI/P7ZIP/wxP7ZIP.o +CPP/myWindows/makefile +CPP/myWindows/makefile.depend +CPP/myWindows/makefile.list +GUI/Contents/Info.plist +GUI/Contents/PkgInfo +GUI/Contents/Resources/p7zip.icns +GUI/Lang/af.txt +GUI/Lang/ar.txt +GUI/Lang/ast.txt +GUI/Lang/az.txt +GUI/Lang/ba.txt +GUI/Lang/be.txt +GUI/Lang/bg.txt +GUI/Lang/bn.txt +GUI/Lang/br.txt +GUI/Lang/ca.txt +GUI/Lang/cs.txt +GUI/Lang/cy.txt +GUI/Lang/da.txt +GUI/Lang/de.txt +GUI/Lang/el.txt +GUI/Lang/en.ttt +GUI/Lang/eo.txt +GUI/Lang/es.txt +GUI/Lang/et.txt +GUI/Lang/eu.txt +GUI/Lang/ext.txt +GUI/Lang/fa.txt +GUI/Lang/fi.txt +GUI/Lang/fr.txt +GUI/Lang/fur.txt +GUI/Lang/fy.txt +GUI/Lang/gl.txt +GUI/Lang/gu.txt +GUI/Lang/he.txt +GUI/Lang/hi.txt +GUI/Lang/hr.txt +GUI/Lang/hu.txt +GUI/Lang/hy.txt +GUI/Lang/id.txt +GUI/Lang/io.txt +GUI/Lang/is.txt +GUI/Lang/it.txt +GUI/Lang/ja.txt +GUI/Lang/ka.txt +GUI/Lang/kk.txt +GUI/Lang/ko.txt +GUI/Lang/ku-ckb.txt +GUI/Lang/ku.txt +GUI/Lang/lt.txt +GUI/Lang/lv.txt +GUI/Lang/mk.txt +GUI/Lang/mn.txt +GUI/Lang/mr.txt +GUI/Lang/ms.txt +GUI/Lang/nb.txt +GUI/Lang/ne.txt +GUI/Lang/nl.txt +GUI/Lang/nn.txt +GUI/Lang/pa-in.txt +GUI/Lang/pl.txt +GUI/Lang/ps.txt +GUI/Lang/pt-br.txt +GUI/Lang/pt.txt +GUI/Lang/ro.txt +GUI/Lang/ru.txt +GUI/Lang/sa.txt +GUI/Lang/si.txt +GUI/Lang/sk.txt +GUI/Lang/sl.txt +GUI/Lang/sq.txt +GUI/Lang/sr-spc.txt +GUI/Lang/sr-spl.txt +GUI/Lang/sv.txt +GUI/Lang/ta.txt +GUI/Lang/th.txt +GUI/Lang/tr.txt +GUI/Lang/tt.txt +GUI/Lang/ug.txt +GUI/Lang/uk.txt +GUI/Lang/uz.txt +GUI/Lang/va.txt +GUI/Lang/vi.txt +GUI/Lang/zh-cn.txt +GUI/Lang/zh-tw.txt +GUI/help/7zip.hhc +GUI/help/7zip.hhk +GUI/help/cmdline/commands/add.htm +GUI/help/cmdline/commands/bench.htm +GUI/help/cmdline/commands/delete.htm +GUI/help/cmdline/commands/extract.htm +GUI/help/cmdline/commands/extract_full.htm +GUI/help/cmdline/commands/index.htm +GUI/help/cmdline/commands/list.htm +GUI/help/cmdline/commands/style.css +GUI/help/cmdline/commands/test.htm +GUI/help/cmdline/commands/update.htm +GUI/help/cmdline/exit_codes.htm +GUI/help/cmdline/index.htm +GUI/help/cmdline/style.css +GUI/help/cmdline/switches/ar_exclude.htm +GUI/help/cmdline/switches/ar_include.htm +GUI/help/cmdline/switches/ar_no.htm +GUI/help/cmdline/switches/charset.htm +GUI/help/cmdline/switches/exclude.htm +GUI/help/cmdline/switches/include.htm +GUI/help/cmdline/switches/index.htm +GUI/help/cmdline/switches/large_pages.htm +GUI/help/cmdline/switches/list_tech.htm +GUI/help/cmdline/switches/method.htm +GUI/help/cmdline/switches/output_dir.htm +GUI/help/cmdline/switches/overwrite.htm +GUI/help/cmdline/switches/password.htm +GUI/help/cmdline/switches/recurse.htm +GUI/help/cmdline/switches/sfx.htm +GUI/help/cmdline/switches/ssc.htm +GUI/help/cmdline/switches/stdin.htm +GUI/help/cmdline/switches/stdout.htm +GUI/help/cmdline/switches/stop_switch.htm +GUI/help/cmdline/switches/style.css +GUI/help/cmdline/switches/type.htm +GUI/help/cmdline/switches/update.htm +GUI/help/cmdline/switches/volume.htm +GUI/help/cmdline/switches/working_dir.htm +GUI/help/cmdline/switches/yes.htm +GUI/help/cmdline/syntax.htm +GUI/help/fm/about.htm +GUI/help/fm/benchmark.htm +GUI/help/fm/index.htm +GUI/help/fm/menu.htm +GUI/help/fm/options.htm +GUI/help/fm/plugins/7-zip/add.htm +GUI/help/fm/plugins/7-zip/extract.htm +GUI/help/fm/plugins/7-zip/index.htm +GUI/help/fm/plugins/7-zip/style.css +GUI/help/fm/plugins/index.htm +GUI/help/fm/plugins/style.css +GUI/help/fm/style.css +GUI/help/general/7z.htm +GUI/help/general/faq.htm +GUI/help/general/formats.htm +GUI/help/general/index.htm +GUI/help/general/license.htm +GUI/help/general/performance.htm +GUI/help/general/style.css +GUI/help/general/thanks.htm +GUI/help/start.htm +GUI/help/style.css +GUI/kde3/p7zip_compress.desktop +GUI/kde3/p7zip_compress2.desktop +GUI/kde3/p7zip_extract.desktop +GUI/kde3/p7zip_extract_subdir.desktop +GUI/kde3/p7zip_extract_to.desktop +GUI/kde3/p7zip_test.desktop +GUI/kde3/readme.txt +GUI/kde4/p7zip_compress.desktop +GUI/kde4/p7zip_compress2.desktop +GUI/kde4/p7zip_extract.desktop +GUI/kde4/p7zip_extract_subdir.desktop +GUI/kde4/p7zip_extract_to.desktop +GUI/kde4/p7zip_test.desktop +GUI/kde4/readme.txt +GUI/p7zipForFilemanager +GUI/p7zip_16.icns +GUI/p7zip_16.png +GUI/p7zip_16_ok.png +GUI/p7zip_32.png +GUI/p7zip_32.xpm +check/check.sh +check/check_7zr.sh +check/check_Client7z.sh +check/check_install.sh +check/clean_all.sh +check/my_86_filter/makefile +check/my_86_filter/makefile.depend +check/my_86_filter/makefile.list +check/my_86_filter/my_86_filter.cpp +check/test/7za.exe.lzma +check/test/7za.exe.lzma86 +check/test/7za.exe.lzma_eos +check/test/7za.exe.xz +check/test/7za433_7zip_bzip2.7z +check/test/7za433_7zip_lzma.7z +check/test/7za433_7zip_lzma2.7z +check/test/7za433_7zip_lzma2_bcj2.7z +check/test/7za433_7zip_lzma2_crypto.7z +check/test/7za433_7zip_lzma_bcj2.7z +check/test/7za433_7zip_lzma_crypto.7z +check/test/7za433_7zip_ppmd.7z +check/test/7za433_7zip_ppmd_bcj2.7z +check/test/7za433_tar.tar +contrib/VirtualFileSystemForMidnightCommander/ChangeLog +contrib/VirtualFileSystemForMidnightCommander/readme +contrib/VirtualFileSystemForMidnightCommander/readme.u7z +contrib/VirtualFileSystemForMidnightCommander/u7z +contrib/gzip-like_CLI_wrapper_for_7z/README +contrib/gzip-like_CLI_wrapper_for_7z/check/check.sh +contrib/gzip-like_CLI_wrapper_for_7z/check/files.tar +contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 +contrib/gzip-like_CLI_wrapper_for_7z/p7zip +contrib/qnx630sp3/qnx630sp3-shared +contrib/qnx630sp3/qnx630sp3-static +install.sh +install_local_context_menu.sh +integration_context_menu.txt +makefile +makefile.aix_gcc +makefile.beos +makefile.crc32 +makefile.cygwin +makefile.cygwin_asm +makefile.djgpp_old +makefile.djgpp_watt +makefile.freebsd5 +makefile.freebsd6 +makefile.glb +makefile.gprof +makefile.hpux-acc +makefile.hpux-acc_64 +makefile.hpux-gcc +makefile.linux_amd64 +makefile.linux_amd64_asm +makefile.linux_amd64_asm_icc +makefile.linux_any_cpu +makefile.linux_any_cpu_gcc_4.X +makefile.linux_clang_amd64 +makefile.linux_cross_arm +makefile.linux_gcc_2.95_no_need_for_libstdc +makefile.linux_other +makefile.linux_s390x +makefile.linux_x86_asm_gcc_4.X +makefile.linux_x86_asm_gcc_4.X_fltk +makefile.linux_x86_asm_gcc_mudflap_4.X +makefile.linux_x86_asm_icc +makefile.linux_x86_icc +makefile.machine +makefile.macosx_32bits +makefile.macosx_32bits_asm +makefile.macosx_32bits_ppc +makefile.macosx_64bits +makefile.macosx_llvm_64bits +makefile.netbsd +makefile.netware_asm_gcc_3.X +makefile.oldmake +makefile.openbsd +makefile.openbsd_no_port +makefile.qnx_shared.bin +makefile.qnx_shared.so +makefile.qnx_static +makefile.rules +makefile.solaris_sparc_CC_32 +makefile.solaris_sparc_CC_64 +makefile.solaris_sparc_gcc +makefile.solaris_x86 +makefile.tru64 +man1/7z.1 +man1/7za.1 +man1/7zr.1 diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/unix.pri b/installerbuilder/libinstaller/3rdparty/7zip/unix/unix.pri new file mode 100644 index 000000000..933e5c027 --- /dev/null +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/unix.pri @@ -0,0 +1,228 @@ +isEmpty(7ZIP_BASE): 7ZIP_BASE = $$(7ZIP_BASE) +isEmpty(7ZIP_BASE): error(Please call qmake with 7ZIP_BASE=<path to nokia-sdk source directory> or add this line before you include that file in your pro file) + +7ZIP_BASE=$$7ZIP_BASE/unix + +DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE NDEBUG _REENTRANT ENV_UNIX BREAK_HANDLER UNICODE _UNICODE + +unix:!macx:DEFINES += ENV_MACOSX + +CXXFLAGS += -fvisibility + +INCLUDEPATH += $$7ZIP_BASE/CPP \ + $$7ZIP_BASE/CPP/myWindows \ + $$7ZIP_BASE/CPP/include_windows + +SOURCES += $$7ZIP_BASE/CPP/myWindows/myGetTickCount.cpp \ + $$7ZIP_BASE/CPP/myWindows/wine_date_and_time.cpp \ + $$7ZIP_BASE/CPP/myWindows/myAddExeFlag.cpp \ + $$7ZIP_BASE/CPP/myWindows/mySplitCommandLine.cpp \ + +SOURCES += \ +$$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp \ +$$7ZIP_BASE/CPP/Common/CommandLineParser.cpp \ +$$7ZIP_BASE/CPP/Common/CRC.cpp \ +$$7ZIP_BASE/CPP/Common/IntToString.cpp \ +$$7ZIP_BASE/CPP/Common/ListFileUtils.cpp \ +$$7ZIP_BASE/CPP/Common/StdInStream.cpp \ +$$7ZIP_BASE/CPP/Common/StdOutStream.cpp \ +$$7ZIP_BASE/CPP/Common/MyString.cpp \ +$$7ZIP_BASE/CPP/Common/StringToInt.cpp \ +$$7ZIP_BASE/CPP/Common/UTFConvert.cpp \ +$$7ZIP_BASE/CPP/Common/StringConvert.cpp \ +$$7ZIP_BASE/CPP/Common/MyWindows.cpp \ +$$7ZIP_BASE/CPP/Common/MyVector.cpp \ +$$7ZIP_BASE/CPP/Common/Wildcard.cpp \ +$$7ZIP_BASE/CPP/Windows/Error.cpp \ +$$7ZIP_BASE/CPP/Windows/FileDir.cpp \ +$$7ZIP_BASE/CPP/Windows/FileFind.cpp \ +$$7ZIP_BASE/CPP/Windows/FileIO.cpp \ +$$7ZIP_BASE/CPP/Windows/FileName.cpp \ +$$7ZIP_BASE/CPP/Windows/PropVariant.cpp \ +$$7ZIP_BASE/CPP/Windows/PropVariantConversions.cpp \ +$$7ZIP_BASE/CPP/Windows/Synchronization.cpp \ +$$7ZIP_BASE/CPP/Windows/System.cpp \ +$$7ZIP_BASE/CPP/Windows/Time.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/CreateCoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/CWrappers.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/FileStreams.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/FilterCoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/InBuffer.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/InOutTempBuffer.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/LimitedStreams.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/LockedStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/MemBlocks.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/MethodId.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/MethodProps.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/OffsetStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/OutBuffer.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/OutMemStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/ProgressMt.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/ProgressUtils.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/StreamBinder.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/StreamObjects.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/StreamUtils.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/VirtThread.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/DefaultName.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/EnumDirItems.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/LoadCodecs.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/OpenArchive.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/SetProperties.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/SortUtils.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/TempFiles.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/Update.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/UpdateAction.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/UpdateCallback.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/UpdatePair.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/UpdateProduce.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/DeflateProps.cpp \ #new +$$7ZIP_BASE/CPP/7zip/Archive/Bz2Handler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/GzHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/LzmaHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/SplitHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/XzHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/ZHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2MT.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/CrossThreadProgress.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/DummyOutStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/FindSignature.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/HandlerOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/InStreamWithCRC.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/ItemNameUtils.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/MultiStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/ParseProperties.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zCompressionMode.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zDecode.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zEncode.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zExtract.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zFolderInStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zFolderOutStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zHandlerOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zHeader.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zIn.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zProperties.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zSpecStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabBlockInStream.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHeader.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabIn.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandlerOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHeader.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarIn.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipAddCommon.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHeader.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipIn.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipItem.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipOut.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BcjCoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Bcj2Coder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BitlDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BranchCoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BranchMisc.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/ByteSwap.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BZip2Crc.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BZip2Decoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BZip2Encoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/CopyCoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/DeflateDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/DeflateEncoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/DeltaFilter.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/ImplodeDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Lzma2Decoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Lzma2Encoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzmaDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzmaEncoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzOutWindow.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Lzx86Converter.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzxDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/PpmdDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/PpmdEncoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/PpmdZip.cpp \ #new +$$7ZIP_BASE/CPP/7zip/Compress/QuantumDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/ShrinkDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/ZDecoder.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/7zAes.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/HmacSha1.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/MyAes.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/RandGen.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/Sha1.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/WzAes.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/ZipCrypto.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/ZipStrong.cpp \ +$$7ZIP_BASE/C/7zStream.c \ +$$7ZIP_BASE/C/Aes.c \ +$$7ZIP_BASE/C/Bra.c \ +$$7ZIP_BASE/C/Bra86.c \ +$$7ZIP_BASE/C/BraIA64.c \ +$$7ZIP_BASE/C/BwtSort.c \ +$$7ZIP_BASE/C/Delta.c \ +$$7ZIP_BASE/C/HuffEnc.c \ +$$7ZIP_BASE/C/LzFind.c \ +$$7ZIP_BASE/C/LzFindMt.c \ +$$7ZIP_BASE/C/Lzma2Dec.c \ +$$7ZIP_BASE/C/Lzma2Enc.c \ +$$7ZIP_BASE/C/LzmaDec.c \ +$$7ZIP_BASE/C/LzmaEnc.c \ +$$7ZIP_BASE/C/MtCoder.c \ +$$7ZIP_BASE/C/Sha256.c \ +$$7ZIP_BASE/C/Sort.c \ +$$7ZIP_BASE/C/Threads.c \ +$$7ZIP_BASE/C/Xz.c \ +$$7ZIP_BASE/C/XzCrc64.c \ +$$7ZIP_BASE/C/XzDec.c \ +$$7ZIP_BASE/C/XzEnc.c \ +$$7ZIP_BASE/C/XzIn.c \ +$$7ZIP_BASE/C/7zCrc.c \ +$$7ZIP_BASE/C/Ppmd7Enc.c \ #new +$$7ZIP_BASE/C/Ppmd7Dec.c \ #new +$$7ZIP_BASE/C/Ppmd7.c \ #new +$$7ZIP_BASE/C/Ppmd8.c \ #new +$$7ZIP_BASE/C/Ppmd8Enc.c \ #new +$$7ZIP_BASE/C/Ppmd8Dec.c \ #new +$$7ZIP_BASE/C/Alloc.c \ #new +$$7ZIP_BASE/C/7zCrcOpt.c \ #new +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Bcj2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BcjRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BranchRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BZip2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/CopyRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Deflate64Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/DeflateRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Lzma2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzmaRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/PpmdRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/7zAesRegister.cpp + + diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterArc.h b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterArc.h index bc2a034fd..9b8cbd39d 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterArc.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterArc.h @@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ - static REGISTER_ARC_NAME(x) g_RegisterArc; - + static REGISTER_ARC_NAME(x) g_RegisterArc; \ + void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } #endif diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterCodec.h b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterCodec.h index 786b4a4ce..d53c4344a 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterCodec.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/RegisterCodec.h @@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ - static REGISTER_CODEC_NAME(x) g_RegisterCodec; + static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ + void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ RegisterCodec(&g_CodecsInfo[i]); }}; \ - static REGISTER_CODECS_NAME(x) g_RegisterCodecs; - + static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ + void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } #endif diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/Common/MyString.h b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/Common/MyString.h index eb3c52dc5..f483e39dc 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/Common/MyString.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/Common/MyString.h @@ -7,6 +7,8 @@ #include "MyVector.h" +#include <windows.h> + template <class T> inline int MyStringLen(const T *s) { diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/installer_framework_changes.txt b/installerbuilder/libinstaller/3rdparty/7zip/win/installer_framework_changes.txt new file mode 100644 index 000000000..2701503f9 --- /dev/null +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/installer_framework_changes.txt @@ -0,0 +1,519 @@ +There are deleted files and very small changes to get the integration process of new versions very simple. +--diff-filter=M means "modified" and +--diff-filter=D means "deleted" files + +=== output of: git diff --diff-filter=M === + +diff --git a/C/AesOpt.c b/C/AesOpt.c +index 60cfd86..c0bd8bc 100644 +--- a/C/AesOpt.c ++++ b/C/AesOpt.c +@@ -5,7 +5,7 @@ + + #ifdef MY_CPU_X86_OR_AMD64 + #if _MSC_VER >= 1500 +-#define USE_INTEL_AES ++//#define USE_INTEL_AES + #endif + #endif + +diff --git a/CPP/7zip/Common/RegisterArc.h b/CPP/7zip/Common/RegisterArc.h +index bc2a034..9b8cbd3 100644 +--- a/CPP/7zip/Common/RegisterArc.h ++++ b/CPP/7zip/Common/RegisterArc.h +@@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); + + #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ + REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ +- static REGISTER_ARC_NAME(x) g_RegisterArc; +- ++ static REGISTER_ARC_NAME(x) g_RegisterArc; \ ++ void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } + #endif +diff --git a/CPP/7zip/Common/RegisterCodec.h b/CPP/7zip/Common/RegisterCodec.h +index 786b4a4..d53c434 100644 +--- a/CPP/7zip/Common/RegisterCodec.h ++++ b/CPP/7zip/Common/RegisterCodec.h +@@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); + + #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ + REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ +- static REGISTER_CODEC_NAME(x) g_RegisterCodec; ++ static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ ++ void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } + + #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x + #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ + REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ + RegisterCodec(&g_CodecsInfo[i]); }}; \ +- static REGISTER_CODECS_NAME(x) g_RegisterCodecs; +- ++ static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ ++ void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } + #endif +diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h +index eb3c52d..f483e39 100644 +--- a/CPP/Common/MyString.h ++++ b/CPP/Common/MyString.h +@@ -7,6 +7,8 @@ + + #include "MyVector.h" + ++#include <windows.h> ++ + template <class T> + inline int MyStringLen(const T *s) + { + +=== output of: git diff --diff-filter=D --name-only === +Asm/arm/7zCrcOpt.asm +Asm/x86/7zAsm.asm +Asm/x86/7zCrcOpt.asm +Asm/x86/AesOpt.asm +C/Util/7z/7z.dsp +C/Util/7z/7z.dsw +C/Util/7z/7zMain.c +C/Util/7z/makefile +C/Util/7z/makefile.gcc +C/Util/Lzma/LzmaUtil.c +C/Util/Lzma/LzmaUtil.dsp +C/Util/Lzma/LzmaUtil.dsw +C/Util/Lzma/makefile +C/Util/Lzma/makefile.gcc +C/Util/LzmaLib/LzmaLib.def +C/Util/LzmaLib/LzmaLib.dsp +C/Util/LzmaLib/LzmaLib.dsw +C/Util/LzmaLib/LzmaLibExports.c +C/Util/LzmaLib/makefile +C/Util/LzmaLib/resource.rc +C/Util/SfxSetup/SfxSetup.c +C/Util/SfxSetup/SfxSetup.dsp +C/Util/SfxSetup/SfxSetup.dsw +C/Util/SfxSetup/makefile +C/Util/SfxSetup/makefile_con +C/Util/SfxSetup/resource.rc +C/Util/SfxSetup/setup.ico +CPP/7zip/Aes.mak +CPP/7zip/Archive/7z/7z.dsp +CPP/7zip/Archive/7z/7z.dsw +CPP/7zip/Archive/7z/makefile +CPP/7zip/Archive/7z/resource.rc +CPP/7zip/Archive/Archive.def +CPP/7zip/Archive/Archive2.def +CPP/7zip/Archive/Icons/7z.ico +CPP/7zip/Archive/Icons/arj.ico +CPP/7zip/Archive/Icons/bz2.ico +CPP/7zip/Archive/Icons/cab.ico +CPP/7zip/Archive/Icons/cpio.ico +CPP/7zip/Archive/Icons/deb.ico +CPP/7zip/Archive/Icons/dmg.ico +CPP/7zip/Archive/Icons/fat.ico +CPP/7zip/Archive/Icons/gz.ico +CPP/7zip/Archive/Icons/hfs.ico +CPP/7zip/Archive/Icons/iso.ico +CPP/7zip/Archive/Icons/lzh.ico +CPP/7zip/Archive/Icons/lzma.ico +CPP/7zip/Archive/Icons/ntfs.ico +CPP/7zip/Archive/Icons/rar.ico +CPP/7zip/Archive/Icons/rpm.ico +CPP/7zip/Archive/Icons/split.ico +CPP/7zip/Archive/Icons/squashfs.ico +CPP/7zip/Archive/Icons/tar.ico +CPP/7zip/Archive/Icons/vhd.ico +CPP/7zip/Archive/Icons/wim.ico +CPP/7zip/Archive/Icons/xar.ico +CPP/7zip/Archive/Icons/xz.ico +CPP/7zip/Archive/Icons/z.ico +CPP/7zip/Archive/Icons/zip.ico +CPP/7zip/Archive/makefile +CPP/7zip/Asm.mak +CPP/7zip/Bundles/Alone/Alone.dsp +CPP/7zip/Bundles/Alone/Alone.dsw +CPP/7zip/Bundles/Alone/StdAfx.cpp +CPP/7zip/Bundles/Alone/StdAfx.h +CPP/7zip/Bundles/Alone/afxres.h +CPP/7zip/Bundles/Alone/makefile +CPP/7zip/Bundles/Alone/resource.rc +CPP/7zip/Bundles/Alone7z/StdAfx.cpp +CPP/7zip/Bundles/Alone7z/StdAfx.h +CPP/7zip/Bundles/Alone7z/makefile +CPP/7zip/Bundles/Alone7z/resource.rc +CPP/7zip/Bundles/Fm/FM.dsp +CPP/7zip/Bundles/Fm/FM.dsw +CPP/7zip/Bundles/Fm/StdAfx.cpp +CPP/7zip/Bundles/Fm/StdAfx.h +CPP/7zip/Bundles/Fm/makefile +CPP/7zip/Bundles/Fm/resource.rc +CPP/7zip/Bundles/Format7z/StdAfx.cpp +CPP/7zip/Bundles/Format7z/StdAfx.h +CPP/7zip/Bundles/Format7z/makefile +CPP/7zip/Bundles/Format7z/resource.rc +CPP/7zip/Bundles/Format7zExtract/StdAfx.cpp +CPP/7zip/Bundles/Format7zExtract/StdAfx.h +CPP/7zip/Bundles/Format7zExtract/makefile +CPP/7zip/Bundles/Format7zExtract/resource.rc +CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp +CPP/7zip/Bundles/Format7zExtractR/StdAfx.h +CPP/7zip/Bundles/Format7zExtractR/makefile +CPP/7zip/Bundles/Format7zExtractR/resource.rc +CPP/7zip/Bundles/Format7zF/Format7z.dsp +CPP/7zip/Bundles/Format7zF/Format7z.dsw +CPP/7zip/Bundles/Format7zF/StdAfx.cpp +CPP/7zip/Bundles/Format7zF/StdAfx.h +CPP/7zip/Bundles/Format7zF/makefile +CPP/7zip/Bundles/Format7zF/resource.rc +CPP/7zip/Bundles/Format7zR/StdAfx.cpp +CPP/7zip/Bundles/Format7zR/StdAfx.h +CPP/7zip/Bundles/Format7zR/makefile +CPP/7zip/Bundles/Format7zR/resource.rc +CPP/7zip/Bundles/LzmaCon/LzmaAlone.cpp +CPP/7zip/Bundles/LzmaCon/LzmaCon.dsp +CPP/7zip/Bundles/LzmaCon/LzmaCon.dsw +CPP/7zip/Bundles/LzmaCon/StdAfx.cpp +CPP/7zip/Bundles/LzmaCon/StdAfx.h +CPP/7zip/Bundles/LzmaCon/makefile +CPP/7zip/Bundles/LzmaCon/makefile.gcc +CPP/7zip/Bundles/SFXCon/7z.ico +CPP/7zip/Bundles/SFXCon/Main.cpp +CPP/7zip/Bundles/SFXCon/SFXCon.dsp +CPP/7zip/Bundles/SFXCon/SFXCon.dsw +CPP/7zip/Bundles/SFXCon/StdAfx.cpp +CPP/7zip/Bundles/SFXCon/StdAfx.h +CPP/7zip/Bundles/SFXCon/makefile +CPP/7zip/Bundles/SFXCon/resource.rc +CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp +CPP/7zip/Bundles/SFXSetup/ExtractCallback.h +CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp +CPP/7zip/Bundles/SFXSetup/ExtractEngine.h +CPP/7zip/Bundles/SFXSetup/Main.cpp +CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp +CPP/7zip/Bundles/SFXSetup/SFXSetup.dsw +CPP/7zip/Bundles/SFXSetup/StdAfx.cpp +CPP/7zip/Bundles/SFXSetup/StdAfx.h +CPP/7zip/Bundles/SFXSetup/makefile +CPP/7zip/Bundles/SFXSetup/resource.h +CPP/7zip/Bundles/SFXSetup/resource.rc +CPP/7zip/Bundles/SFXSetup/setup.ico +CPP/7zip/Bundles/SFXWin/7z.ico +CPP/7zip/Bundles/SFXWin/Main.cpp +CPP/7zip/Bundles/SFXWin/SFXWin.dsp +CPP/7zip/Bundles/SFXWin/SFXWin.dsw +CPP/7zip/Bundles/SFXWin/StdAfx.cpp +CPP/7zip/Bundles/SFXWin/StdAfx.h +CPP/7zip/Bundles/SFXWin/makefile +CPP/7zip/Bundles/SFXWin/resource.h +CPP/7zip/Bundles/SFXWin/resource.rc +CPP/7zip/Bundles/makefile +CPP/7zip/Compress/Codec.def +CPP/7zip/Compress/makefile +CPP/7zip/Crc.mak +CPP/7zip/Crypto/Codec.def +CPP/7zip/GuiCommon.rc +CPP/7zip/MyVersionInfo.rc +CPP/7zip/SubBuild.mak +CPP/7zip/UI/Agent/Agent.cpp +CPP/7zip/UI/Agent/Agent.h +CPP/7zip/UI/Agent/AgentOut.cpp +CPP/7zip/UI/Agent/AgentProxy.cpp +CPP/7zip/UI/Agent/AgentProxy.h +CPP/7zip/UI/Agent/ArchiveFolder.cpp +CPP/7zip/UI/Agent/ArchiveFolderOpen.cpp +CPP/7zip/UI/Agent/ArchiveFolderOut.cpp +CPP/7zip/UI/Agent/IFolderArchive.h +CPP/7zip/UI/Agent/UpdateCallbackAgent.cpp +CPP/7zip/UI/Agent/UpdateCallbackAgent.h +CPP/7zip/UI/Client7z/Client7z.cpp +CPP/7zip/UI/Client7z/Client7z.dsp +CPP/7zip/UI/Client7z/Client7z.dsw +CPP/7zip/UI/Client7z/StdAfx.cpp +CPP/7zip/UI/Client7z/StdAfx.h +CPP/7zip/UI/Client7z/makefile +CPP/7zip/UI/Console/Console.dsp +CPP/7zip/UI/Console/Console.dsw +CPP/7zip/UI/Console/makefile +CPP/7zip/UI/Console/resource.rc +CPP/7zip/UI/Explorer/7-zip.dll.manifest +CPP/7zip/UI/Explorer/ContextMenu.cpp +CPP/7zip/UI/Explorer/ContextMenu.h +CPP/7zip/UI/Explorer/ContextMenuFlags.h +CPP/7zip/UI/Explorer/DllExports.cpp +CPP/7zip/UI/Explorer/Explorer.def +CPP/7zip/UI/Explorer/Explorer.dsp +CPP/7zip/UI/Explorer/Explorer.dsw +CPP/7zip/UI/Explorer/MyMessages.cpp +CPP/7zip/UI/Explorer/MyMessages.h +CPP/7zip/UI/Explorer/OptionsDialog.cpp +CPP/7zip/UI/Explorer/OptionsDialog.h +CPP/7zip/UI/Explorer/RegistryContextMenu.cpp +CPP/7zip/UI/Explorer/RegistryContextMenu.h +CPP/7zip/UI/Explorer/StdAfx.cpp +CPP/7zip/UI/Explorer/StdAfx.h +CPP/7zip/UI/Explorer/makefile +CPP/7zip/UI/Explorer/resource.h +CPP/7zip/UI/Explorer/resource.rc +CPP/7zip/UI/Explorer/resource2.rc +CPP/7zip/UI/Far/ExtractEngine.cpp +CPP/7zip/UI/Far/ExtractEngine.h +CPP/7zip/UI/Far/Far.def +CPP/7zip/UI/Far/Far.dsp +CPP/7zip/UI/Far/Far.dsw +CPP/7zip/UI/Far/FarPlugin.h +CPP/7zip/UI/Far/FarUtils.cpp +CPP/7zip/UI/Far/FarUtils.h +CPP/7zip/UI/Far/Main.cpp +CPP/7zip/UI/Far/Messages.h +CPP/7zip/UI/Far/OverwriteDialog.cpp +CPP/7zip/UI/Far/OverwriteDialog.h +CPP/7zip/UI/Far/Plugin.cpp +CPP/7zip/UI/Far/Plugin.h +CPP/7zip/UI/Far/PluginCommon.cpp +CPP/7zip/UI/Far/PluginDelete.cpp +CPP/7zip/UI/Far/PluginRead.cpp +CPP/7zip/UI/Far/PluginWrite.cpp +CPP/7zip/UI/Far/ProgressBox.cpp +CPP/7zip/UI/Far/ProgressBox.h +CPP/7zip/UI/Far/StdAfx.cpp +CPP/7zip/UI/Far/StdAfx.h +CPP/7zip/UI/Far/UpdateCallback100.cpp +CPP/7zip/UI/Far/UpdateCallback100.h +CPP/7zip/UI/Far/makefile +CPP/7zip/UI/Far/resource.rc +CPP/7zip/UI/FileManager/7zFM.exe.manifest +CPP/7zip/UI/FileManager/7zipLogo.ico +CPP/7zip/UI/FileManager/AboutDialog.cpp +CPP/7zip/UI/FileManager/AboutDialog.h +CPP/7zip/UI/FileManager/AboutDialog.rc +CPP/7zip/UI/FileManager/AboutDialogRes.h +CPP/7zip/UI/FileManager/Add.bmp +CPP/7zip/UI/FileManager/Add2.bmp +CPP/7zip/UI/FileManager/App.cpp +CPP/7zip/UI/FileManager/App.h +CPP/7zip/UI/FileManager/AppState.h +CPP/7zip/UI/FileManager/BrowseDialog.cpp +CPP/7zip/UI/FileManager/BrowseDialog.h +CPP/7zip/UI/FileManager/BrowseDialog.rc +CPP/7zip/UI/FileManager/BrowseDialogRes.h +CPP/7zip/UI/FileManager/ClassDefs.cpp +CPP/7zip/UI/FileManager/ComboDialog.cpp +CPP/7zip/UI/FileManager/ComboDialog.h +CPP/7zip/UI/FileManager/ComboDialog.rc +CPP/7zip/UI/FileManager/ComboDialogRes.h +CPP/7zip/UI/FileManager/Copy.bmp +CPP/7zip/UI/FileManager/Copy2.bmp +CPP/7zip/UI/FileManager/CopyDialog.cpp +CPP/7zip/UI/FileManager/CopyDialog.h +CPP/7zip/UI/FileManager/CopyDialog.rc +CPP/7zip/UI/FileManager/CopyDialogRes.h +CPP/7zip/UI/FileManager/Delete.bmp +CPP/7zip/UI/FileManager/Delete2.bmp +CPP/7zip/UI/FileManager/DialogSize.h +CPP/7zip/UI/FileManager/EditPage.cpp +CPP/7zip/UI/FileManager/EditPage.h +CPP/7zip/UI/FileManager/EditPage.rc +CPP/7zip/UI/FileManager/EditPage2.rc +CPP/7zip/UI/FileManager/EditPageRes.h +CPP/7zip/UI/FileManager/EnumFormatEtc.cpp +CPP/7zip/UI/FileManager/EnumFormatEtc.h +CPP/7zip/UI/FileManager/Extract.bmp +CPP/7zip/UI/FileManager/Extract2.bmp +CPP/7zip/UI/FileManager/ExtractCallback.cpp +CPP/7zip/UI/FileManager/ExtractCallback.h +CPP/7zip/UI/FileManager/FM.cpp +CPP/7zip/UI/FileManager/FM.dsp +CPP/7zip/UI/FileManager/FM.dsw +CPP/7zip/UI/FileManager/FM.ico +CPP/7zip/UI/FileManager/FSDrives.cpp +CPP/7zip/UI/FileManager/FSDrives.h +CPP/7zip/UI/FileManager/FSFolder.cpp +CPP/7zip/UI/FileManager/FSFolder.h +CPP/7zip/UI/FileManager/FSFolderCopy.cpp +CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp +CPP/7zip/UI/FileManager/FileFolderPluginOpen.h +CPP/7zip/UI/FileManager/FilePlugins.cpp +CPP/7zip/UI/FileManager/FilePlugins.h +CPP/7zip/UI/FileManager/FoldersPage.cpp +CPP/7zip/UI/FileManager/FoldersPage.h +CPP/7zip/UI/FileManager/FoldersPage.rc +CPP/7zip/UI/FileManager/FoldersPage2.rc +CPP/7zip/UI/FileManager/FoldersPageRes.h +CPP/7zip/UI/FileManager/FormatUtils.cpp +CPP/7zip/UI/FileManager/FormatUtils.h +CPP/7zip/UI/FileManager/HelpUtils.cpp +CPP/7zip/UI/FileManager/HelpUtils.h +CPP/7zip/UI/FileManager/IFolder.h +CPP/7zip/UI/FileManager/Info.bmp +CPP/7zip/UI/FileManager/Info2.bmp +CPP/7zip/UI/FileManager/LangPage.cpp +CPP/7zip/UI/FileManager/LangPage.h +CPP/7zip/UI/FileManager/LangPage.rc +CPP/7zip/UI/FileManager/LangPageRes.h +CPP/7zip/UI/FileManager/LangUtils.cpp +CPP/7zip/UI/FileManager/LangUtils.h +CPP/7zip/UI/FileManager/ListViewDialog.cpp +CPP/7zip/UI/FileManager/ListViewDialog.h +CPP/7zip/UI/FileManager/ListViewDialog.rc +CPP/7zip/UI/FileManager/ListViewDialogRes.h +CPP/7zip/UI/FileManager/MenuPage.cpp +CPP/7zip/UI/FileManager/MenuPage.h +CPP/7zip/UI/FileManager/MenuPage.rc +CPP/7zip/UI/FileManager/MenuPage2.rc +CPP/7zip/UI/FileManager/MenuPageRes.h +CPP/7zip/UI/FileManager/MessagesDialog.cpp +CPP/7zip/UI/FileManager/MessagesDialog.h +CPP/7zip/UI/FileManager/MessagesDialog.rc +CPP/7zip/UI/FileManager/MessagesDialogRes.h +CPP/7zip/UI/FileManager/Move.bmp +CPP/7zip/UI/FileManager/Move2.bmp +CPP/7zip/UI/FileManager/MyCom2.h +CPP/7zip/UI/FileManager/MyLoadMenu.cpp +CPP/7zip/UI/FileManager/MyLoadMenu.h +CPP/7zip/UI/FileManager/NetFolder.cpp +CPP/7zip/UI/FileManager/NetFolder.h +CPP/7zip/UI/FileManager/OpenCallback.cpp +CPP/7zip/UI/FileManager/OpenCallback.h +CPP/7zip/UI/FileManager/OptionsDialog.cpp +CPP/7zip/UI/FileManager/OverwriteDialog.cpp +CPP/7zip/UI/FileManager/OverwriteDialog.h +CPP/7zip/UI/FileManager/OverwriteDialog.rc +CPP/7zip/UI/FileManager/OverwriteDialogRes.h +CPP/7zip/UI/FileManager/Panel.cpp +CPP/7zip/UI/FileManager/Panel.h +CPP/7zip/UI/FileManager/PanelCopy.cpp +CPP/7zip/UI/FileManager/PanelCrc.cpp +CPP/7zip/UI/FileManager/PanelDrag.cpp +CPP/7zip/UI/FileManager/PanelFolderChange.cpp +CPP/7zip/UI/FileManager/PanelItemOpen.cpp +CPP/7zip/UI/FileManager/PanelItems.cpp +CPP/7zip/UI/FileManager/PanelKey.cpp +CPP/7zip/UI/FileManager/PanelListNotify.cpp +CPP/7zip/UI/FileManager/PanelMenu.cpp +CPP/7zip/UI/FileManager/PanelOperations.cpp +CPP/7zip/UI/FileManager/PanelSelect.cpp +CPP/7zip/UI/FileManager/PanelSort.cpp +CPP/7zip/UI/FileManager/PanelSplitFile.cpp +CPP/7zip/UI/FileManager/PasswordDialog.cpp +CPP/7zip/UI/FileManager/PasswordDialog.h +CPP/7zip/UI/FileManager/PasswordDialog.rc +CPP/7zip/UI/FileManager/PasswordDialogRes.h +CPP/7zip/UI/FileManager/PluginInterface.h +CPP/7zip/UI/FileManager/PluginLoader.h +CPP/7zip/UI/FileManager/PluginsPage.cpp +CPP/7zip/UI/FileManager/PluginsPage.h +CPP/7zip/UI/FileManager/PluginsPage.rc +CPP/7zip/UI/FileManager/PluginsPageRes.h +CPP/7zip/UI/FileManager/ProgramLocation.cpp +CPP/7zip/UI/FileManager/ProgramLocation.h +CPP/7zip/UI/FileManager/ProgressDialog.cpp +CPP/7zip/UI/FileManager/ProgressDialog.h +CPP/7zip/UI/FileManager/ProgressDialog.rc +CPP/7zip/UI/FileManager/ProgressDialog2.cpp +CPP/7zip/UI/FileManager/ProgressDialog2.h +CPP/7zip/UI/FileManager/ProgressDialog2.rc +CPP/7zip/UI/FileManager/ProgressDialog2Res.h +CPP/7zip/UI/FileManager/ProgressDialog2a.rc +CPP/7zip/UI/FileManager/ProgressDialogRes.h +CPP/7zip/UI/FileManager/PropertyName.cpp +CPP/7zip/UI/FileManager/PropertyName.h +CPP/7zip/UI/FileManager/PropertyName.rc +CPP/7zip/UI/FileManager/PropertyNameRes.h +CPP/7zip/UI/FileManager/RegistryAssociations.cpp +CPP/7zip/UI/FileManager/RegistryAssociations.h +CPP/7zip/UI/FileManager/RegistryPlugins.cpp +CPP/7zip/UI/FileManager/RegistryPlugins.h +CPP/7zip/UI/FileManager/RegistryUtils.cpp +CPP/7zip/UI/FileManager/RegistryUtils.h +CPP/7zip/UI/FileManager/RootFolder.cpp +CPP/7zip/UI/FileManager/RootFolder.h +CPP/7zip/UI/FileManager/SettingsPage.cpp +CPP/7zip/UI/FileManager/SettingsPage.h +CPP/7zip/UI/FileManager/SettingsPage.rc +CPP/7zip/UI/FileManager/SettingsPage2.rc +CPP/7zip/UI/FileManager/SettingsPageRes.h +CPP/7zip/UI/FileManager/SplitDialog.cpp +CPP/7zip/UI/FileManager/SplitDialog.h +CPP/7zip/UI/FileManager/SplitDialog.rc +CPP/7zip/UI/FileManager/SplitDialogRes.h +CPP/7zip/UI/FileManager/SplitUtils.cpp +CPP/7zip/UI/FileManager/SplitUtils.h +CPP/7zip/UI/FileManager/StdAfx.cpp +CPP/7zip/UI/FileManager/StdAfx.h +CPP/7zip/UI/FileManager/StringUtils.cpp +CPP/7zip/UI/FileManager/StringUtils.h +CPP/7zip/UI/FileManager/SysIconUtils.cpp +CPP/7zip/UI/FileManager/SysIconUtils.h +CPP/7zip/UI/FileManager/SystemPage.cpp +CPP/7zip/UI/FileManager/SystemPage.h +CPP/7zip/UI/FileManager/SystemPage.rc +CPP/7zip/UI/FileManager/SystemPageRes.h +CPP/7zip/UI/FileManager/Test.bmp +CPP/7zip/UI/FileManager/Test2.bmp +CPP/7zip/UI/FileManager/TextPairs.cpp +CPP/7zip/UI/FileManager/TextPairs.h +CPP/7zip/UI/FileManager/UpdateCallback100.cpp +CPP/7zip/UI/FileManager/UpdateCallback100.h +CPP/7zip/UI/FileManager/ViewSettings.cpp +CPP/7zip/UI/FileManager/ViewSettings.h +CPP/7zip/UI/FileManager/makefile +CPP/7zip/UI/FileManager/resource.h +CPP/7zip/UI/FileManager/resource.rc +CPP/7zip/UI/FileManager/resourceGui.h +CPP/7zip/UI/FileManager/resourceGui.rc +CPP/7zip/UI/GUI/7zG.exe.manifest +CPP/7zip/UI/GUI/BenchmarkDialog.cpp +CPP/7zip/UI/GUI/BenchmarkDialog.h +CPP/7zip/UI/GUI/BenchmarkDialog.rc +CPP/7zip/UI/GUI/BenchmarkDialogRes.h +CPP/7zip/UI/GUI/CompressDialog.cpp +CPP/7zip/UI/GUI/CompressDialog.h +CPP/7zip/UI/GUI/CompressDialog.rc +CPP/7zip/UI/GUI/CompressDialogRes.h +CPP/7zip/UI/GUI/Extract.rc +CPP/7zip/UI/GUI/ExtractDialog.cpp +CPP/7zip/UI/GUI/ExtractDialog.h +CPP/7zip/UI/GUI/ExtractDialog.rc +CPP/7zip/UI/GUI/ExtractDialogRes.h +CPP/7zip/UI/GUI/ExtractGUI.cpp +CPP/7zip/UI/GUI/ExtractGUI.h +CPP/7zip/UI/GUI/ExtractRes.h +CPP/7zip/UI/GUI/FM.ico +CPP/7zip/UI/GUI/GUI.cpp +CPP/7zip/UI/GUI/GUI.dsp +CPP/7zip/UI/GUI/GUI.dsw +CPP/7zip/UI/GUI/StdAfx.cpp +CPP/7zip/UI/GUI/StdAfx.h +CPP/7zip/UI/GUI/UpdateCallbackGUI.cpp +CPP/7zip/UI/GUI/UpdateCallbackGUI.h +CPP/7zip/UI/GUI/UpdateGUI.cpp +CPP/7zip/UI/GUI/UpdateGUI.h +CPP/7zip/UI/GUI/makefile +CPP/7zip/UI/GUI/resource.rc +CPP/7zip/UI/GUI/resource2.h +CPP/7zip/UI/GUI/resource2.rc +CPP/7zip/UI/makefile +CPP/7zip/makefile +CPP/Build.mak +CPP/Windows/Control/ComboBox.cpp +CPP/Windows/Control/ComboBox.h +CPP/Windows/Control/CommandBar.h +CPP/Windows/Control/Dialog.cpp +CPP/Windows/Control/Dialog.h +CPP/Windows/Control/Edit.h +CPP/Windows/Control/ImageList.cpp +CPP/Windows/Control/ImageList.h +CPP/Windows/Control/ListView.cpp +CPP/Windows/Control/ListView.h +CPP/Windows/Control/ProgressBar.h +CPP/Windows/Control/PropertyPage.cpp +CPP/Windows/Control/PropertyPage.h +CPP/Windows/Control/ReBar.h +CPP/Windows/Control/Static.h +CPP/Windows/Control/StatusBar.h +CPP/Windows/Control/StdAfx.h +CPP/Windows/Control/ToolBar.h +CPP/Windows/Control/Trackbar.h +CPP/Windows/Control/Window2.cpp +CPP/Windows/Control/Window2.h +DOC/7zip.hhp +DOC/7zip.inf +DOC/7zip.nsi +DOC/7zip.wxs diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri b/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri new file mode 100644 index 000000000..1045d02a1 --- /dev/null +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri @@ -0,0 +1,274 @@ +isEmpty(7ZIP_BASE): 7ZIP_BASE = $$(7ZIP_BASE) +isEmpty(7ZIP_BASE): error(Please call qmake with 7ZIP_BASE=<path to nokia-sdk source directory> or add this line before you include that file in your pro file) + +7ZIP_BASE=$$7ZIP_BASE/win + +CONFIG += no_batch # this is needed because we have a same named *.c and *.cpp file -> 7in + +win32:LIBS += -loleaut32 -luser32 -ladvapi32 + +DEFINES += WIN_LONG_PATH _UNICODE _CRT_SECURE_NO_WARNINGS + +INCLUDEPATH += $$7ZIP_BASE/CPP + +#$(CONSOLE_OBJS): ../../UI/Console/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/BenchCon.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/Main.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/MainAr.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/StdAfx.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp + +#$(COMMON_OBJS): ../../../Common/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/Common/CommandLineParser.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/CRC.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/C_FileIO.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/IntToString.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/ListFileUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/MyString.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/MyVector.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/NewHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/StdInStream.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/StdOutStream.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/StringConvert.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/StringToInt.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/UTFConvert.cpp +SOURCES += $$7ZIP_BASE/CPP/Common/Wildcard.cpp + +#$(WIN_OBJS): ../../../Windows/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/DLL.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/Error.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/FileDir.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/FileFind.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/FileIO.cpp +#SOURCES += $$7ZIP_BASE/CPP/Windows/FileMapping.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/FileName.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/MemoryLock.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/PropVariant.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/PropVariantConversions.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/Registry.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/Synchronization.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/System.cpp +SOURCES += $$7ZIP_BASE/CPP/Windows/Time.cpp + +#$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/CreateCoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/CWrappers.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FileStreams.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FilterCoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/InBuffer.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/InOutTempBuffer.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/LimitedStreams.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/LockedStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/MemBlocks.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/MethodId.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/MethodProps.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/OffsetStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/OutBuffer.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/OutMemStream.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/ProgressUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/ProgressMt.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/StreamBinder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/StreamObjects.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/StreamUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Common/VirtThread.cpp + +#$(UI_COMMON_OBJS): ../../UI/Common/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveName.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Bench.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/DefaultName.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/EnumDirItems.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/LoadCodecs.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/OpenArchive.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/SetProperties.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/SortUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/TempFiles.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Update.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateAction.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateCallback.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdatePair.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateProduce.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/WorkDir.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ZipRegistry.cpp + +#$(AR_OBJS): ../../Archive/$(*B).cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/ArchiveExports.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/DllExports2.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Bz2Handler.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/DeflateProps.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/GzHandler.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/LzmaHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/SplitHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/XzHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/ZHandler.cpp #added to support more then 7z + +#$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2MT.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CrossThreadProgress.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/DummyOutStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/FindSignature.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/HandlerOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/InStreamWithCRC.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/ItemNameUtils.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/MultiStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/ParseProperties.cpp + +#$(7Z_OBJS): ../../Archive/7z/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zCompressionMode.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zDecode.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zEncode.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zExtract.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zFolderInStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zFolderOutStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zHandlerOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zHeader.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zIn.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zProperties.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zSpecStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zUpdate.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/StdAfx.cpp + +#$(CAB_OBJS): ../../Archive/Cab/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabBlockInStream.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHeader.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabIn.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabRegister.cpp + +#$(TAR_OBJS): ../../Archive/Tar/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandlerOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHeader.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarIn.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarUpdate.cpp + +#$(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandler.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHeader.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipIn.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipItem.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipOut.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipUpdate.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipRegister.cpp + +#$(COMPRESS_OBJS): ../../Compress/$(*B).cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Bcj2Coder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Bcj2Register.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BcjCoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BcjRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BitlDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BranchCoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BranchMisc.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BranchRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ByteSwap.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BZip2Encoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BZip2Decoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BZip2Crc.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/BZip2Register.cpp #added to support more then 7z +#SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/CodecExports.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/CopyCoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/CopyRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/DeltaFilter.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/DeflateDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/DeflateEncoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Deflate64Register.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/DeflateRegister.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ImplodeDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Lzma2Decoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Lzma2Encoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Lzma2Register.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/LzmaDecoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/LzmaEncoder.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/LzmaRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/LzOutWindow.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/Lzx86Converter.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/LzxDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/PpmdEncoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/PpmdDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/PpmdRegister.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/PpmdZip.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/QuantumDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ShrinkDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ZlibDecoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ZlibEncoder.cpp #added to support more then 7z +SOURCES += $$7ZIP_BASE/CPP/7zip/Compress/ZDecoder.cpp #added to support more then 7z + +#Crypto is not needed for 7z only +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/7zAes.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/7zAesRegister.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/HmacSha1.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/MyAes.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/RandGen.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/Sha1.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/WzAes.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/ZipCrypto.cpp +SOURCES += $$7ZIP_BASE/CPP/7zip/Crypto/ZipStrong.cpp + +#$(C_OBJS): ../../../../C/$(*B).c +#SOURCES += $$7ZIP_BASE/C/7zAlloc.c +#SOURCES += $$7ZIP_BASE/C/7zBuf.c +#SOURCES += $$7ZIP_BASE/C/7zBuf2.c +SOURCES += $$7ZIP_BASE/C/7zCrc.c +SOURCES += $$7ZIP_BASE/C/7zCrcOpt.c +#SOURCES += $$7ZIP_BASE/C/7zDec.c +#SOURCES += $$7ZIP_BASE/C/7zFile.c +#SOURCES += $$7ZIP_BASE/C/7zIn.c +SOURCES += $$7ZIP_BASE/C/7zStream.c +SOURCES += $$7ZIP_BASE/C/Aes.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/AesOpt.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Alloc.c +#SOURCES += $$7ZIP_BASE/C/Bcj2.c +SOURCES += $$7ZIP_BASE/C/Bra.c +SOURCES += $$7ZIP_BASE/C/Bra86.c +SOURCES += $$7ZIP_BASE/C/BraIA64.c +SOURCES += $$7ZIP_BASE/C/BwtSort.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/CpuArch.c +SOURCES += $$7ZIP_BASE/C/HuffEnc.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Delta.c +SOURCES += $$7ZIP_BASE/C/LzFind.c +SOURCES += $$7ZIP_BASE/C/LzFindMt.c +SOURCES += $$7ZIP_BASE/C/Lzma2Dec.c +SOURCES += $$7ZIP_BASE/C/Lzma2Enc.c +#SOURCES += $$7ZIP_BASE/C/Lzma86Dec.c +#SOURCES += $$7ZIP_BASE/C/Lzma86Enc.c +SOURCES += $$7ZIP_BASE/C/LzmaDec.c +SOURCES += $$7ZIP_BASE/C/LzmaEnc.c +#SOURCES += $$7ZIP_BASE/C/LzmaLib.c +SOURCES += $$7ZIP_BASE/C/MtCoder.c +SOURCES += $$7ZIP_BASE/C/Ppmd7.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Ppmd7Dec.c +SOURCES += $$7ZIP_BASE/C/Ppmd7Enc.c +SOURCES += $$7ZIP_BASE/C/Ppmd8.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Ppmd8Dec.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Ppmd8Enc.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Sha256.c +SOURCES += $$7ZIP_BASE/C/Sort.c #added to support more then 7z +SOURCES += $$7ZIP_BASE/C/Threads.c +SOURCES += $$7ZIP_BASE/C/Xz.c +SOURCES += $$7ZIP_BASE/C/XzCrc64.c +SOURCES += $$7ZIP_BASE/C/XzDec.c +SOURCES += $$7ZIP_BASE/C/XzEnc.c +SOURCES += $$7ZIP_BASE/C/XzIn.c diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri index 8d0389d3b..74f9e27f6 100644 --- a/installerbuilder/libinstaller/libinstaller.pri +++ b/installerbuilder/libinstaller/libinstaller.pri @@ -5,14 +5,14 @@ DEFINES += FSENGINE_TCP INCLUDEPATH += $$PWD \ $$PWD/.. \ $$PWD/3rdparty/kdtools \ - $$PWD/3rdparty/p7zip_9.04 \ - $$PWD/3rdparty/p7zip_9.04/unix/CPP + $$PWD/3rdparty/7zip \ + $$PWD/3rdparty/7zip/unix/CPP DEPENDPATH += $$PWD \ $$PWD/.. \ - $$PWD/3rdparty/p7zip_9.04 \ - $$PWD/3rdparty/p7zip_9.04/unix/CPP \ - $$PWD/3rdparty/kdtools + $$PWD/3rdparty/kdtools \ + $$PWD/3rdparty/7zip \ + $$PWD/3rdparty/7zip/unix/CPP CONFIG( shared, static|shared ):DEFINES += LIB_INSTALLER_SHARED CONFIG( shared, static|shared ):DEFINES += KDTOOLS_SHARED diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index c7a0599e7..6ee1e20f0 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -2,13 +2,10 @@ TEMPLATE = lib TARGET = installer DEPENDPATH += . \ .. \ - ../common \ - 3rdparty/kdtools + ../common INCLUDEPATH += . \ - .. \ - 3rdparty/kdtools - + .. DESTDIR = $$OUT_PWD/../lib DLLDESTDIR = $$OUT_PWD/../bin @@ -29,7 +26,7 @@ contains(CONFIG, static): { DEFINES += USE_STATIC_SQLITE_PLUGIN } -include(3rdparty/p7zip_9.04/p7zip.pri) +include(3rdparty/7zip/7zip.pri) include(3rdparty/kdtools/kdtools.pri) HEADERS += $$PWD/packagemanagercore.h \ |