Update headers, fix main

gnustep · Sep 15, 2024 · 612745e · 612745e
1 parent e6a6672
commit 612745e
Show file tree

Hide file tree

Showing 13 changed files with 354 additions and 9 deletions.
diff --git a/Tools/pc2xc/main.m b/Tools/pc2xc/main.m
@@ -11,6 +11,93 @@
 #import <XCode/XCode.h>
 #import <XCode/xcsystem.h>
 
+NSMutableArray *buildFileReferences(NSArray *allFiles,
+				    NSString *ext)
+{
+  NSMutableArray *result = [NSMutableArray array];
+  NSEnumerator *en = [allFiles objectEnumerator];
+  NSString *filename = nil;
+
+  while ((filename = [en nextObject]) != nil)
+    {
+      if (ext != nil)
+	{
+	  filename = [filename stringByAppendingPathExtension: ext];
+	}
+
+      PBXFileReference *fileRef = AUTORELEASE([[PBXFileReference alloc] initWithPath: filename]);
+      [result addObject: fileRef];      
+    }
+
+  return result;
+}
+
+NSString *typeForProjectType(NSString *projectType)
+{
+  NSString *result = @"";
+
+  if ([projectType isEqualToString: @"Application"])
+    {
+      result = @"com.apple.product-type.application";
+    }
+  else if ([projectType isEqualToString: @"Tool"])
+    {
+      result = @"com.apple.product-type.tool";
+    }
+  else if ([projectType isEqualToString: @"Library"])
+    {
+      result = @"com.apple.product-type.library";
+    }
+  else if ([projectType isEqualToString: @"Framework"])
+    {
+      result = @"com.apple.product-type.framework";
+    }
+
+  return result;
+}
+
+PBXGroup *productReferenceGroup(NSString *projectName,
+				NSString *projectType)
+{
+  PBXGroup *group = AUTORELEASE([[PBXGroup alloc] init]);
+  NSString *type = typeForProjectType(projectType);
+  NSString *ext = [PBXFileReference extForFileType: type];
+  NSString *path = [projectName stringByAppendingPathExtension: ext];
+  PBXFileReference *productFileRef = AUTORELEASE([[PBXFileReference alloc] initWithPath: path]);
+  NSMutableArray *children = [NSMutableArray arrayWithObject: productFileRef];
+
+  [group setChildren: children];
+  [group setName: @"Products"];
+
+  return group;
+}
+
+PBXGroup *mainGroupBuild(NSArray *files, PBXGroup *productReferenceGroup)
+{
+  PBXGroup *mainGroup = AUTORELEASE([[PBXGroup alloc] init]);
+  NSMutableArray *buildGroupFiles = buildFileReferences(files, nil);
+  PBXGroup *buildFileGroup = AUTORELEASE([[PBXGroup alloc] init]);
+  [buildFileGroup setChildren: buildGroupFiles];
+
+  NSMutableArray *mainGroupChildren = [NSMutableArray arrayWithObjects: buildFileGroup,
+						      productReferenceGroup, nil];
+  [mainGroup setChildren: mainGroupChildren];
+
+  return mainGroup;
+}
+
+NSMutableArray *buildTargets(NSString *projectName,
+			     NSString *projectType,
+			     NSArray *files,
+			     NSArray *headers,
+			     NSArray *resources,
+			     NSArray *frameworks)
+{
+  NSMutableArray *result = [NSMutableArray array];
+  return result;
+}
+
+
 PBXContainer *buildContainer(NSString *projectName,
 			     NSString *projectType,
 			     NSArray *files,
@@ -19,8 +106,29 @@
 			     NSArray *other,
 			     NSArray *frameworks)
 {
-  PBXContainer *container = [[PBXContainer alloc] init];
+  NSMutableArray *allFiles = [NSMutableArray arrayWithArray: files];
+  PBXProject *project = AUTORELEASE([[PBXProject alloc] init]);
+  PBXContainer *container = AUTORELEASE([[PBXContainer alloc] initWithRootObject: project]);
+  XCBuildConfiguration *buildConfigDebug = AUTORELEASE([[XCBuildConfiguration alloc] init]);
+  XCBuildConfiguration *buildConfigRelease = AUTORELEASE([[XCBuildConfiguration alloc] initWithName: @"Release"]);
+  NSMutableArray *configArray = [NSMutableArray arrayWithObjects: buildConfigDebug, buildConfigRelease, nil];
+  XCConfigurationList *configList = AUTORELEASE([[XCConfigurationList alloc] initWithConfigurations: configArray]);
+  [allFiles addObject: other];
+
+  // Set up groups...
+  PBXGroup *productRefGroup = productReferenceGroup(projectName, projectType); // AUTORELEASE([[PBXGroup alloc] init]);
+  PBXGroup *mainGroup = mainGroupBuild(allFiles, productRefGroup); // AUTORELEASE([[PBXGroup alloc] init]);
+  NSMutableArray *targets = buildTargets(projectName, projectType, allFiles, headers, resources, frameworks);
+
+  [project setMainGroup: mainGroup];
+  [project setProductRefGroup: productRefGroup];
+  [project setBuildConfigurationList: configList];
+  [project setContainer: container];
+  [project setTargets: targets];
+
   NSLog(@"files = %@", files);
+  NSLog(@"container = %@", container);
+
   return container;
 }
 

diff --git a/XCode/PBXBuildPhase.h b/XCode/PBXBuildPhase.h
@@ -22,6 +22,9 @@
    Boston, MA 02110 USA.
 */
 
+#ifndef __PBXBuildPhase_h_GNUSTEP_INCLUDE
+#define __PBXBuildPhase_h_GNUSTEP_INCLUDE
+
 #import <Foundation/Foundation.h>
 
 // Local includes
@@ -38,6 +41,12 @@
   NSString *_name;
 }
 
+- (instancetype) initWithFiles: (NSMutableArray *)files
+	       buildActionMask: (NSString *)buildActionMask
+	  runOnlyForDeployment: (NSString *)runOnlyForDeployment
+			target: (PBXNativeTarget *)target
+                          name: (NSString *)name;
+
 // Methods....
 - (NSMutableArray *) files; // getter
 - (void) setFiles: (NSMutableArray *)object; // setter
@@ -63,3 +72,5 @@
 - (BOOL) link;
 
 @end
+
+#endif
diff --git a/XCode/PBXBuildPhase.m b/XCode/PBXBuildPhase.m
@@ -27,6 +27,24 @@
 
 @implementation PBXBuildPhase
 
+- (instancetype) initWithFiles: (NSMutableArray *)files
+	       buildActionMask: (NSString *)buildActionMask
+	  runOnlyForDeployment: (NSString *)runOnlyForDeployment
+			target: (PBXNativeTarget *)target
+			  name: (NSString *)name
+{
+  self = [super init];
+  if (self != nil)
+    {
+      [self setFiles: files];
+      [self setBuildActionMask: buildActionMask];
+      [self setRunOnlyForDeploymentPostprocessing: runOnlyForDeployment];
+      [self setTarget: target];
+      [self setName: name];
+    }
+  return self;
+}
+
 - (void) dealloc
 {
   RELEASE(_files);

diff --git a/XCode/PBXContainer.h b/XCode/PBXContainer.h
@@ -43,6 +43,8 @@
   NSString *_workspaceIncludes;
 }
 
+- (instancetype) initWithRootObject: (id)object;
+
 - (void) setWorkspaceIncludes: (NSString *)i;
 - (NSString *) workspaceIncludes;
 

diff --git a/XCode/PBXContainer.m b/XCode/PBXContainer.m
@@ -50,6 +50,16 @@ - (instancetype) init
   return self;
 }
 
+- (instancetype) initWithRootObject: (id)object
+{
+  self = [self init];
+  if (self != nil)
+    {
+      [self setRootObject: object];
+    }
+  return self;
+}
+
 - (void) dealloc
 {
   RELEASE(_archiveVersion);

diff --git a/XCode/PBXFileReference.h b/XCode/PBXFileReference.h
@@ -22,6 +22,9 @@
    Boston, MA 02110 USA.
 */
 
+#ifndef __PBXFileReference_h_GNUSTEP_INCLUDE
+#define __PBXFileReference_h_GNUSTEP_INCLUDE
+
 #import <Foundation/Foundation.h>
 
 // Local includes
@@ -52,6 +55,10 @@
   NSUInteger _currentFile;
 }
 
++ (NSString *) fileTypeFromPath: (NSString *)path;
++ (NSString *) extForFileType: (NSString *)type;
+- (instancetype) initWithPath: (NSString *)path;
+
 - (void) setTotalFiles: (NSUInteger)t;
 - (void) setCurrentFile: (NSUInteger)n;
 
@@ -84,3 +91,5 @@
 - (BOOL) generate;
 
 @end
+
+#endif
diff --git a/XCode/PBXFileReference.m b/XCode/PBXFileReference.m
@@ -45,6 +45,108 @@ + (void) initialize
   lock = [[NSLock alloc] init];
 }
 
++ (NSString *) fileTypeFromPath: (NSString *)path
+{
+  NSString *result = @"compiled.mach-o.executable";
+  NSString *ext = [path pathExtension];
+
+  if ([ext isEqualToString: @"m"])
+    {
+      result = @"sourcecode.c.objc";
+    }
+  else if ([ext isEqualToString: @"c"])
+    {
+      result = @"sourcecode.c.c";
+    }
+  else if ([ext isEqualToString: @"cc"]
+	   || [ext isEqualToString: @"cpp"]
+	   || [ext isEqualToString: @"C"]
+	   || [ext isEqualToString: @"cxx"])
+    {
+      result = @"sourcecode.cpp.cpp";
+    }
+  else if ([ext isEqualToString: @"mm"])
+    {
+      result = @"sourcecode.cpp.objcpp";
+    }
+  else if ([ext isEqualToString: @"lex.yy"])
+    {
+      result = @"sourcecode.lex";
+    }
+  else if ([ext isEqualToString: @"yy.tab"])
+    {
+      result = @"sourcecode.yacc";
+    }
+  else if ([ext isEqualToString: @"app"])
+    {
+      result = @"wrapper.application";
+    }
+
+  return result;
+}
+
++ (NSString *) extForFileType: (NSString *)type
+{
+  NSString *result = @"";
+
+  if ([type isEqualToString: @"sourcecode.c.objc"])
+    {
+      result = @"m";
+    }
+  else if ([type isEqualToString: @"sourcecode.c.c"])
+    {
+      result = @"c";
+    }
+  else if ([type isEqualToString: @"sourcecode.cpp.cpp"])
+    {
+      result = @"cc";
+    }
+  else if ([type isEqualToString: @"sourcecode.cpp.objcpp"])
+    {
+      result = @"mm";
+    }
+  else if ([type isEqualToString: @"sourcecode.lex"])
+    {
+      result = @"lex.yy";
+    }
+  else if ([type isEqualToString: @"sourcecode.yacc"])
+    {
+      result = @"yy.tab";
+    }
+  else if ([type isEqualToString: @"wrapper.application"])
+    {
+      result = @"app";
+    }
+
+  return result;
+}
+
+- (instancetype) initWithPath: (NSString *)path
+{
+  self = [super init];
+  if (self != nil)
+    {
+      NSString *fileType = [PBXFileReference fileTypeFromPath: path];
+
+      if ([fileType isEqualToString: @"compiled.mach-o.executable"])
+	{
+	  [self setIncludeInIndex: @"0"];
+	}
+
+      if ([fileType isEqualToString: @"wrapper.application"])
+	{
+	  [self setExplicitFileType: fileType];
+	}
+      else
+	{
+      	  [self setLastKnownFileType: fileType];
+	}
+
+      [self setSourceTree: @"<group>"];
+    }
+  return self;
+}
+
 - (void) dealloc
 {
   RELEASE(_sourceTree);