Fix Makefile generation

Author: gcasa

Generators/Makefile/GSXCMakefileGenerator.m

@@ -42,6 +42,16 @@ - (BOOL) generate
   NSString *additionalOCflags = [[context objectForKey: @"ADDITIONAL_OBJC_LIBS"] arrayToLinkList];
   NSString *projectType = [context objectForKey: @"PROJECT_TYPE"];
 
+  // Debug output to see what we're getting from the context
+  NSLog(@"=== DEBUG: Makefile Generator Context ===");
+  NSLog(@"OBJC_FILES: %@", [context objectForKey: @"OBJC_FILES"]);
+  NSLog(@"C_FILES: %@", [context objectForKey: @"C_FILES"]);
+  NSLog(@"CPP_FILES: %@", [context objectForKey: @"CPP_FILES"]);
+  NSLog(@"OBJCPP_FILES: %@", [context objectForKey: @"OBJCPP_FILES"]);
+  NSLog(@"RESOURCES: %@", [context objectForKey: @"RESOURCES"]);
+  NSLog(@"PROJECT_TYPE: %@", projectType);
+  NSLog(@"========================================");
+
   // Construct the makefile out of the data we have thusfar collected.
   xcputs("\t* Generating GNUmakefile");
 

XCode/PBXBuildPhase.h

@@ -134,6 +134,8 @@
 /**
  * Returns files from groups that support the children method.
  * This includes PBXFileSystemSynchronizedRootGroup and other group types.
+ * Base implementation returns empty array - subclasses should override
+ * to return appropriate file types for their specific build phase.
  */
 - (NSArray *) filesFromGroups;
 

XCode/PBXBuildPhase.m

@@ -144,44 +144,10 @@ - (NSArray *) allFiles
 
 - (NSArray *) filesFromGroups
 {
-  NSMutableArray *result = [NSMutableArray array];
-  
-  if (_target != nil)
-    {
-      // Get files from synchronized groups (like PBXFileSystemSynchronizedRootGroup)
-      NSArray *synchronizedSources = [_target synchronizedSources];
-      if (synchronizedSources != nil)
-        {
-          [result addObjectsFromArray: synchronizedSources];
-        }
-      
-      // Get files from synchronized headers
-      NSArray *synchronizedHeaders = [_target synchronizedHeaders];
-      if (synchronizedHeaders != nil)
-        {
-          [result addObjectsFromArray: synchronizedHeaders];
-        }
-      
-      // Future enhancement: We could extend this to handle other group types
-      // that support the children method by iterating through all groups in the target.
-      // This would allow build phases to automatically discover files from any
-      // group type that implements the children method, not just synchronized groups.
-      //
-      // Example approach for future expansion:
-      // NSArray *allGroups = [_target allGroups]; // hypothetical method
-      // NSEnumerator *groupEnum = [allGroups objectEnumerator];
-      // id group = nil;
-      // while ((group = [groupEnum nextObject]) != nil)
-      //   {
-      //     if ([group respondsToSelector: @selector(children)])
-      //       {
-      //         NSArray *children = [group children];
-      //         [result addObjectsFromArray: children];
-      //       }
-      //   }
-    }
-  
-  return result;
+  // Base implementation returns empty array.
+  // Subclasses should override this method to return appropriate files
+  // from groups based on the type of build phase.
+  return [NSArray array];
 }
 
 @end

XCode/PBXHeadersBuildPhase.m

@@ -154,6 +154,24 @@ - (BOOL) generate
   return result;
 }
 
+// Override filesFromGroups to only return header files for PBXHeadersBuildPhase
+- (NSArray *) filesFromGroups
+{
+  NSMutableArray *result = [NSMutableArray array];
+  
+  if (_target != nil)
+    {
+      // Only get header files for the headers build phase
+      NSArray *synchronizedHeaders = [_target synchronizedHeaders];
+      if (synchronizedHeaders != nil)
+        {
+          [result addObjectsFromArray: synchronizedHeaders];
+        }
+    }
+  
+  return result;
+}
+
 - (BOOL) link
 {
   return YES;

XCode/PBXResourcesBuildPhase.m

@@ -389,15 +389,18 @@ - (BOOL) build
 - (BOOL) generate
 {
   GSXCBuildContext *context = [GSXCBuildContext sharedBuildContext];
-  NSMutableArray *resources = [NSMutableArray arrayWithCapacity: [_files count]];
+  
+  // Use the new allFiles method to include files from groups
+  NSArray *allFiles = [self allFiles];
+  NSMutableArray *resources = [NSMutableArray arrayWithCapacity: [allFiles count]];
 
   xcputs("=== Generating Resources Entries Build Phase");
   NSFileManager *mgr = [NSFileManager defaultManager];
   NSString *productName = [_target productName];
   NSString *appName = [productName stringByDeletingPathExtension];
 
   // Copy all resources...
-  NSEnumerator *en = [_files objectEnumerator];
+  NSEnumerator *en = [allFiles objectEnumerator];
   BOOL result = YES;
   id file = nil;
   while((file = [en nextObject]) != nil && result)
@@ -462,6 +465,33 @@ - (BOOL) generate
   return result;
 }
 
+// Override filesFromGroups for resources - could include any file type
+- (NSArray *) filesFromGroups
+{
+  NSMutableArray *result = [NSMutableArray array];
+  
+  if (_target != nil)
+    {
+      // Resources can include both source and header files, plus other resource types
+      // For now, we get both synchronized sources and headers
+      NSArray *synchronizedSources = [_target synchronizedSources];
+      if (synchronizedSources != nil)
+        {
+          [result addObjectsFromArray: synchronizedSources];
+        }
+      
+      NSArray *synchronizedHeaders = [_target synchronizedHeaders];
+      if (synchronizedHeaders != nil)
+        {
+          [result addObjectsFromArray: synchronizedHeaders];
+        }
+      
+      // TODO: Could extend this to handle other resource types from groups
+    }
+  
+  return result;
+}
+
 - (BOOL) link
 {
   return [self build];

XCode/PBXSourcesBuildPhase.m

@@ -113,32 +113,8 @@ - (BOOL) build
     }
   else
     {
-      // Filter to only include source files (since allFiles might include headers too)
-      NSMutableArray *sourceFiles = [NSMutableArray array];
-      NSEnumerator *allEn = [allFiles objectEnumerator];
-      id file = nil;
-      
-      while ((file = [allEn nextObject]) != nil)
-        {
-          if ([file isKindOfClass: [PBXBuildFile class]])
-            {
-              PBXFileReference *fr = [file fileRef];
-              NSString *name = [fr path];
-              
-              if ([[name pathExtension] isEqualToString: @"m"]
-                  || [[name pathExtension] isEqualToString: @"mm"]
-                  || [[name pathExtension] isEqualToString: @"M"]
-                  || [[name pathExtension] isEqualToString: @"c"]
-                  || [[name pathExtension] isEqualToString: @"cc"]
-                  || [[name pathExtension] isEqualToString: @"C"]
-                  || [[name pathExtension] isEqualToString: @"swift"])
-                {
-                  [sourceFiles addObject: file];
-                }
-            }
-        }
-      
-      files = sourceFiles;
+      // Use all files from groups and regular files
+      files = allFiles;
     }
 
   en = [files objectEnumerator];
@@ -199,6 +175,24 @@ - (BOOL) generate
   return result;
 }
 
+// Override filesFromGroups to only return source files for PBXSourcesBuildPhase
+- (NSArray *) filesFromGroups
+{
+  NSMutableArray *result = [NSMutableArray array];
+  
+  if (_target != nil)
+    {
+      // Only get source files for the sources build phase
+      NSArray *synchronizedSources = [_target synchronizedSources];
+      if (synchronizedSources != nil)
+        {
+          [result addObjectsFromArray: synchronizedSources];
+        }
+    }
+  
+  return result;
+}
+
 - (BOOL) link
 {
   GSXCBuildDatabase *db = [_target database];