Modernised project for Xcode 4 on OS X 10.7. For some reason the proj…

…ect "Block.h" file is loaded when Foundation.h attempts to import <Block.h>. Hence project "Block.h" was renamed to "Block_fscript.h"
KosmicTask · Jul 25, 2011 · a318d6d · a318d6d
1 parent 25c850c
commit a318d6d
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,10 @@ build/*
 *.pbxuser
 *.mode1v3
 
+# xcode 4 user noise
+*.xcworkspace
+xcuserdata
+
 # old skool
 .svn
 

diff --git a/FScript.xcodeproj/project.pbxproj b/FScript.xcodeproj/project.pbxproj
diff --git a/FScriptFramework/Array.m b/FScriptFramework/Array.m
@@ -2,7 +2,7 @@
 /*   This software is open source. See the license.  */  
 
 #import "build_config.h"
-#import "Array.h"    
+#import "Array_fscript.h"    
 #import "ArrayPrivate.h"
 #import "ArrayRepId.h"
 #import "FScriptFunctions.h"

diff --git a/FScriptFramework/ArrayRepBooleanAltivec.m b/FScriptFramework/ArrayRepBooleanAltivec.m
@@ -9,7 +9,7 @@
 #import "BlockInspector.h"
 #import "string.h"          // memcpy() 
 #import "ArrayPrivate.h"
-#import "Number.h" 
+#import "Number_fscript.h" 
 #import "FScriptFunctions.h"
 #import "FSBooleanPrivate.h"
 #import "ArrayRepId.h"

diff --git a/FScriptFramework/ArrayRepBooleanPacked.m b/FScriptFramework/ArrayRepBooleanPacked.m
@@ -10,7 +10,7 @@
 #import "BlockInspector.h"
 #import "string.h"          // memcpy() 
 #import "ArrayPrivate.h"
-#import "Number.h" 
+#import "Number_fscript.h" 
 #import "FScriptFunctions.h"
 #import "FSBooleanPrivate.h"
 #import "ArrayRepId.h"

diff --git a/FScriptFramework/ArrayRepEmpty.m b/FScriptFramework/ArrayRepEmpty.m
@@ -2,7 +2,7 @@
 /*   This software is open source. See the license.  */  
 
 #import "ArrayRepEmpty.h"
-#import "Number.h"
+#import "Number_fscript.h"
 #import "ArrayRepId.h"
 #import "ArrayRepDouble.h"
 #import "ArrayRepBoolean.h" 

diff --git a/FScriptFramework/Array.h → FScriptFramework/Array_fscript.h b/FScriptFramework/Array.h → FScriptFramework/Array_fscript.h
diff --git a/FScriptFramework/Block.m b/FScriptFramework/Block.m
@@ -3,7 +3,7 @@
 /*   This software is open source. See the license.  */  
 
 #import "build_config.h"
-#import "Block.h"
+#import "Block_fscript.h"
 #import "BlockPrivate.h"
 #import "BlockRep.h"
 #import "FSExecEngine.h"
@@ -15,7 +15,7 @@
 #import "FSBooleanPrivate.h"
 #import "BlockInspector.h"
 #import "FScriptFunctions.h"
-#import "Number.h"
+#import "Number_fscript.h"
 #import "FSVoid.h"
 #import "FSMiscTools.h"
 #import "FSNSString.h"

diff --git a/FScriptFramework/Block.h → FScriptFramework/Block_fscript.h b/FScriptFramework/Block.h → FScriptFramework/Block_fscript.h
diff --git a/FScriptFramework/FSBlock.m b/FScriptFramework/FSBlock.m
@@ -21,7 +21,7 @@
 #import "FSNSString.h"
 #import "FSInterpreterResultPrivate.h"
 #import "FSReturnSignal.h"
-#import "Block.h"
+#import "Block_fscript.h"
 
 void __attribute__ ((constructor)) initializeFSBlock(void) 
 {

diff --git a/FScriptFramework/FSCollectionInspector.m b/FScriptFramework/FSCollectionInspector.m
@@ -10,7 +10,7 @@
 #import "FSArray.h"
 #import "FSNSArray.h"
 //#import "FSObjectFormatter.h"
-#import "Number.h"
+#import "Number_fscript.h"
 #import "FSNSString.h"
 #import "FSCollectionInspectorView.h"
 

diff --git a/FScriptFramework/FSConstantsDictionaryGenerator.m b/FScriptFramework/FSConstantsDictionaryGenerator.m
@@ -62,7 +62,7 @@
 #import <WebKit/WebJavaPlugIn.h>
 #import <XgridFoundation/XgridFoundation.h>
 
-#import "Number.h"
+#import "Number_fscript.h"
 #import "FSBoolean.h"
 
 @implementation FSConstantsDictionaryGenerator

diff --git a/FScriptFramework/FSNSMutableString.m b/FScriptFramework/FSNSMutableString.m
@@ -3,7 +3,7 @@
 
 #import <Foundation/Foundation.h>
 #import "FSNSMutableString.h"
-#import "Number.h"
+#import "Number_fscript.h"
 #import "FScriptFunctions.h"
 #import "FSNSStringPrivate.h"
 

diff --git a/FScriptFramework/FSNSString.m b/FScriptFramework/FSNSString.m
@@ -1,7 +1,7 @@
 /* FSNSString.m Copyright (c) 1998-2009 Philippe Mougin.  */
 /*   This software is open source. See the license.  */  
 
-#import "Number.h" 
+#import "Number_fscript.h" 
 #import "FSNSString.h"
 #import "FSSymbolTable.h"
 #import "FSBlock.h"

diff --git a/FScriptFramework/FSObjectFormatter.m b/FScriptFramework/FSObjectFormatter.m
@@ -5,7 +5,7 @@
 #import "FSObjectFormatter.h"
 #import "FSNSObject.h"
 #import "FSMiscTools.h"
-#import "Number.h"
+#import "Number_fscript.h"
 
 
 @implementation FSObjectFormatter

diff --git a/FScriptFramework/FSSymbolTable.m b/FScriptFramework/FSSymbolTable.m
@@ -3,7 +3,7 @@
 
 
 #import "FSSymbolTable.h"
-#import "Number.h"
+#import "Number_fscript.h"
 #import "FSArray.h"
 #import "FSBoolean.h"
 #import "Space.h"

diff --git a/FScriptFramework/FScript.h b/FScriptFramework/FScript.h
@@ -40,6 +40,6 @@
 #import <FScript/FSSystem.h>
 
 // For backward compatibility with F-Script 1.x
-#import <FScript/Array.h>
-#import <FScript/Block.h>
-#import <FScript/Number.h>
+#import <FScript/Array_fscript.h>
+#import <FScript/Block_fscript.h>
+#import <FScript/Number_fscript.h>
diff --git a/FScriptFramework/Number.m b/FScriptFramework/Number.m
@@ -3,7 +3,7 @@
 
 #import "build_config.h"
 
-#import "Number.h"
+#import "Number_fscript.h"
 #import "NumberPrivate.h"
 #import "FSNSNumber.h"
 #import "FScriptFunctions.h"

diff --git a/FScriptFramework/Number.h → FScriptFramework/Number_fscript.h b/FScriptFramework/Number.h → FScriptFramework/Number_fscript.h