Build on Windows

- Bumped a few more version numbers in the codebase. - Updated readme for Windows packaging.
aaronhktan · Feb 8, 2022 · 9d33f53 · 9d33f53
1 parent 7a5dfb6
commit 9d33f53
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/jyut-dict/jyut-dict.pro b/src/jyut-dict/jyut-dict.pro
@@ -18,7 +18,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = "Jyut Dictionary"
 TEMPLATE = app
 
-VERSION = 0.20.05.25
+VERSION = 1.22.02.07
 QMAKE_TARGET_COMPANY = "Aaron Tan"
 QMAKE_TARGET_PRODUCT = "Jyut Dictionary"
 QMAKE_TARGET_DESCRIPTION = "Jyut Dictionary"

diff --git a/src/jyut-dict/logic/database/sqldatabasemanager.cpp b/src/jyut-dict/logic/database/sqldatabasemanager.cpp
@@ -221,7 +221,8 @@ QString SQLDatabaseManager::getBundleUserDatabasePath()
     QFileInfo bundleFile{QCoreApplication::applicationDirPath()
                          + "/../Resources/" + USER_DATABASE_NAME};
 #elif defined(Q_OS_WIN)
-    QFileInfo bundleFile{QCoreApplication::applicationDirPath() + USER_DATABASE_NAME};
+    QFileInfo bundleFile{QCoreApplication::applicationDirPath() +  "./"
+                         + USER_DATABASE_NAME};
 #else
 #ifdef APPIMAGE
     QFileInfo bundleFile{QCoreApplication::applicationDirPath()

diff --git a/src/jyut-dict/platform/windows/README.md b/src/jyut-dict/platform/windows/README.md
@@ -3,5 +3,5 @@ To build for Windows:
 - Build using the RELEASE configuration on Windows.
 - Copy the executable, dict.db, and user.db to `installer/packages/com.aaronhktan.cantonesedictionary/data`.
 - Run WinDeployQt on the executable. Make sure to run WinDeployQt with the command prompt installed in the Start Menu or run QtEnv2.bat, so that appropriate paths are added to the system path.
-- Download and install the appropriate OpenSSL 1.0.2 file (32-bit and 64-bit). Copy libeay32.dll and ssleay32.dll to the data folder.
+- Download and install the appropriate OpenSSL 1.1.1 file (32-bit and 64-bit). Copy libssl-1_1.dll, libcrypto-1_1.dll, capi.dll, and dasync.dll to the data folder.
 - Run binarycreator.exe (from Qt Installer Framework Tools), passing `--offline-only -c <path-to-config/config.xml> -p <path-to-packages> <name-of-executable>`.
diff --git a/src/jyut-dict/platform/windows/installer/config/config.xml b/src/jyut-dict/platform/windows/installer/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Jyut Dictionary</Name>
-    <Version>2020-05-25</Version>
+    <Version>2022-02-07</Version>
     <Title>Jyut Dictionary</Title>
     <Publisher>Aaron Tan</Publisher>
     <StartMenuDir>Jyut Dictionary</StartMenuDir>

diff --git a/...t/platform/windows/installer/packages/com.aaronhktan.cantonesedictionary/meta/package.xml b/...t/platform/windows/installer/packages/com.aaronhktan.cantonesedictionary/meta/package.xml
@@ -2,16 +2,16 @@
 <Package>
     <DisplayName>Jyut Dictionary</DisplayName>
     <Description xml:lang="fr">Dictionnaire Jyut</Description>
-    <Description xml:lang="zh_CN">粤语字典</Description>
-    <Description xml:lang="zh_HK">粵語字典</Description>
-    <Description xml:lang="zh_TW">粵語字典</Description>
+    <Description xml:lang="zh_CN">粤语词典</Description>
+    <Description xml:lang="zh_HK">粵語辭典</Description>
+    <Description xml:lang="zh_TW">粵語辭典</Description>
     <Description>The Cantonese Dictionary Application.</Description>
     <Description xml:lang="fr">Application Dictionnaire Jyut.</Description>
-    <Description xml:lang="zh_CN">粤语字典软件。</Description>
-    <Description xml:lang="zh_HK">粵語字典軟件。</Description>
-    <Description xml:lang="zh_TW">粵語字典軟件。</Description>
-    <Version>2020.05.25</Version>
-    <ReleaseDate>2020-05-25</ReleaseDate>
+    <Description xml:lang="zh_CN">粤语词典软件。</Description>
+    <Description xml:lang="zh_HK">粵語辭典軟件。</Description>
+    <Description xml:lang="zh_TW">粵語辭典軟件。</Description>
+    <Version>2022.02.07</Version>
+    <ReleaseDate>2022-02-07</ReleaseDate>
     <Licenses>
         <License name="MIT License" file="LICENSE.md" />
     </Licenses>