diff --git a/lang/lang.pro b/lang/lang.pro index 5d1ae5c..dea3a0f 100644 --- a/lang/lang.pro +++ b/lang/lang.pro @@ -9,15 +9,41 @@ TEMPLATE = aux # Generating Alexandra translations # -system( $$[QT_INSTALL_BINS]/lrelease alexandra-cs.ts -qm alexandra-cs.qm ) -system( $$[QT_INSTALL_BINS]/lrelease alexandra-fr.ts -qm alexandra-fr.qm ) -system( $$[QT_INSTALL_BINS]/lrelease alexandra-ru_RU.ts -qm alexandra-ru_RU.qm ) -system( $$[QT_INSTALL_BINS]/lrelease alexandra-uk_UA.ts -qm alexandra-uk_UA.qm ) +LRELEASE = $$[QT_INSTALL_BINS]/lrelease +win32:LRELEASE ~= s,/,\\,g + +system( $$LRELEASE alexandra-cs.ts -qm alexandra-cs.qm ) +system( $$LRELEASE alexandra-fr.ts -qm alexandra-fr.qm ) +system( $$LRELEASE alexandra-ru_RU.ts -qm alexandra-ru_RU.qm ) +system( $$LRELEASE alexandra-uk_UA.ts -qm alexandra-uk_UA.qm ) # Qt translations # -system( cp $$[QT_INSTALL_TRANSLATIONS]/qtbase_cs.qm ../lang/qt-cs.qm ) -system( cp $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm ../lang/qt-fr.qm ) -system( cp $$[QT_INSTALL_TRANSLATIONS]/qtbase_ru.qm ../lang/qt-ru_RU.qm ) -system( cp $$[QT_INSTALL_TRANSLATIONS]/qtbase_uk.qm ../lang/qt-uk_UA.qm ) +COPY = cp +QT_CS_SRC = $$[QT_INSTALL_TRANSLATIONS]/qtbase_cs.qm +QT_CS_DST = $$PWD/qt-cs.qm +QT_FR_SRC = $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm +QT_FR_DST = $$PWD/qt-fr.qm +QT_RU_SRC = $$[QT_INSTALL_TRANSLATIONS]/qtbase_ru.qm +QT_RU_DST = $$PWD/qt-ru_RU.qm +QT_UK_SRC = $$[QT_INSTALL_TRANSLATIONS]/qtbase_uk.qm +QT_UK_DST = $$PWD/qt-uk_UA.qm + +win32 { + # Terrible code... # + COPY = copy + QT_CS_SRC ~= s,/,\\,g + QT_CS_DST ~= s,/,\\,g + QT_FR_SRC ~= s,/,\\,g + QT_FR_DST ~= s,/,\\,g + QT_RU_SRC ~= s,/,\\,g + QT_RU_DST ~= s,/,\\,g + QT_UK_SRC ~= s,/,\\,g + QT_UK_DST ~= s,/,\\,g +} + +system( $$COPY $$QT_CS_SRC $$QT_CS_DST ) +system( $$COPY $$QT_FR_SRC $$QT_FR_DST ) +system( $$COPY $$QT_RU_SRC $$QT_RU_DST ) +system( $$COPY $$QT_UK_SRC $$QT_UK_DST ) diff --git a/windows/alexandra-win32-setup.iss b/windows/alexandra-win32-setup.iss index b30130f..ac4f11b 100644 --- a/windows/alexandra-win32-setup.iss +++ b/windows/alexandra-win32-setup.iss @@ -6,8 +6,7 @@ #define MyAppExeName "alexandra.exe" [Setup] -; The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. +; Alexandra Video Library application id AppId={{DBAF1834-C3A1-4884-A639-045750269A5C} AppName={#MyAppName} AppVersion={#MyAppVersion} @@ -20,7 +19,7 @@ AppUpdatesURL="http://alexandra-qt.sourceforge.net/en/download/" DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} LicenseFile=..\LICENSE -InfoBeforeFile=..\README.md +;InfoBeforeFile=..\README.md OutputDir=.\ OutputBaseFilename=alexandra-{#MyAppVersion}-win32-setup SetupIconFile=.\win-icon.ico @@ -41,18 +40,14 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip [Files] Source: "..\src\alexandra.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "..\lib\MediaInfo.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\platforms\qminimal.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\platforms\qoffscreen.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\icudt52.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\icuin52.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\icuuc52.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\libstdc++-6.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\libwinpthread-1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\qt-mini-deploy\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\libstdc++-6.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\libwinpthread-1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\bin\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Qt\5.5\mingw492_32\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"