1590 files changed, 266 insertions, 281 deletions

diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro
deleted file mode 100644
index 820753e79..000000000
--- a/examples/downloadspeed/downloadspeed.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-include(../../installerbuilder/libinstaller/libinstaller.pri)
-DEPENDPATH += . .. ../../installerbuilder/libinstaller
-INCLUDEPATH += . .. ../../installerbuilder/libinstaller
-
-TEMPLATE = app
-CONFIG += console
-CONFIG -= app_bundle
-TARGET = downloadspeed
-
-QT -= gui
-QT += core network
-LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS
-
-SOURCES += main.cpp
diff --git a/examples/examples.pro b/examples/examples.pro
index 7a2731edb..e86e611da 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
-TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += testapp downloadspeed
+TEMPLATE = subdirs
+SUBDIRS += testapp
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro
index 48ac2b0b2..888e45803 100644
--- a/examples/testapp/testapp.pro
+++ b/examples/testapp/testapp.pro
@@ -1,33 +1,38 @@
 TEMPLATE = app
-TARGET =
+DEPENDPATH += . ..
+INCLUDEPATH += . ..
+TARGET = testapp
 
-include( ../../installerbuilder/libinstaller/libinstaller.pri )
-LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS
+include(../../installerfw.pri)
 
+!static {
+    warning("You can use this example only with a static build of Qt and IFW!")
+}
+
+LIBS += -linstaller
 DESTDIR = packages/com.nokia.testapp/data
 
-QT += script network xml sql
-CONFIG += uitools help
-contains(CONFIG, static): {
-    QTPLUGIN += qsqlite
-    DEFINES += USE_STATIC_SQLITE_PLUGIN
-}
+FORMS += \
+        componentselectiondialog.ui \
+        updatesettingsdialog.ui \
+        updatesettingswidget.ui
 
-# Input
-FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui
 HEADERS += mainwindow.h \
-    componentselectiondialog.h \
-    updatesettingsdialog.h \
-    updateagent.h \
-    updatesettingswidget.h
+        componentselectiondialog.h \
+        updatesettingsdialog.h \
+        updateagent.h \
+        updatesettingswidget.h
 
-SOURCES += main.cpp mainwindow.cpp \
-    componentselectiondialog.cpp \
-    updatesettingsdialog.cpp \
-    updateagent.cpp \
-    updatesettingswidget.cpp
+SOURCES += main.cpp \
+        mainwindow.cpp \
+        componentselectiondialog.cpp \
+        updatesettingsdialog.cpp \
+        updateagent.cpp \
+        updatesettingswidget.cpp
 
 RESOURCES += testapp.qrc
 
-macx:QMAKE_POST_LINK = ($$OUT_PWD/../../installerbuilder/bin/binarycreator -p packages -c config -t ../../installerbuilder/bin/installerbase TestAppInstaller.app com.nokia.testapp)
-win32:QMAKE_POST_LINK = ($$OUT_PWD\\..\\..\\installerbuilder\\bin\\binarycreator.exe -p $$PWD\\packages -c $$PWD\\config -t $$OUT_PWD\\..\\..\\installerbuilder\\bin\\installerbase.exe TestAppInstaller.exe com.nokia.testapp)
+isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
+    macx:QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator -p $$PWD/packages -c $$PWD/config -t $$IFW_APP_PATH/installerbase TestAppInstaller.app com.nokia.testapp)
+    win32:QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator.exe -p $$PWD/packages -c $$PWD/config -t $$IFW_APP_PATH/installerbase.exe TestAppInstaller.exe com.nokia.testapp)
+}
diff --git a/installerbuilder/installerbuilder.pro b/installerbuilder/installerbuilder.pro
deleted file mode 100644
index c057eb265..000000000
--- a/installerbuilder/installerbuilder.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS += libinstaller installerbase binarycreator repogen archivegen
-TRANSLATIONS += installerbase/translations/de_de.ts installerbase/translations/en_us.ts
diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri
deleted file mode 100644
index 09f8ef7ad..000000000
--- a/installerbuilder/libinstaller/libinstaller.pri
+++ /dev/null
@@ -1,45 +0,0 @@
-macx:DEFINES += _LZMA_UINT32_IS_ULONG
-
-DEFINES += FSENGINE_TCP
-
-INCLUDEPATH += $$PWD \
-    $$PWD/.. \
-    $$PWD/3rdparty/kdtools \
-    $$PWD/3rdparty/7zip \
-    $$PWD/3rdparty/7zip/unix/CPP
-
-DEPENDPATH += $$PWD \
-    $$PWD/.. \
-    $$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
-
-CONFIG += uitools help
-
-contains(CONFIG, static): {
-    QTPLUGIN += qsqlite
-    DEFINES += USE_STATIC_SQLITE_PLUGIN
-}
-
-QT += script
-QT += gui # gui needed for KDUpdater include (compareVersion), which indirectly include QTreeWidget
-
-LIBS = -L$$OUT_PWD/../lib -L$$OUT_PWD/../../lib -linstaller $$LIBS
-
-macx:LIBS += -framework Security
-unix:!macx:LIBS += -lutil
-
-static {
-    unix {
-        exists($$OUT_PWD/../lib/libinstaller.a):POST_TARGETDEPS += $$OUT_PWD/../lib/libinstaller.a
-        exists($$OUT_PWD/../../lib/libinstaller.a):POST_TARGETDEPS += $$OUT_PWD/../../lib/libinstaller.a
-    }
-    win32 {
-        exists($$OUT_PWD/../lib/installer.lib):POST_TARGETDEPS += $$OUT_PWD/../lib/installer.lib
-        exists($$OUT_PWD/../../lib/installer.lib):POST_TARGETDEPS += $$OUT_PWD/../../lib/installer.lib
-    }
-}
-
diff --git a/installerfw.pri b/installerfw.pri
new file mode 100644
index 000000000..e9d41a641
--- /dev/null
+++ b/installerfw.pri
@@ -0,0 +1,57 @@
+!isEmpty(IFW_PRI_INCLUDED) {
+    error("installerfw.pri already included")
+}
+IFW_PRI_INCLUDED = 1
+
+defineReplace(cleanPath) {
+    win32:1 ~= s|\\\\|/|g
+    contains(1, ^/.*):pfx = /
+    else:pfx =
+    segs = $$split(1, /)
+    out =
+    for(seg, segs) {
+        equals(seg, ..):out = $$member(out, 0, -2)
+        else:!equals(seg, .):out += $$seg
+    }
+    return($$join(out, /, $$pfx))
+}
+
+isEmpty(IFW_BUILD_TREE) {
+    sub_dir = $$_PRO_FILE_PWD_
+    sub_dir ~= s,^$$re_escape($$PWD),,
+    IFW_BUILD_TREE = $$cleanPath($$OUT_PWD)
+    IFW_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
+}
+
+IFW_SOURCE_TREE = $$PWD
+IFW_APP_PATH = $$IFW_BUILD_TREE/bin
+IFW_LIB_PATH = $$IFW_BUILD_TREE/lib
+
+INCLUDEPATH += \
+    $$IFW_SOURCE_TREE/src/libs/7zip \
+    $$IFW_SOURCE_TREE/src/libs/kdtools \
+    $$IFW_SOURCE_TREE/src/libs/installer
+win32:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/win/CPP
+unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/unix/CPP
+
+LIBS += -L$$IFW_LIB_PATH
+unix:!macx:LIBS += -lutil
+macx:LIBS += -framework Carbon -framework Security
+
+CONFIG += help uitools
+CONFIG(static, static|shared) {
+    QTPLUGIN += qsqlite
+    QT += script network xml
+    DEFINES += USE_STATIC_SQLITE_PLUGIN
+}
+
+GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD)
+DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1"
+
+CONFIG(shared, static|shared):DEFINES += KDTOOLS_SHARED
+CONFIG(shared, static|shared):DEFINES += LIB_INSTALLER_SHARED
+
+static {
+    win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib
+    unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a
+}
diff --git a/installerfw.pro b/installerfw.pro
index ddef644ed..92cf5664b 100644
--- a/installerfw.pro
+++ b/installerfw.pro
@@ -1,6 +1,6 @@
 CONFIG += ordered
 TEMPLATE = subdirs
-SUBDIRS += installerbuilder tools
+SUBDIRS += src tools
 !macx:SUBDIRS += examples
 
 test.target = test
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/7zip.pri b/src/libs/7zip/7zip.pri
index 310d0adb1..1aa92d294 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/7zip.pri
+++ b/src/libs/7zip/7zip.pri
@@ -1,9 +1,4 @@
 7ZIP_BASE=$$PWD
 
-SOURCES += $$7ZIP_BASE/lib7z_facade.cpp
-HEADERS += $$7ZIP_BASE/lib7z_facade.h
-
-INCLUDEPATH += $$7ZIP_BASE
-
-unix:include($$7ZIP_BASE/unix/unix.pri) #this is p7zip
 win32:include($$7ZIP_BASE/win/win.pri) #this is 7zip
+unix:include($$7ZIP_BASE/unix/unix.pri) #this is p7zip
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zBuf.h b/src/libs/7zip/unix/C/7zBuf.h
index e9f2f316d..e9f2f316d 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zBuf.h
+++ b/src/libs/7zip/unix/C/7zBuf.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zBuf2.c b/src/libs/7zip/unix/C/7zBuf2.c
index 8d17e0dcf..8d17e0dcf 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zBuf2.c
+++ b/src/libs/7zip/unix/C/7zBuf2.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrc.c b/src/libs/7zip/unix/C/7zCrc.c
index 404090ef3..404090ef3 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrc.c
+++ b/src/libs/7zip/unix/C/7zCrc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrc.h b/src/libs/7zip/unix/C/7zCrc.h
index 38e3e5fbc..38e3e5fbc 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrc.h
+++ b/src/libs/7zip/unix/C/7zCrc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrcOpt.c b/src/libs/7zip/unix/C/7zCrcOpt.c
index 6c766a209..6c766a209 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrcOpt.c
+++ b/src/libs/7zip/unix/C/7zCrcOpt.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrcT8.c b/src/libs/7zip/unix/C/7zCrcT8.c
index cd80e262b..cd80e262b 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zCrcT8.c
+++ b/src/libs/7zip/unix/C/7zCrcT8.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zStream.c b/src/libs/7zip/unix/C/7zStream.c
index 0ebb7b5f9..0ebb7b5f9 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zStream.c
+++ b/src/libs/7zip/unix/C/7zStream.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zVersion.h b/src/libs/7zip/unix/C/7zVersion.h
index 9d99c5dff..9d99c5dff 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/7zVersion.h
+++ b/src/libs/7zip/unix/C/7zVersion.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Aes.c b/src/libs/7zip/unix/C/Aes.c
index 1bb658793..1bb658793 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Aes.c
+++ b/src/libs/7zip/unix/C/Aes.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Aes.h b/src/libs/7zip/unix/C/Aes.h
index c9b0677c8..c9b0677c8 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Aes.h
+++ b/src/libs/7zip/unix/C/Aes.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Alloc.c b/src/libs/7zip/unix/C/Alloc.c
index be02a9299..be02a9299 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Alloc.c
+++ b/src/libs/7zip/unix/C/Alloc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Alloc.h b/src/libs/7zip/unix/C/Alloc.h
index 7ef372e3a..7ef372e3a 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Alloc.h
+++ b/src/libs/7zip/unix/C/Alloc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra.c b/src/libs/7zip/unix/C/Bra.c
index 2e47b1413..2e47b1413 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra.c
+++ b/src/libs/7zip/unix/C/Bra.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra.h b/src/libs/7zip/unix/C/Bra.h
index 5748c1c05..5748c1c05 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra.h
+++ b/src/libs/7zip/unix/C/Bra.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra86.c b/src/libs/7zip/unix/C/Bra86.c
index 1ee0e709b..1ee0e709b 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Bra86.c
+++ b/src/libs/7zip/unix/C/Bra86.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BraIA64.c b/src/libs/7zip/unix/C/BraIA64.c
index 0b4ee85bc..0b4ee85bc 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BraIA64.c
+++ b/src/libs/7zip/unix/C/BraIA64.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BwtSort.c b/src/libs/7zip/unix/C/BwtSort.c
index 207305072..207305072 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BwtSort.c
+++ b/src/libs/7zip/unix/C/BwtSort.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BwtSort.h b/src/libs/7zip/unix/C/BwtSort.h
index ce5598f0f..ce5598f0f 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/BwtSort.h
+++ b/src/libs/7zip/unix/C/BwtSort.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/CpuArch.c b/src/libs/7zip/unix/C/CpuArch.c
index 260cc1f45..260cc1f45 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/CpuArch.c
+++ b/src/libs/7zip/unix/C/CpuArch.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/CpuArch.h b/src/libs/7zip/unix/C/CpuArch.h
index 01930c7e6..01930c7e6 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/CpuArch.h
+++ b/src/libs/7zip/unix/C/CpuArch.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Delta.c b/src/libs/7zip/unix/C/Delta.c
index 2b327f15f..2b327f15f 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Delta.c
+++ b/src/libs/7zip/unix/C/Delta.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Delta.h b/src/libs/7zip/unix/C/Delta.h
index 0d4cd6274..0d4cd6274 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Delta.h
+++ b/src/libs/7zip/unix/C/Delta.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/HuffEnc.c b/src/libs/7zip/unix/C/HuffEnc.c
index 561c7e5da..561c7e5da 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/HuffEnc.c
+++ b/src/libs/7zip/unix/C/HuffEnc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/HuffEnc.h b/src/libs/7zip/unix/C/HuffEnc.h
index 9cf4bfde8..9cf4bfde8 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/HuffEnc.h
+++ b/src/libs/7zip/unix/C/HuffEnc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFind.c b/src/libs/7zip/unix/C/LzFind.c
index e3ecb0542..e3ecb0542 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFind.c
+++ b/src/libs/7zip/unix/C/LzFind.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFind.h b/src/libs/7zip/unix/C/LzFind.h
index 010c4b92b..010c4b92b 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFind.h
+++ b/src/libs/7zip/unix/C/LzFind.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFindMt.c b/src/libs/7zip/unix/C/LzFindMt.c
index aa41ed98a..aa41ed98a 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFindMt.c
+++ b/src/libs/7zip/unix/C/LzFindMt.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFindMt.h b/src/libs/7zip/unix/C/LzFindMt.h
index b985af5fe..b985af5fe 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzFindMt.h
+++ b/src/libs/7zip/unix/C/LzFindMt.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzHash.h b/src/libs/7zip/unix/C/LzHash.h
index f3e89966c..f3e89966c 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzHash.h
+++ b/src/libs/7zip/unix/C/LzHash.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Dec.c b/src/libs/7zip/unix/C/Lzma2Dec.c
index 7ea1cc953..7ea1cc953 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Dec.c
+++ b/src/libs/7zip/unix/C/Lzma2Dec.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Dec.h b/src/libs/7zip/unix/C/Lzma2Dec.h
index 6bc07bbc1..6bc07bbc1 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Dec.h
+++ b/src/libs/7zip/unix/C/Lzma2Dec.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Enc.c b/src/libs/7zip/unix/C/Lzma2Enc.c
index e97597f63..e97597f63 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Enc.c
+++ b/src/libs/7zip/unix/C/Lzma2Enc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Enc.h b/src/libs/7zip/unix/C/Lzma2Enc.h
index 283525581..283525581 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Lzma2Enc.h
+++ b/src/libs/7zip/unix/C/Lzma2Enc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaDec.c b/src/libs/7zip/unix/C/LzmaDec.c
index 2036761bf..2036761bf 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaDec.c
+++ b/src/libs/7zip/unix/C/LzmaDec.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaDec.h b/src/libs/7zip/unix/C/LzmaDec.h
index bf7f084ba..bf7f084ba 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaDec.h
+++ b/src/libs/7zip/unix/C/LzmaDec.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaEnc.c b/src/libs/7zip/unix/C/LzmaEnc.c
index cf131388a..cf131388a 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaEnc.c
+++ b/src/libs/7zip/unix/C/LzmaEnc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaEnc.h b/src/libs/7zip/unix/C/LzmaEnc.h
index 200d60eb8..200d60eb8 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaEnc.h
+++ b/src/libs/7zip/unix/C/LzmaEnc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Dec.c b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Dec.c
index b801dd1ca..b801dd1ca 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Dec.c
+++ b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Dec.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Dec.h b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Dec.h
index 138ce1ff7..138ce1ff7 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Dec.h
+++ b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Dec.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Enc.c b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Enc.c
index efc81ea35..efc81ea35 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Enc.c
+++ b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Enc.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Enc.h b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Enc.h
index 355bf343c..355bf343c 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/LzmaUtil/Lzma86Enc.h
+++ b/src/libs/7zip/unix/C/LzmaUtil/Lzma86Enc.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/MtCoder.c b/src/libs/7zip/unix/C/MtCoder.c
index 946fbbc70..946fbbc70 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/MtCoder.c
+++ b/src/libs/7zip/unix/C/MtCoder.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/MtCoder.h b/src/libs/7zip/unix/C/MtCoder.h
index f0f06da28..f0f06da28 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/MtCoder.h
+++ b/src/libs/7zip/unix/C/MtCoder.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd.h b/src/libs/7zip/unix/C/Ppmd.h
index 621d92703..621d92703 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd.h
+++ b/src/libs/7zip/unix/C/Ppmd.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7.c b/src/libs/7zip/unix/C/Ppmd7.c
index 060d86d2e..060d86d2e 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7.c
+++ b/src/libs/7zip/unix/C/Ppmd7.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7.h b/src/libs/7zip/unix/C/Ppmd7.h
index 96521c31f..96521c31f 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7.h
+++ b/src/libs/7zip/unix/C/Ppmd7.h
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7Dec.c b/src/libs/7zip/unix/C/Ppmd7Dec.c
index 68438d5ce..68438d5ce 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7Dec.c
+++ b/src/libs/7zip/unix/C/Ppmd7Dec.c
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7Enc.c b/src/libs/7zip/unix/C/Ppmd7Enc.c
index 8247757d0..8247757d0 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/unix/C/Ppmd7Enc.c
+++ b/