Polishing for macOS

Author: hyperfield

installer/src/InstallerWindow.cpp

@@ -100,10 +100,8 @@ InstallerWindow::InstallerWindow(QWidget* parent) : QMainWindow(parent)
     hideGuiCheck_ = new QCheckBox(tr("Hide GUI/CLI after successful runs"), central);
     layout->addWidget(hideGuiCheck_);
 
-#if defined(Q_OS_WIN)
     copyCliOnlyCheck_ = new QCheckBox(tr("Copy only the CLI version (reduces the size)"), central);
     layout->addWidget(copyCliOnlyCheck_);
-#endif
 
     installButton_ = new QPushButton(tr("Install PyAppExec"), central);
     installButton_->setFixedWidth(220);
@@ -237,11 +235,9 @@ SettingsModel InstallerWindow::gatherSettings() const
         settings.iconPath = iconPathEdit_->text().trimmed();
     }
     settings.hideGuiAfterSuccess = hideGuiCheck_->isChecked();
-#if defined(Q_OS_WIN)
     if (copyCliOnlyCheck_) {
         settings.copyCliOnly = copyCliOnlyCheck_->isChecked();
     }
-#endif
     return settings;
 }
 
@@ -304,11 +300,9 @@ void InstallerWindow::handleInstall()
 
     logMessage(tr("Generated %1").arg(createdIni));
     logMessage(tr("Copied launcher as %1").arg(settings.launcherArtifactName()));
-#if defined(Q_OS_WIN)
     if (settings.copyCliOnly) {
-        logMessage(tr("CLI-only mode: skipped copying Qt and other adjacent DLLs."));
+        logMessage(tr("CLI-only mode: using the command-line launcher instead of the GUI binary."));
     }
-#endif
 
     QDesktopServices::openUrl(QUrl::fromLocalFile(createdIni));
     QMessageBox::information(this, tr("Success"), tr("PyAppExec was installed for %1").arg(settings.appName));
@@ -433,16 +427,15 @@ void InstallerWindow::showAboutQtDialog()
 void InstallerWindow::updateActionButtons()
 {
     const bool hasProject = !projectPathEdit_->text().trimmed().isEmpty();
+    const QString iniPath = hasProject
+        ? QDir(projectPathEdit_->text()).filePath(QStringLiteral("pyappexec.ini"))
+        : QString();
+    const bool hasIni = hasProject && QFileInfo::exists(iniPath);
+
     if (installButton_) {
         installButton_->setEnabled(hasProject);
     }
 
-#if defined(Q_OS_WIN)
-    bool hasIni = false;
-    if (hasProject) {
-        const QString iniPath = QDir(projectPathEdit_->text()).filePath(QStringLiteral("pyappexec.ini"));
-        hasIni = QFileInfo::exists(iniPath);
-    }
     if (uninstallButton_) {
         uninstallButton_->setEnabled(hasProject && hasIni);
         if (!hasIni) {
@@ -451,7 +444,6 @@ void InstallerWindow::updateActionButtons()
             uninstallButton_->setToolTip(QString());
         }
     }
-#endif
 }
 
 } // namespace installer

lib/ConfigLoader.cpp

@@ -38,8 +38,14 @@ std::filesystem::path ConfigLoader::resolveConfigPath(const std::optional<std::s
         return primary;
     }
 
+    fs::path adjacent = binaryDir_ / "pyappexec.ini";
+    if (fs::exists(adjacent, ec)) {
+        spdlog::info("Found pyappexec.ini next to the launcher at {}", adjacent.string());
+        return adjacent;
+    }
+
     throw std::runtime_error(
-        "Unable to locate pyappexec.ini in the current directory.\n"
+        "Unable to locate pyappexec.ini in the current directory or next to the launcher.\n"
         "Pass --config /path/to/pyappexec.ini to specify the configuration explicitly.");
 }
 

scripts/create_dmg.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 /path/to/AppName.app" >&2
+    exit 1
+fi
+
+APP_PATH="$1"
+if [[ ! -d "$APP_PATH" ]]; then
+    echo "Error: $APP_PATH is not a directory (expected a .app bundle)" >&2
+    exit 1
+fi
+
+APP_ABS="$(cd "$(dirname "$APP_PATH")" && pwd)/$(basename "$APP_PATH")"
+APP_NAME="$(basename "$APP_PATH" .app)"
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+DIST_DIR="${DIST_DIR:-${ROOT_DIR}/dist}"
+
+mkdir -p "$DIST_DIR"
+
+DMG_PATH="${DIST_DIR}/${APP_NAME}.dmg"
+
+echo "Creating DMG:"
+echo "  Source: $APP_ABS"
+echo "  Output: $DMG_PATH"
+
+STAGING_DIR="$(mktemp -d -t pyappexec_dmg)"
+cleanup() { rm -rf "$STAGING_DIR"; }
+trap cleanup EXIT
+
+cp -R "$APP_ABS" "$STAGING_DIR/"
+ln -s /Applications "$STAGING_DIR/Applications"
+
+if [[ -f "$DMG_PATH" ]]; then
+    rm -f "$DMG_PATH"
+fi
+
+hdiutil create -fs HFS+ -volname "$APP_NAME" -srcfolder "$STAGING_DIR" "$DMG_PATH"
+
+echo "DMG created at $DMG_PATH"