project struct

.gitignore

@@ -9,11 +9,13 @@
 *.so
 *.dll
 *.dylib
-
+*.qm
 # Qt-es
 
 installer/packages/app/data
 installer/packages/app/data/*
+installer/packages/SoundBand/data/*
+installer/packages/SoundBand.Tests/data/*
 installer/SoundBandInstaller
 installer/logs.log
 installer/songdata.dat

Sync/Sync.pri

@@ -7,10 +7,9 @@
 
 !isEmpty(SYNC_LIB):error("Sync.pri already included")
 SYNC_LIB = 1
-include($$PWD/../installer/deploy/deployFiles.pri)
 
 #DEPENDS
 
-LIBS += -L"$$DESTDIR/" -lSync
+LIBS += -L"$$PWD/../installer/packages/SoundBand/data/" -lSync
 
 INCLUDEPATH += "$$PWD/"

installer/deploy/deployFiles.pri

@@ -1,10 +1,8 @@
-TARGET_PATH = $$PWD/../packages/app/data
+TARGET_PATH = $$PWD/../packages/SoundBand/data
 equals( TEMPLATE, app) {
-    DESTDIR = $$PWD/../packages/app/data
+    DESTDIR = $$PWD/../packages/SoundBand/data
 }
 
 equals( TEMPLATE, lib) {
-    DESTDIR = $$PWD/../packages/app/data
+    DESTDIR = $$PWD/../packages/SoundBand/data
 }
-
-

installer/installer.pro

@@ -30,7 +30,7 @@ message( MACDEPLY = $$MACDEPLY)
 message( LINUXDEPLOY = $$LINUXDEPLOY)
 
 win32 {
-    OUT_FILE = installerApp.exe
+    OUT_FILE = SoundBandInstaller.exe
     LUPDATE = $$QT_DIR/lupdate.exe
     LRELEASE = $$QT_DIR/lrelease.exe
 }
@@ -68,8 +68,10 @@ installerApp.CONFIG += target_predeps no_link combine
 
 message( installComands = "$$installerApp.commands")
 
-commands += "$$LUPDATE $$PWD/packages/app/meta/installscript.js -ts $$PWD/packages/app/meta/ru.ts"
-commands += "$$LRELEASE $$PWD/packages/app/meta/ru.ts"
+commands += "$$LUPDATE $$PWD/packages/SoundBand/meta/installscript.js -ts $$PWD/packages/SoundBand/meta/ru.ts"
+commands += "$$LRELEASE $$PWD/packages/SoundBand/meta/ru.ts"
+commands += "$$LUPDATE $$PWD/packages/SoundBand.Tests/meta/installscript.js -ts $$PWD/packages/SoundBand.Tests/meta/ru.ts"
+commands += "$$LRELEASE $$PWD/packages/SoundBand.Tests/meta/ru.ts"
 
 for(command, commands) {
     system($$command)|error("Failed to run: $$command")
@@ -83,7 +85,10 @@ DISTFILES += \
     config/config.xml \
     README.md \
     config/ru.ts \
-    packages/app/meta/installscript.js \
-    packages/app/meta/package.xml \
-    packages/app/meta/ru.ts
+    packages/SoundBand/meta/installscript.js \
+    packages/SoundBand/meta/package.xml \
+    packages/SoundBand/meta/ru.ts \
+    packages/SoundBand.Tests/meta/installscript.js \
+    packages/SoundBand.Tests/meta/package.xml \
+    packages/SoundBand.Tests/meta/ru.ts
 

installer/packages/SoundBand.Tests/meta/installscript.js

@@ -0,0 +1,17 @@
+// Constructor
+function Component()
+{
+
+    generateTr();
+}
+
+function generateTr() {
+    component.setValue("DisplayName", qsTr("SoundBandTests"));
+    component.setValue("Description", qsTr("Install tests of SoundBand"));
+
+}
+
+function isNoEmpty(dir){
+    var libsArray = installer.findPath("*", [dir]);
+    return Boolean(libsArray.length);
+}

installer/packages/SoundBand.Tests/meta/package.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<Package>
+    <DisplayName>from script</DisplayName>
+    <Description>from script</Description>
+    <Version>1.0.0</Version>
+    <Default>false</Default>
+    <Script>installscript.js</Script>
+    <ReleaseDate>2018-08-25</ReleaseDate>
+    <SortingPriority>200</SortingPriority>
+    <ForcedInstallation>false</ForcedInstallation>
+    <Translations>
+        <Translation>ru.qm</Translation>
+    </Translations>
+</Package>

installer/packages/SoundBand.Tests/meta/ru.ts

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>TargetWidget</name>
+    <message>
+        <source>Install dir</source>
+        <translation type="vanished">Папка установки</translation>
+    </message>
+    <message>
+        <source>Select the Installation directory</source>
+        <translation type="vanished">Выберите директорию установки</translation>
+    </message>
+</context>
+<context>
+    <name>installscript</name>
+    <message>
+        <source>Virtus Rlo Images</source>
+        <translation type="vanished">Изображения Virtus ИВС</translation>
+    </message>
+    <message>
+        <source>This package contains images for the sidebar of the rolo mode</source>
+        <translation type="vanished">Этот пакет содержит изображения для боковой панели режима ИВС</translation>
+    </message>
+    <message>
+        <source>Choose your target directory.</source>
+        <translation type="vanished">Выберите целевой каталог.</translation>
+    </message>
+    <message>
+        <source>Attention! This directory is already taken, to continue the installation, select another directory!</source>
+        <translation type="vanished">Внимание! Этот каталог уже создан, чтобы продолжить установку выберите другой каталог!</translation>
+    </message>
+    <message>
+        <source>App</source>
+        <translation type="vanished">Основные компоненнты</translation>
+    </message>
+    <message>
+        <source>Install SoundBand</source>
+        <oldsource>Install App</oldsource>
+        <translation type="obsolete">установка основного компонента</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="9"/>
+        <source>SoundBandTests</source>
+        <translation>Установка тестов</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="10"/>
+        <source>Install tests of SoundBand</source>
+        <translation>Данный компонент содержит тесты для SoundBand</translation>
+    </message>
+</context>
+</TS>

installer/packages/SoundBand/meta/package.xml

@@ -7,6 +7,8 @@
     <Script>installscript.js</Script>
     <ReleaseDate>2018-08-25</ReleaseDate>
     <SortingPriority>200</SortingPriority>
+    <ForcedInstallation>true</ForcedInstallation>
+
     <Translations>
         <Translation>ru.qm</Translation>
     </Translations>

tests/tests.pro

@@ -13,5 +13,6 @@ SOURCES += \
 RESOURCES += \
     res.qrc
 
+DESTDIR = $$PWD/../installer/packages/SoundBand.Tests/data
 
 include($$PWD/../Sync/Sync.pri)