appsquickly · Macaplix · Mar 13, 2022 · Mar 13, 2022 · Mar 14, 2022 · Mar 15, 2022
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ xcuserdata
 .DS_Store
 build
 .build
+
diff --git a/Doxyfile b/Doxyfile
diff --git a/Source/Include/XCBuildFile.h b/Source/Include/XCBuildFile.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "XcodeMemberType.h"
+#import <XcodeEditor/XcodeMemberType.h>
 
 @protocol XCBuildFile <NSObject>
 

diff --git a/Source/Include/XCBuildShellScript.h b/Source/Include/XCBuildShellScript.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "XcodeGroupMember.h"
-#import "XcodeSourceFileType.h"
+#import <XcodeEditor/XcodeGroupMember.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
 
 @class XCProject;
 

diff --git a/Source/Include/XCBuildShellScriptDefinition.h b/Source/Include/XCBuildShellScriptDefinition.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
 
 @interface XCBuildShellScriptDefinition : XCAbstractDefinition
 {

diff --git a/Source/Include/XCClassDefinition.h b/Source/Include/XCClassDefinition.h
@@ -11,7 +11,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
 
 typedef enum
 {

diff --git a/Source/Include/XCFrameworkDefinition.h b/Source/Include/XCFrameworkDefinition.h
@@ -12,8 +12,8 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
-#import "XcodeSourceTreeType.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
+#import <XcodeEditor/XcodeSourceTreeType.h>
 
 @interface XCFrameworkDefinition : XCAbstractDefinition
 {
@@ -37,4 +37,4 @@
 
 
 
-@end
+@end
diff --git a/Source/Include/XCGroup.h b/Source/Include/XCGroup.h
@@ -11,9 +11,9 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XcodeGroupMember.h"
-#import "XcodeSourceFileType.h"
-#import "XCBuildFile.h"
+#import <XcodeEditor/XcodeGroupMember.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
+#import <XcodeEditor/XCBuildFile.h>
 
 @class XCProject;
 @class XCClassDefinition;

diff --git a/Source/Include/XCProject+SubProject.h b/Source/Include/XCProject+SubProject.h
@@ -12,7 +12,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCProject.h"
+#import <XcodeEditor/XCProject.h>
 
 @interface XCProject (SubProject)
 
@@ -40,4 +40,4 @@
 
 - (NSString *)productsGroupKeyForKey:(NSString *)key;
 
-@end
+@end
diff --git a/Source/Include/XCProject.h b/Source/Include/XCProject.h
@@ -10,9 +10,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #import <Foundation/Foundation.h>
-#import "XcodeMemberType.h"
-#import "XcodeSourceFileType.h"
-#import "XcodeGroupMember.h"
+#import <XcodeEditor/XcodeMemberType.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
+#import <XcodeEditor/XcodeGroupMember.h>
 
 @class XCClassDefinition;
 @class XCGroup;

diff --git a/Source/Include/XCSourceFile.h b/Source/Include/XCSourceFile.h
@@ -12,9 +12,9 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XcodeGroupMember.h"
-#import "XcodeSourceFileType.h"
-#import "XCBuildFile.h"
+#import <XcodeEditor/XcodeGroupMember.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
+#import <XcodeEditor/XCBuildFile.h>
 
 @class XCProject;
 

diff --git a/Source/Include/XCSourceFileDefinition.h b/Source/Include/XCSourceFileDefinition.h
@@ -12,8 +12,8 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
-#import "XcodeSourceFileType.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
 
 @interface XCSourceFileDefinition : XCAbstractDefinition
 {

diff --git a/Source/Include/XCSubProjectDefinition.h b/Source/Include/XCSubProjectDefinition.h
@@ -12,8 +12,8 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
-#import "XcodeSourceFileType.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
+#import <XcodeEditor/XcodeSourceFileType.h>
 
 @class XCProject;
 

diff --git a/Source/Include/XCVersionGroup.h b/Source/Include/XCVersionGroup.h
@@ -7,9 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "XcodeGroupMember.h"
-#import "XCGroup.h"
-#import "XCBuildFile.h"
+#import <XcodeEditor/XcodeGroupMember.h>
+#import <XcodeEditor/XCGroup.h>
+#import <XcodeEditor/XCBuildFile.h>
 
 @class XCProject;
 @class XCClassDefinition;

diff --git a/Source/Include/XCXibDefinition.h b/Source/Include/XCXibDefinition.h
@@ -12,7 +12,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import "XCAbstractDefinition.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
 
 
 @interface XCXibDefinition : XCAbstractDefinition

diff --git a/Source/Include/XcodeEditor.h b/Source/Include/XcodeEditor.h
@@ -20,20 +20,20 @@ FOUNDATION_EXPORT const unsigned char XcodeEditorVersionString[];
 // In this header, you should import all the public headers of your framework using statements like #import <XcodeEditor/PublicHeader.h>
 
 
-#import "XCAbstractDefinition.h"
-#import "XCGroup.h"
-#import "XCClassDefinition.h"
-#import "XCFileOperationQueue.h"
-#import "XCFrameworkDefinition.h"
-#import "XCProject.h"
-#import "XCSourceFile.h"
-#import "XCSourceFileDefinition.h"
-#import "XCSubProjectDefinition.h"
-#import "XCTarget.h"
-#import "XCXibDefinition.h"
-#import "XCKeyBuilder.h"
-#import "XCProject+SubProject.h"
-#import "XCProjectBuildConfig.h"
-#import "XCBuildShellScript.h"
-#import "XCBuildShellScriptDefinition.h"
-#import "XCVersionGroup.h"
+#import <XcodeEditor/XCAbstractDefinition.h>
+#import <XcodeEditor/XCGroup.h>
+#import <XcodeEditor/XCClassDefinition.h>
+#import <XcodeEditor/XCFileOperationQueue.h>
+#import <XcodeEditor/XCFrameworkDefinition.h>
+#import <XcodeEditor/XCProject.h>
+#import <XcodeEditor/XCSourceFile.h>
+#import <XcodeEditor/XCSourceFileDefinition.h>
+#import <XcodeEditor/XCSubProjectDefinition.h>
+#import <XcodeEditor/XCTarget.h>
+#import <XcodeEditor/XCXibDefinition.h>
+#import <XcodeEditor/XCKeyBuilder.h>
+#import <XcodeEditor/XCProject+SubProject.h>
+#import <XcodeEditor/XCProjectBuildConfig.h>
+#import <XcodeEditor/XCBuildShellScript.h>
+#import <XcodeEditor/XCBuildShellScriptDefinition.h>
+#import <XcodeEditor/XCVersionGroup.h>
diff --git a/Source/Include/XcodeGroupMember.h b/Source/Include/XcodeGroupMember.h
@@ -11,7 +11,7 @@
 
 
 
-#import "XcodeMemberType.h"
+#import <XcodeEditor/XcodeMemberType.h>
 
 @protocol XcodeGroupMember <NSObject>
 
@@ -25,4 +25,4 @@
 * Group members can either be other groups (PBXGroup) or source files (PBXFileReference).
 */
 - (XcodeMemberType)groupMemberType;
-@end
+@end
diff --git a/Source/Resources/XcodeEditor-Prefix.pch b/Source/Resources/XcodeEditor-Prefix.pch
@@ -6,8 +6,9 @@
 
 #import <Foundation/Foundation.h>
 
+#ifndef DEBUG
+#define DEBUG 0
 #endif
 
-#if !DEBUG
-#define NSLog(...)
 #endif
+
diff --git a/Source/Utils/XCKeyBuilder.m b/Source/Utils/XCKeyBuilder.m
@@ -45,7 +45,8 @@ - (id)initHashValueMD5HashWithBytes:(const void*)bytes length:(NSUInteger)length
     self = [super init];
     if (self != nil)
     {
-        CC_MD5(bytes, (int) length, _value);
+       // CC_MD5(bytes, (int) length, _value);
+        CC_SHA256(bytes, ( CC_LONG )length, _value);
     }
     return self;
 }

diff --git a/Source/XCFileOperationQueue.m b/Source/XCFileOperationQueue.m
@@ -12,6 +12,7 @@
 
 
 #import "XCFileOperationQueue.h"
+#import "XcodeEditor-Prefix.pch"
 
 @interface XCFileOperationQueue ()
 
@@ -81,7 +82,7 @@ - (void)queueFrameworkWithFilePath:(NSString*)filePath inDirectory:(NSString*)di
 
 - (void)queueDeletion:(NSString*)filePath
 {
-    NSLog(@"Queue deletion at: %@", filePath);
+    if ( DEBUG ) printf("Queue deletion at: %s\n", filePath.UTF8String);
     [_filesToDelete addObject:filePath];
 }
 
@@ -125,7 +126,7 @@ - (void)performCopyFrameworks
     [_frameworksToCopy enumerateKeysAndObjectsUsingBlock:^(NSURL* destinationUrl, NSURL* frameworkPath, BOOL* stop)
     {
 
-        NSLog(@"$$$$$$$$$$$$$$ destination url: %@", destinationUrl);
+        if ( DEBUG ) printf("$$$$$$$$$$$$$$ destination url: %s\n", destinationUrl.fileSystemRepresentation);
         NSFileManager* fileManager = [NSFileManager defaultManager];
 
         if ([fileManager fileExistsAtPath:[destinationUrl path]])
@@ -150,12 +151,12 @@ - (void)performFileDeletions
 
         if (![[NSFileManager defaultManager] removeItemAtPath:fullPath error:&error])
         {
-            NSLog(@"failed to remove item at path; error == %@", error);
+            fprintf(stderr, "failed to remove item at path; error == %s\n", error.description.UTF8String);
             [NSException raise:NSInternalInconsistencyException format:@"Error deleting file at filePath: %@", filePath];
         }
         else
         {
-            NSLog(@"Deleted: %@", fullPath);
+            if ( DEBUG ) printf("Deleted: %s\n", fullPath.UTF8String);
         }
     }
     [_filesToDelete removeAllObjects];
@@ -177,4 +178,4 @@ - (void)performCreateDirectories
 }
 
 
-@end
+@end
diff --git a/Source/XCGroup.m b/Source/XCGroup.m
@@ -25,6 +25,7 @@
 #import "XCProject+SubProject.h"
 #import "XcodeMemberType.h"
 #import "XCVersionGroup.h"
+#import "XcodeEditor-Prefix.pch"
 
 @implementation XCGroup
 
@@ -96,17 +97,16 @@ - (void)removeFromParentDeletingChildren:(BOOL)deleteChildren
         [_fileOperationQueue queueDeletion:[self pathRelativeToProjectRoot]];
     }
     NSDictionary *dictionary = [_project objects][_key];
-    NSLog(@"Here's the dictionary: %@", dictionary);
+    if (( dictionary ) && ( DEBUG )) printf("%s Dictionary: %s\n", __func__, dictionary.description.UTF8String ); else if ( DEBUG ) printf("%s No Dictionary\n", __func__);
 
     [[_project objects] removeObjectForKey:_key];
 
     dictionary = [_project objects][_key];
-    NSLog(@"Here's the dictionary: %@", dictionary);
-
+    if (( dictionary ) && ( DEBUG )) printf("%s Dictionary: %s\n", __func__, dictionary.description.UTF8String ); else if ( DEBUG ) printf("%s No Dictionary\n", __func__ );
     for (XCTarget *target in [_project targets]) {
         [target removeMembersWithKeys:[self recursiveMembers]];
     }
-    NSLog(@"Done!!!");
+    if ( DEBUG ) puts("group removed");
 }
 
 - (XCGroup *)parentGroup
@@ -179,9 +179,10 @@ - (void)removeHeader:(XCClassDefinition*)classDefinition {
 
 - (void)addFramework:(XCFrameworkDefinition *)frameworkDefinition
 {
-    if (([self memberWithDisplayName:[frameworkDefinition fileName]]) == nil) {
-        NSLog(@"frame doesnt exists. creating %@", [frameworkDefinition fileName]);
-        NSLog(@"existing members: %@", [self members]);
+    if (([self memberWithDisplayName:[frameworkDefinition fileName]]) == nil)
+    {
+        if ( DEBUG ) printf("frame doesnt exists. creating %s\n", [frameworkDefinition fileName].UTF8String);
+        if ( DEBUG ) printf("existing members: %s\n", [self members].description.UTF8String );
         NSDictionary *fileReference;
         if ([frameworkDefinition copyToDestination]) {
             fileReference = [self makeFileReferenceWithPath:[frameworkDefinition fileName] name:nil type:Framework

diff --git a/Source/XCProject.m b/Source/XCProject.m
@@ -17,6 +17,7 @@
 #import "XCFileOperationQueue.h"
 #import "XCProjectBuildConfig.h"
 #import "XCVersionGroup.h"
+#import "XcodeEditor-Prefix.pch"
 
 NSString *const XCProjectNotFoundException;
 
@@ -436,8 +437,7 @@ - (void)save
 
     // Don't forget to reset the cache so that we'll always get the latest data.
     [self dropCache];
-
-    NSLog(@"Saved project");
+    if ( DEBUG ) printf("Project %s saved\n", _filePath.lastPathComponent.UTF8String);
 }
 
 - (NSMutableDictionary *)objects

diff --git a/Source/XCProjectBuildConfig.m b/Source/XCProjectBuildConfig.m
@@ -67,7 +67,7 @@ + (NSDictionary*)buildConfigurationsFromArray:(NSArray*)array inProject:(XCProje
 
                 if (![[NSFileManager defaultManager] fileExistsAtPath:path])
                 {
-                    NSLog(@"XCConfig not found. Unable to find XCConfig file at %@", path);
+                    fprintf(stderr, "XCConfig not found. Unable to find XCConfig file at %s\n", path.UTF8String);
                 }
 
             }

diff --git a/Source/XCVersionGroup.m b/Source/XCVersionGroup.m
@@ -14,6 +14,7 @@
 #import "XCKeyBuilder.h"
 #import "XCSourceFileDefinition.h"
 #import "XCProject+SubProject.h"
+#import "XcodeEditor-Prefix.pch"
 
 @implementation XCVersionGroup
 
@@ -69,20 +70,21 @@ - (void)removeFromParentDeletingChildren:(BOOL)deleteChildren
         [_fileOperationQueue queueDeletion:[self pathRelativeToProjectRoot]];
     }
     NSDictionary* dictionary = [_project objects][_key];
-    NSLog(@"Here's the dictionary: %@", dictionary);
-    
+    if (( dictionary ) &&( DEBUG )) printf("Dictionary: %s\n", dictionary.description.UTF8String ); else if ( DEBUG ) printf("No Dictionary\n");
+
     [[_project objects] removeObjectForKey:_key];
 
     dictionary = [_project objects][_key];
-    NSLog(@"Here's the dictionary: %@", dictionary);
-
+    if ( DEBUG ) printf("%s",__func__);
+    if (( dictionary ) && ( DEBUG )) printf("Dictionary: %s\n", dictionary.description.UTF8String ); else if ( DEBUG ) printf("No Dictionary\n");
+
     for (XCTarget* target in [_project targets])
     {
         for (XCSourceFile *source in [self members]) {
             [target removeMemberWithKey:source.key];
         }
     }
-    NSLog(@"Done!!!");
+    if ( DEBUG ) puts("group removed");
 }
 
 - (XCGroup*)parentGroup