diff --git a/.gitignore b/.gitignore index 47b65eb..c6a99a5 100644 --- a/.gitignore +++ b/.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 diff --git a/Sync/Sync.pri b/Sync/Sync.pri index 11c875b..ab9a95d 100644 --- a/Sync/Sync.pri +++ b/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/" diff --git a/installer/config/iconInstaller.ico b/installer/config/iconInstaller.ico index cec9fa5..4ed225b 100644 Binary files a/installer/config/iconInstaller.ico and b/installer/config/iconInstaller.ico differ diff --git a/installer/config/iconInstaller.png b/installer/config/iconInstaller.png index 8da2970..ff51f5a 100644 Binary files a/installer/config/iconInstaller.png and b/installer/config/iconInstaller.png differ diff --git a/installer/deploy/deployFiles.pri b/installer/deploy/deployFiles.pri index b653557..7aae1f8 100644 --- a/installer/deploy/deployFiles.pri +++ b/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 } - - diff --git a/installer/installer.pro b/installer/installer.pro index 38b1e4d..29a9ad7 100644 --- a/installer/installer.pro +++ b/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 diff --git a/installer/packages/SoundBand.Tests/meta/installscript.js b/installer/packages/SoundBand.Tests/meta/installscript.js new file mode 100644 index 0000000..be168fd --- /dev/null +++ b/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); +} diff --git a/installer/packages/SoundBand.Tests/meta/package.xml b/installer/packages/SoundBand.Tests/meta/package.xml new file mode 100644 index 0000000..e5755bd --- /dev/null +++ b/installer/packages/SoundBand.Tests/meta/package.xml @@ -0,0 +1,14 @@ + + + from script + from script + 1.0.0 + false + + 2018-08-25 + 200 + false + + ru.qm + + diff --git a/installer/packages/SoundBand.Tests/meta/ru.ts b/installer/packages/SoundBand.Tests/meta/ru.ts new file mode 100644 index 0000000..aab2645 --- /dev/null +++ b/installer/packages/SoundBand.Tests/meta/ru.ts @@ -0,0 +1,53 @@ + + + + + TargetWidget + + Install dir + Папка установки + + + Select the Installation directory + Выберите директорию установки + + + + installscript + + Virtus Rlo Images + Изображения Virtus ИВС + + + This package contains images for the sidebar of the rolo mode + Этот пакет содержит изображения для боковой панели режима ИВС + + + Choose your target directory. + Выберите целевой каталог. + + + Attention! This directory is already taken, to continue the installation, select another directory! + Внимание! Этот каталог уже создан, чтобы продолжить установку выберите другой каталог! + + + App + Основные компоненнты + + + Install SoundBand + Install App + установка основного компонента + + + + SoundBandTests + Установка тестов + + + + Install tests of SoundBand + Данный компонент содержит тесты для SoundBand + + + diff --git a/installer/packages/SoundBand/data/icons/icon.png b/installer/packages/SoundBand/data/icons/icon.png new file mode 100644 index 0000000..9d682c6 Binary files /dev/null and b/installer/packages/SoundBand/data/icons/icon.png differ diff --git a/installer/packages/app/meta/installscript.js b/installer/packages/SoundBand/meta/installscript.js similarity index 100% rename from installer/packages/app/meta/installscript.js rename to installer/packages/SoundBand/meta/installscript.js diff --git a/installer/packages/app/meta/package.xml b/installer/packages/SoundBand/meta/package.xml similarity index 88% rename from installer/packages/app/meta/package.xml rename to installer/packages/SoundBand/meta/package.xml index 4376bfd..1b31ce5 100644 --- a/installer/packages/app/meta/package.xml +++ b/installer/packages/SoundBand/meta/package.xml @@ -7,6 +7,8 @@ 2018-08-25 200 + true + ru.qm diff --git a/installer/packages/app/meta/ru.ts b/installer/packages/SoundBand/meta/ru.ts similarity index 100% rename from installer/packages/app/meta/ru.ts rename to installer/packages/SoundBand/meta/ru.ts diff --git a/installer/packages/app/data/icons/icon.png b/installer/packages/app/data/icons/icon.png deleted file mode 100644 index 8da2970..0000000 Binary files a/installer/packages/app/data/icons/icon.png and /dev/null differ diff --git a/installer/packages/app/meta/ru.qm b/installer/packages/app/meta/ru.qm deleted file mode 100644 index 12db3e9..0000000 Binary files a/installer/packages/app/meta/ru.qm and /dev/null differ diff --git a/tests/tests.pro b/tests/tests.pro index 44d3b02..c751ed2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -13,5 +13,6 @@ SOURCES += \ RESOURCES += \ res.qrc +DESTDIR = $$PWD/../installer/packages/SoundBand.Tests/data include($$PWD/../Sync/Sync.pri)