fix: copy functions-*.ini files to the right folder, add iconset

ansgarbecker · ansgarbecker · commit 2f92db27ebd4 · 2025-12-15T19:20:28.000+01:00
ini files no go to the "Resources" dir in the app bundle, not "MacOS". This probably caused the failing notarization. Refs #2238
diff --git a/create-macos-app.sh b/create-macos-app.sh
@@ -11,9 +11,6 @@ APP_DIR="$(pwd)/${BUNDLE_NAME}"
 EXECUTABLE_SRC="$(pwd)/out/heidisql"
 EXECUTABLE_TRG="${APP_DIR}/Contents/MacOS/${APP_NAME}"
 
-# Directory that contains your ini files
-INI_SOURCE_DIR="$(pwd)/extra/ini"             # change if needed
-
 # Homebrew prefix (auto-detected; override if needed)
 BREW_PREFIX="$(brew --prefix 2>/dev/null || echo "/opt/homebrew")"
 
@@ -80,13 +77,16 @@ cat > "${APP_DIR}/Contents/Info.plist" <<EOF
   <string>15.0</string>
   <key>NSHighResolutionCapable</key>
   <true/>
+  <key>CFBundleIconFile</key>
+  <string>heidisql</string>
 </dict>
 </plist>
 EOF
 
 
 ### COPY INI FILES INTO RESOURCES
-cp ${INI_SOURCE_DIR}/*.ini "${APP_DIR}/Contents/MacOS/"
+cp extra/ini/*.ini "${APP_DIR}/Contents/Resources/"
+cp res/heidisql.icns "${APP_DIR}/Contents/Resources/" 
 
 
 ### FUNCTION: COPY A DYLIB AND ITS DEPENDENCIES
diff --git a/res/heidisql.icns b/res/heidisql.icns
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -358,6 +358,7 @@   TAppSettings = class(TObject)
   //function GetTempDir: String;
   function GetAppDir: String;
   function GetLibDir: String;
+  function GetResourcesDir: String;
   procedure SaveUnicodeFile(Filename: String; Text: String; Encoding: TEncoding);
   procedure OpenTextFile(const Filename: String; out Stream: TFileStream; var Encoding: TEncoding);
   function DetectEncoding(Stream: TStream): TEncoding;
@@ -1317,6 +1318,16 @@ function GetLibDir: String;
   {$ENDIF}
 end;
 
+function GetResourcesDir: String;
+begin
+  // point to resources dir in macOS app bundle
+  {$IFDEF DARWIN}
+  Result := GetAppDir + '..' + DirectorySeparator + 'Resources' + DirectorySeparator;
+  {$ELSE}
+  Result := GetAppDir;
+  {$ENDIF}
+end;
+
 {**
   Save a textfile with unicode
 }
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
@@ -11382,7 +11382,7 @@ constructor TSQLFunctionList.Create(AOwner: TDBConnection; SQLFunctionsFileOrder
 
   TryFiles := Explode(',', SQLFunctionsFileOrder);
   for TryFile in TryFiles do begin
-    IniFilePath := GetAppDir + 'functions-'+TryFile+'.ini';
+    IniFilePath := GetResourcesDir + 'functions-'+TryFile+'.ini';
     FOwner.Log(lcDebug, 'Trying '+IniFilePath);
     if FileExists(IniFilePath) then begin
       FOwner.Log(lcInfo, 'Reading function definitions from '+IniFilePath);
