From a83d58eb08deeb91884e9375c62c6ab2fd8ac849 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Sat, 18 Nov 2023 01:16:34 +0100 Subject: [PATCH 01/17] Windows and mac builds --- .github/workflows/build.yml | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..a180234e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,56 @@ +name: Build and Release + +on: + push: + tags: + - 'v*' + +jobs: + build-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Qt environment + uses: jurplel/install-qt-action@v2 + with: + version: '5.15.2' + - name: Build QtPass + run: | + qmake + make + copy README.md src\release\README.txt + copy LICENSE src\release\LICENSE.txt + - name: Install Inno Setup + run: choco install innosetup + - name: Create Installer with Inno Setup + run: ISCC.exe qtpass.iss + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: PyQtPass-Windows + path: release + - name: Upload Release Asset + uses: softprops/action-gh-release@v1 + with: + files: Output\qtpass-*.exe + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build-mac: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Qt environment + uses: jurplel/install-qt-action@v2 + with: + version: '5.15.2' + - name: Build QtPass + run: | + qmake + make + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: PyQtPass-macOS + path: release/ + From 66c1afa128c5b5aa6bbdc302c8a54687bafd27ff Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Sat, 18 Nov 2023 01:19:28 +0100 Subject: [PATCH 02/17] Build --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a180234e..2aa45cb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,6 @@ name: Build and Release -on: - push: - tags: - - 'v*' +on: [push, pull_request] jobs: build-windows: From 8a388050ab9041a144b9d78d5ef4d398e90b6571 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Sat, 18 Nov 2023 01:42:31 +0100 Subject: [PATCH 03/17] Build some more --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aa45cb1..fa49e440 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,14 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 - name: Setup Qt environment uses: jurplel/install-qt-action@v2 with: version: '5.15.2' - name: Build QtPass run: | - qmake + qmake qtpass.pro CONFIG+=static make copy README.md src\release\README.txt copy LICENSE src\release\LICENSE.txt @@ -45,9 +46,10 @@ jobs: run: | qmake make + macdeployqt main/QtPass.app - name: Upload Artifact uses: actions/upload-artifact@v2 with: name: PyQtPass-macOS - path: release/ + path: macdeployqt main/QtPass.app From ec28ce94d85d31ff356ecc389ad5a18782f062b2 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Sat, 18 Nov 2023 02:08:53 +0100 Subject: [PATCH 04/17] nmake, really --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa49e440..23c118f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Build QtPass run: | qmake qtpass.pro CONFIG+=static - make + nmake copy README.md src\release\README.txt copy LICENSE src\release\LICENSE.txt - name: Install Inno Setup From bb12cf0b8c95497302e0d5450e481713366e5115 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 21:50:23 +0100 Subject: [PATCH 05/17] Let's see if it works with new versions and no Greek --- .github/workflows/build.yml | 26 +++++++++---------- ...calization_ro.ts => localization_ro_RO.ts} | 0 qtpass.iss | 1 - src/src.pro | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) rename localization/{localization_ro.ts => localization_ro_RO.ts} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23c118f5..e139a720 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,15 +1,21 @@ name: Build and Release -on: [push, pull_request] +on: + pull_request: + branches: + - main + push: + tags: + - 'v*' jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 - name: Setup Qt environment - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: '5.15.2' - name: Build QtPass @@ -23,23 +29,17 @@ jobs: - name: Create Installer with Inno Setup run: ISCC.exe qtpass.iss - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: PyQtPass-Windows path: release - - name: Upload Release Asset - uses: softprops/action-gh-release@v1 - with: - files: Output\qtpass-*.exe - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-mac: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Qt environment - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: '5.15.2' - name: Build QtPass @@ -48,7 +48,7 @@ jobs: make macdeployqt main/QtPass.app - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: PyQtPass-macOS path: macdeployqt main/QtPass.app diff --git a/localization/localization_ro.ts b/localization/localization_ro_RO.ts similarity index 100% rename from localization/localization_ro.ts rename to localization/localization_ro_RO.ts diff --git a/qtpass.iss b/qtpass.iss index 4a9f62ac..7d6cbac3 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -41,7 +41,6 @@ Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" Name: "french"; MessagesFile: "compiler:Languages\French.isl" Name: "german"; MessagesFile: "compiler:Languages\German.isl" -Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl" Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" diff --git a/src/src.pro b/src/src.pro index 63f76664..b9c47c16 100644 --- a/src/src.pro +++ b/src/src.pro @@ -41,6 +41,7 @@ TRANSLATIONS += ../localization/localization_ar_MA.ts \ ../localization/localization_cy_GB.ts \ ../localization/localization_hr_HR.ts \ ../localization/localization_af_ZA.ts \ + ../localization/localization_ro_RO.ts \ ../localization/localization_sl_SI.ts \ ../localization/localization_sr_RS.ts \ ../localization/localization_ja_JA.ts \ From 98817a3c1c0f5d2d180a011c8a81a00886c47936 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 21:58:41 +0100 Subject: [PATCH 06/17] No more Nepali --- qtpass.iss | 1 - 1 file changed, 1 deletion(-) diff --git a/qtpass.iss b/qtpass.iss index 7d6cbac3..1beb2373 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -45,7 +45,6 @@ Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" -Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu" Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" From d658b08c76e8462c6f1cbaeb24cf927e446ce71e Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:02:26 +0100 Subject: [PATCH 07/17] removed ScottishGaelic --- qtpass.iss | 1 - 1 file changed, 1 deletion(-) diff --git a/qtpass.iss b/qtpass.iss index 1beb2373..733070b3 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -49,7 +49,6 @@ Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" From 950258e6ccb354cb83900a7ad833c581269b14ff Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:05:55 +0100 Subject: [PATCH 08/17] removed SerbianCyrillic --- qtpass.iss | 1 - 1 file changed, 1 deletion(-) diff --git a/qtpass.iss b/qtpass.iss index 733070b3..c4142dab 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -49,7 +49,6 @@ Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" From c222ced1996e495700b466107a5833a90c9d4d19 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:10:01 +0100 Subject: [PATCH 09/17] removed SerbianLatin --- qtpass.iss | 1 - 1 file changed, 1 deletion(-) diff --git a/qtpass.iss b/qtpass.iss index c4142dab..7fa999b4 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -49,7 +49,6 @@ Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" From f68a6661b38029f5d4952b25e26f2ca0938646e9 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:17:29 +0100 Subject: [PATCH 10/17] Let's see if this trick works for QtDir --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e139a720..769b7aed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,8 @@ jobs: run: choco install innosetup - name: Create Installer with Inno Setup run: ISCC.exe qtpass.iss + with: + QtDir: ${{ steps.install-qt.outputs.Qt5_DIR }} - name: Upload Artifact uses: actions/upload-artifact@v3 with: From de5f6ba1037f467b4f9f409e7ea349a9b7f6eeb7 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:26:27 +0100 Subject: [PATCH 11/17] Let's see if this other trick works for QtDir --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 769b7aed..4c4ff0b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,9 +26,12 @@ jobs: copy LICENSE src\release\LICENSE.txt - name: Install Inno Setup run: choco install innosetup + - name: Use Qt + run: | + echo "Qt is installed in ${{ steps.install-qt.outputs.Qt5_DIR }}" - name: Create Installer with Inno Setup run: ISCC.exe qtpass.iss - with: + env: QtDir: ${{ steps.install-qt.outputs.Qt5_DIR }} - name: Upload Artifact uses: actions/upload-artifact@v3 @@ -44,14 +47,19 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: '5.15.2' + - name: Install create-dmg + run: | + brew install create-dmg - name: Build QtPass run: | qmake make macdeployqt main/QtPass.app + - name: Create DMG + run: create-dmg main/QtPass.dmg main/QtPass.app - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: PyQtPass-macOS - path: macdeployqt main/QtPass.app + path: main/QtPass.dmg From 140a30e7e81e89a8b9ab3ecd5821a46c04e9982d Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:35:23 +0100 Subject: [PATCH 12/17] Lt's see if reading docs actually works ;-) --- .github/workflows/build.yml | 5 ----- qtpass.iss | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c4ff0b4..e32776a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,13 +26,8 @@ jobs: copy LICENSE src\release\LICENSE.txt - name: Install Inno Setup run: choco install innosetup - - name: Use Qt - run: | - echo "Qt is installed in ${{ steps.install-qt.outputs.Qt5_DIR }}" - name: Create Installer with Inno Setup run: ISCC.exe qtpass.iss - env: - QtDir: ${{ steps.install-qt.outputs.Qt5_DIR }} - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/qtpass.iss b/qtpass.iss index 7fa999b4..10f796d6 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -7,7 +7,7 @@ #define MyAppURL "https://qtpass.org/" #define MyAppExeName "qtpass.exe" -#define QtDir GetEnv('QTDIR') +#define QtDir GetEnv('QT_ROOT_DIR') [Setup] ; NOTE: The value of AppId uniquely identifies this application. From 275d9a57cb2b8a85659444b74e6109296d323fef Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:43:46 +0100 Subject: [PATCH 13/17] Env things --- .github/workflows/build.yml | 4 ++-- qtpass.iss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e32776a6..74e47350 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: PyQtPass-Windows + name: QtPass-Windows path: release build-mac: @@ -55,6 +55,6 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: PyQtPass-macOS + name: QtPass-macOS path: main/QtPass.dmg diff --git a/qtpass.iss b/qtpass.iss index 10f796d6..49e49aad 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -7,7 +7,7 @@ #define MyAppURL "https://qtpass.org/" #define MyAppExeName "qtpass.exe" -#define QtDir GetEnv('QT_ROOT_DIR') +#define QtDir GetEnv('Qt5_DIR') [Setup] ; NOTE: The value of AppId uniquely identifies this application. From b76f4db8bb911c7eeb23ad1a34380296cb86d97a Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:55:04 +0100 Subject: [PATCH 14/17] Let's see Qt5_DIR --- .github/workflows/build.yml | 2 ++ qtpass.iss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74e47350..2ae137ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: nmake copy README.md src\release\README.txt copy LICENSE src\release\LICENSE.txt + - name: Let's see + run: find $Qt5_DIR - name: Install Inno Setup run: choco install innosetup - name: Create Installer with Inno Setup diff --git a/qtpass.iss b/qtpass.iss index 49e49aad..7fa999b4 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -7,7 +7,7 @@ #define MyAppURL "https://qtpass.org/" #define MyAppExeName "qtpass.exe" -#define QtDir GetEnv('Qt5_DIR') +#define QtDir GetEnv('QTDIR') [Setup] ; NOTE: The value of AppId uniquely identifies this application. From 62718e7cb14927e9a4e2f7b2bc675bdb9a6a5c24 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 22:58:58 +0100 Subject: [PATCH 15/17] build --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ae137ef..56475a01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,12 +24,10 @@ jobs: nmake copy README.md src\release\README.txt copy LICENSE src\release\LICENSE.txt - - name: Let's see - run: find $Qt5_DIR - name: Install Inno Setup run: choco install innosetup - name: Create Installer with Inno Setup - run: ISCC.exe qtpass.iss + run: ISCC.exe qtpass-gh.iss - name: Upload Artifact uses: actions/upload-artifact@v3 with: From e4bdc27e977b8fd61fd411744b76f25dbe6563a0 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 23:30:59 +0100 Subject: [PATCH 16/17] Nothing fancy --- qtpass-gh.iss | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ qtpass.iss | 5 ++++ 2 files changed, 87 insertions(+) create mode 100644 qtpass-gh.iss diff --git a/qtpass-gh.iss b/qtpass-gh.iss new file mode 100644 index 00000000..7fa999b4 --- /dev/null +++ b/qtpass-gh.iss @@ -0,0 +1,82 @@ +; Script generated by the Inno Script Studio Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "QtPass" +#define MyAppVersion "1.4.0" +#define MyAppPublisher "IJhack" +#define MyAppURL "https://qtpass.org/" +#define MyAppExeName "qtpass.exe" + +#define QtDir GetEnv('QTDIR') + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{C64A2871-0C42-4A90-9071-D84DC30563BF} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +LicenseFile=src\release\LICENSE.txt +OutputBaseFilename=qtpass-{#MyAppVersion} +PrivilegesRequired=lowest +Compression=lzma +SolidCompression=yes +ShowLanguageDialog=no + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" +Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl" +Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" +Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" +Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" +Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "{#QtDir}\bin\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\libstdc++-6.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\libwinpthread-1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#QtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms\"; Flags: ignoreversion +Source: "{#QtDir}\plugins\iconengines\qsvgicon.dll"; DestDir: "{app}\iconengines\"; Flags: ignoreversion + +Source: "main\release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "src\release\README.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "src\release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent diff --git a/qtpass.iss b/qtpass.iss index 7fa999b4..4a9f62ac 100644 --- a/qtpass.iss +++ b/qtpass.iss @@ -41,14 +41,19 @@ Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" Name: "french"; MessagesFile: "compiler:Languages\French.isl" Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl" Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu" Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" +Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" +Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" From 3e03c0168858ef431784fdf19212a2b6a7261625 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 28 Nov 2023 23:35:15 +0100 Subject: [PATCH 17/17] QT_ROOT_DIR --- qtpass-gh.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtpass-gh.iss b/qtpass-gh.iss index 7fa999b4..10f796d6 100644 --- a/qtpass-gh.iss +++ b/qtpass-gh.iss @@ -7,7 +7,7 @@ #define MyAppURL "https://qtpass.org/" #define MyAppExeName "qtpass.exe" -#define QtDir GetEnv('QTDIR') +#define QtDir GetEnv('QT_ROOT_DIR') [Setup] ; NOTE: The value of AppId uniquely identifies this application.