Improve Mac version by providing the cache

Author: kovzol

qt/deploy-mac

@@ -1,7 +1,8 @@
 #!/bin/sh
 
-# Usage: ./deploy-mac [build-dir] [codesign]
-# where build-dir is the folder where the executable has already been built (by default, "build/")
+# Usage: ./deploy-mac [build-dir] [cache-dir] [codesign]
+# where build-dir is the folder where the executable has already been built (by default, "build/"),
+# cache-dir is the folder where the bibref-addbooks-cache indices are present,
 # and codesign is the input for performing an optional code signing.
 
 BUILD_DIR="$1"
@@ -10,6 +11,11 @@ if [ "$BUILD_DIR" = "" ]; then
  BUILD_DIR="build/"
  fi
 
+CACHE_DIR="$2"
+if [ "$CACHE_DIR" = "" ]; then
+ CACHE_DIR="../build/bibref-addbooks-cache"
+ fi
+
 MACDEPLOYQT=$(command -v macdeployqt)
 if [ ! -x "$MACDEPLOYQT" ]; then
     echo "macdeployqt is not in path."
@@ -21,11 +27,19 @@ test -d "$BUILD_DIR/bibref-qt.app/" || {
     exit 2
     }
 
-test -d bin || {
-    mkdir bin
-    cp -R $BUILD_DIR/bibref-qt.app bin
+test -d bin && {
+    echo "The bin folder should be removed first."
+    exit 3
+    }
+
+test -d "$CACHE_DIR" || {
+    echo "Build the cli version first and generate the cache via addbooks."
+    exit 4
     }
 
+mkdir bin
+cp -R $BUILD_DIR/bibref-qt.app bin
+
 mkdir -p "bin/bibref-qt.app/Contents/Resources/statements/"
 mkdir -p "bin/bibref-qt.app/Contents/Resources/statements/SBLGNT"
 mkdir -p "bin/bibref-qt.app/Contents/Resources/statements/StatResGNT"
@@ -38,8 +52,11 @@ rm -fr bin/bibref-qt.app/Contents/Resources/statements/all
 unzip ../sword-lxx-sblgnt-statresgnt-kjv-fallback.zip -d bin/bibref-qt.app/Contents/Resources
 mv bin/bibref-qt.app/Contents/Resources/.sword bin/bibref-qt.app/Contents/Resources/sword
 
-if [ -z "$2" ]; then
+# Put the cache in the bundle
+cp -R $CACHE_DIR bin/bibref-qt.app/Contents/Resources
+
+if [ -z "$3" ]; then
     $MACDEPLOYQT bin/bibref-qt.app -dmg
 else
-    $MACDEPLOYQT bin/bibref-qt.app -dmg -codesign="$2"
+    $MACDEPLOYQT bin/bibref-qt.app -dmg -codesign="$3"
 fi

qt/main.cpp

@@ -98,6 +98,12 @@ int main(int argc, char *argv[])
     if (home)
        std::filesystem::current_path(std::getenv("XDG_DATA_HOME"));
     copy_sword_files();
+#ifdef __APPLE__
+    // Set current working directory to Resources to have direct access to the cache:
+    QString workingDirectory = qApp -> applicationDirPath();
+    QString d1 = workingDirectory + QDir::separator() + ".." + QDir::separator() + "Resources";
+    QDir::setCurrent(d1);
+#endif // __APPLE__
     window.show();
     return app.exec();
 }

qt/statementwindow.cpp

@@ -50,6 +50,9 @@ void StatementWindow::openFile(const QString &path)
       QString d4 = directory + QDir::separator() + ".." + QDir::separator()
         + "share" + QDir::separator() + "statements";
       const QFileInfo f4(d4);
+      QString d5 = directory + QDir::separator() + ".." + QDir::separator()
+        + "Resources" + QDir::separator() + "statements";
+      const QFileInfo f5(d5);
       if (f1.exists() && f1.isDir())
         directory = d1;
       else if (f2.exists() && f2.isDir())
@@ -58,6 +61,8 @@ void StatementWindow::openFile(const QString &path)
         directory = d3;
       else if (f4.exists() && f4.isDir())
         directory = d4;
+      else if (f5.exists() && f5.isDir())
+        directory = d5;
       }
 
     if (fileName.isNull()) {