Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scripts and logic specific to Windows Store releases #439

Merged
merged 2 commits into from
Dec 17, 2018
Merged

Scripts and logic specific to Windows Store releases #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a60894
Add a special winstore config flag.
rdoeffinger Sep 5, 2018
cf2202a
Add script to build release for Microsoft Store.
rdoeffinger Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions qtpass.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ isEmpty(QMAKE_LUPDATE) {
}
}

winstore: DEFINES += "WINSTORE=1"

win32 {
RC_FILE = ../windows.rc
static {
Expand Down
21 changes: 21 additions & 0 deletions release-winstore.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
call vcvars64.bat
jom.exe distclean
qmake.exe -config release CONFIG+=winstore
jom.exe clean
jom.exe
rmdir /s /q main\release\deploy
del /q /s main\release\deploy
mkdir main\release\deploy
windeployqt.exe --no-compiler-runtime --no-angle --no-opengl-sw main\release\qtpass.exe --dir main\release\deploy
copy /b /y main\release\qtpass.exe main\release\deploy\qtpass.exe
copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\concrt140.dll main\release\deploy\concrt140.dll
copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\msvcp140.dll main\release\deploy\msvcp140.dll
copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\vcruntime140.dll main\release\deploy\vcruntime140.dll

REM Just a workaround for a bug in the Windows Store validation

mkdir main\release\deploy\Assets

for %%I in (artwork\*.png) do copy /b /y %%I main\release\deploy\Assets

REM DesktopAppConverter.exe -Installer main\release\deploy -AppExecutable qtpass.exe -AppId ReimarDffinger.QtPassApp -PackageName 33893ReimarDffinger.QtPassApp -PackageDisplayName "QtPass App" -AppDisplayName "QtPass App" -Destination . -Publisher CN=7FA184CD-E614-4630-8C10-9BC1E1A38DD7 -PackagePublisherDisplayName "Reimar D�ffinger" -Version 1.2.3.0 -MakeAppx
17 changes: 16 additions & 1 deletion src/configdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,26 @@ void ConfigDialog::wizard() {
if (!gpg.startsWith("wsl ") && !QFile(gpg).exists()) {
criticalMessage(
tr("GnuPG not found"),
#ifdef Q_OS_WIN
#ifdef WINSTORE
tr("Please install GnuPG on your system.<br>Install "
"<strong>Ubuntu</strong> from the Microsoft Store to get it.<br>"
"If you already did so, make sure you started it once and<br>"
"click \"Autodetect\" in the next dialog.")
#else
tr("Please install GnuPG on your system.<br>Install "
"<strong>Ubuntu</strong> from the Microsoft Store<br>or <a "
"href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it "
"from GnuPG.org")
#endif
#else
tr("Please install GnuPG on your system.<br>Install "
"<strong>gpg</strong> using your favorite package manager<br>or "
"<a "
"href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it "
"from GnuPG.org"));
"from GnuPG.org")
#endif
);
clean = true;
}

Expand Down