Create a safe copy of the app icon

Author: gcasa

Generators/Makefile/GSXCMakefileGenerator.m

@@ -75,6 +75,10 @@ - (BOOL) generate
   NSString *additionalIncludes = [self safeStringFromArray: [context objectForKey: @"ADDITIONAL_INCLUDE_DIRS"] withMethod: @selector(arrayToIncludeList)];
   NSString *additionalOCflags = [self safeStringFromArray: [context objectForKey: @"ADDITIONAL_OBJC_LIBS"] withMethod: @selector(arrayToLinkList)];
   NSString *projectType = [context objectForKey: @"PROJECT_TYPE"];
+  
+  // Get app icon information from build context
+  NSString *appIconFile = [context objectForKey: @"APP_ICON_FILE"];
+  NSString *safeAppIconFile = [context objectForKey: @"APP_ICON_SAFE_FILE"];
 
   // Debug output to see what we're getting from the context
   NSDebugLog(@"=== DEBUG: Makefile Generator Context ===");
@@ -84,6 +88,8 @@ - (BOOL) generate
   NSDebugLog(@"OBJCPP_FILES: %@", [context objectForKey: @"OBJCPP_FILES"]);
   NSDebugLog(@"RESOURCES: %@", [context objectForKey: @"RESOURCES"]);
   NSDebugLog(@"PROJECT_TYPE: %@", projectType);
+  NSDebugLog(@"APP_ICON_FILE: %@", appIconFile);
+  NSDebugLog(@"APP_ICON_SAFE_FILE: %@", safeAppIconFile);
   NSDebugLog(@"========================================");
 
   // Construct the makefile out of the data we have thusfar collected.
@@ -143,6 +149,23 @@ - (BOOL) generate
                                     [NSString stringWithFormat: @"%@_RESOURCE_FILES = %@\n\n", appName, resourceFilesString]];
     }
 
+  // Add app icon handling if an icon was discovered
+  if (appIconFile != nil && [projectType isEqualToString: @"application"])
+    {
+      NSString *iconToUse = safeAppIconFile ? safeAppIconFile : appIconFile;
+      makefileString = [makefileString stringByAppendingString: @"# App icon handling\n"];
+      makefileString = [makefileString stringByAppendingString: 
+                                    [NSString stringWithFormat: @"%@_MAIN_MODEL_FILE = %@\n", appName, iconToUse]];
+      
+      // Add a rule to copy the app icon to the app bundle
+      makefileString = [makefileString stringByAppendingString: @"# Copy app icon to Resources directory\n"];
+      makefileString = [makefileString stringByAppendingString: 
+                                    [NSString stringWithFormat: @"after-install::\n\t$(INSTALL_DATA) %@ $(GNUSTEP_APP_INSTALL_DIR)/%@.app/Resources/\n\n", 
+                                                               iconToUse, appName]];
+      
+      xcputs([[NSString stringWithFormat: @"\t* Added app icon to makefile: %@", iconToUse] cString]);
+    }
+  
   if ([additionalIncludes length] > 0)
     {
       makefileString = [makefileString stringByAppendingString:

XCode/PBXResourcesBuildPhase.h

@@ -55,6 +55,14 @@
  */
 - (BOOL) copyAppIconToResources: (NSString *)iconFilename;
 
+/**
+ * Creates a safe copy of the app icon file with spaces replaced by underscores.
+ * If the icon filename contains spaces, creates a copy with a makefile-safe name.
+ * Takes the name of the icon file to process as parameter.
+ * Returns the safe filename if a copy was created, or nil if no spaces were found.
+ */
+- (NSString *) createSafeIconCopy: (NSString *)iconFilename;
+
 /**
  * Escapes special characters in filenames for makefile compatibility.
  * Handles spaces, dollar signs, hash symbols, and colons that have special 

XCode/PBXResourcesBuildPhase.m

@@ -238,6 +238,46 @@ - (BOOL) copyAppIconToResources: (NSString *)iconFilename
   return success;
 }
 
+- (NSString *) createSafeIconCopy: (NSString *)iconFilename
+{
+  if (iconFilename == nil || [iconFilename rangeOfString: @" "].location == NSNotFound)
+    {
+      // No spaces, return original filename
+      return nil;
+    }
+
+  NSFileManager *mgr = [NSFileManager defaultManager];
+  NSString *productName = [_target name];
+  NSString *assetsDir = [productName stringByAppendingPathComponent: @"Assets.xcassets"];
+  NSString *appIconDir = [assetsDir stringByAppendingPathComponent: @"AppIcon.appiconset"];
+  NSString *sourcePath = [appIconDir stringByAppendingPathComponent: iconFilename];
+  
+  // Create safe filename by replacing spaces with underscores
+  NSString *safeFilename = [iconFilename stringByReplacingOccurrencesOfString: @" " withString: @"_"];
+  NSString *safePath = [appIconDir stringByAppendingPathComponent: safeFilename];
+  
+  xcputs([[NSString stringWithFormat: @"\t* Creating safe icon copy: %@ -> %@", iconFilename, safeFilename] cString]);
+  
+  // Copy original to safe filename
+  NSError *error = nil;
+  if ([mgr fileExistsAtPath: safePath])
+    {
+      [mgr removeItemAtPath: safePath error: NULL];
+    }
+  
+  BOOL success = [mgr copyItemAtPath: sourcePath toPath: safePath error: &error];
+  if (success)
+    {
+      xcputs([[NSString stringWithFormat: @"\t* Successfully created safe icon copy: %@", safeFilename] cString]);
+      return safeFilename;
+    }
+  else
+    {
+      xcputs([[NSString stringWithFormat: @"\t* ERROR: Failed to create safe icon copy: %@", error ? [error localizedDescription] : @"Unknown error"] cString]);
+      return nil;
+    }
+}
+
 - (NSString *) processAssets
 {
   NSString *filename = [self discoverAppIcon];
@@ -625,18 +665,32 @@ - (BOOL) generate
   NSString *iconPath = [self discoverAppIconPath];
   xcputs([[NSString stringWithFormat: @"\t* Discovered app icon: %@", iconFile ? iconFile : @"(none)"] cString]);
 
+  // Store app icon information in build context for makefile generation
+  GSXCBuildContext *context = [GSXCBuildContext sharedBuildContext];
+  if (iconFile != nil)
+    {
+      [context setObject: iconFile forKey: @"APP_ICON_FILE"];
+      xcputs([[NSString stringWithFormat: @"\t* Stored app icon in build context: %@", iconFile] cString]);
+    }
+
   // Add icon file to resources if found
   if (iconPath != nil)
     {
       NSString *escapedIconPath = [self escapeFilenameForMakefile: iconPath];
       xcputs([[NSString stringWithFormat: @"\t* Adding app icon to resources: %@", iconPath] cString]);
       [resources addObject: escapedIconPath];
 
-      // Copy app icon to resources directory
-      BOOL iconCopied = [self copyAppIconToResources: iconFile];
+      // Copy app icon to resources directory with safe filename
+      NSString *safeIconFile = [self createSafeIconCopy: iconFile];
+      BOOL iconCopied = [self copyAppIconToResources: safeIconFile ? safeIconFile : iconFile];
       if (iconCopied)
         {
-          xcputs([[NSString stringWithFormat: @"\t* Copied app icon to resources: %@", iconFile] cString]);
+          xcputs([[NSString stringWithFormat: @"\t* Copied app icon to resources: %@", safeIconFile ? safeIconFile : iconFile] cString]);
+          // Store the safe filename for makefile generation
+          if (safeIconFile != nil)
+            {
+              [context setObject: safeIconFile forKey: @"APP_ICON_SAFE_FILE"];
+            }
         }
       else
         {

test_app_icon.md

@@ -0,0 +1,65 @@
+# App Icon Handling Implementation
+
+## Summary of Changes
+
+The implementation adds automatic discovery and handling of application icons when generating makefiles, with special handling for filenames containing spaces.
+
+## Files Modified:
+
+### 1. PBXResourcesBuildPhase.h
+- Added `createSafeIconCopy:` method declaration
+
+### 2. PBXResourcesBuildPhase.m
+- Modified icon discovery to store information in GSXCBuildContext
+- Added `createSafeIconCopy:` method to handle filenames with spaces
+- Enhanced icon copying to create safe copies when needed
+
+### 3. GSXCMakefileGenerator.m
+- Enhanced array checking to prevent makefile cruft
+- Added app icon retrieval from build context
+- Added app icon handling in generated makefiles
+- Added debug output for app icon information
+
+## Key Features:
+
+### 1. Space Handling
+- **Problem**: Icon filenames with spaces cause issues in makefiles
+- **Solution**: Creates safe copies with underscores replacing spaces
+- **Example**: "My App Icon.png" → "My_App_Icon.png"
+
+### 2. Makefile Generation
+When an app icon is discovered, the generated makefile includes:
+
+```makefile
+# App icon handling
+MyApp_MAIN_MODEL_FILE = My_App_Icon.png
+
+# Copy app icon to Resources directory
+after-install::
+	$(INSTALL_DATA) My_App_Icon.png $(GNUSTEP_APP_INSTALL_DIR)/MyApp.app/Resources/
+```
+
+### 3. Build Context Integration
+- App icon information stored in GSXCBuildContext
+- Keys: `APP_ICON_FILE` (original) and `APP_ICON_SAFE_FILE` (safe copy)
+- Accessible across build phases and generators
+
+### 4. Automatic Processing
+- Icon discovery happens during resource build phase
+- Safe copies created automatically if needed
+- Makefile generation includes icon handling without manual configuration
+
+## Usage:
+
+1. Place app icons in `Assets.xcassets/AppIcon.appiconset/`
+2. Ensure `Contents.json` defines a 32x32@1x icon
+3. Run buildtool - icon handling is automatic
+4. Generated makefile will include proper icon installation rules
+
+## Benefits:
+
+- **Eliminates manual icon handling**: No need to manually copy icons or add makefile rules
+- **Handles spaces properly**: Automatically creates makefile-safe filenames
+- **Cross-platform compatibility**: Works with GNUstep makefiles
+- **Debug visibility**: Clear logging of icon processing steps
+- **Robust error handling**: Graceful fallbacks when icons are not found