Merge pull request dcariola#5 from beannt/master

Merging from beannt/master: Support more feartures and sample

Author: dcariola

PBXBuildFile.cs

@@ -17,7 +17,7 @@ public PBXBuildFile( PBXFileReference fileRef, bool weak = false ) : base()
 
 			this.Add( FILE_REF_KEY, fileRef.guid );
 			SetWeakLink( weak );
-			
+
 //    def Create(cls, file_ref, weak=False):
 //        if isinstance(file_ref, PBXFileReference):
 //            file_ref = file_ref.id
@@ -49,6 +49,7 @@ public bool SetWeakLink( bool weak = false )
 
 					settings = new PBXDictionary();
 					settings.Add( ATTRIBUTES_KEY, attributes );
+					_data[ SETTINGS_KEY ] = settings;
 				}
 				return true;
 			}

XCBuildConfiguration.cs

@@ -8,8 +8,12 @@ public class XCBuildConfiguration : PBXObject
 		protected const string BUILDSETTINGS_KEY = "buildSettings";
 		protected const string HEADER_SEARCH_PATHS_KEY = "HEADER_SEARCH_PATHS";
 		protected const string LIBRARY_SEARCH_PATHS_KEY = "LIBRARY_SEARCH_PATHS";
+		protected const string FRAMEWORK_SEARCH_PATHS_KEY = "FRAMEWORK_SEARCH_PATHS";
 		protected const string OTHER_C_FLAGS_KEY = "OTHER_CFLAGS";
-		
+		protected const string OTHER_LD_FLAGS_KEY = "OTHER_LDFLAGS";
+		protected const string GCC_ENABLE_CPP_EXCEPTIONS_KEY = "GCC_ENABLE_CPP_EXCEPTIONS";
+		protected const string GCC_ENABLE_OBJC_EXCEPTIONS_KEY = "GCC_ENABLE_OBJC_EXCEPTIONS";
+
 		public XCBuildConfiguration( string guid, PBXDictionary dictionary ) : base( guid, dictionary )
 		{
 
@@ -41,7 +45,7 @@ protected bool AddSearchPaths( PBXList paths, string key, bool recursive = true
 			foreach( string path in paths ) {
 				string currentPath = path;
 				if( recursive && !path.EndsWith( "/**" ) )
-					currentPath += "**";
+					currentPath += "/**";
 
 //				Debug.Log( "adding: " + currentPath );
 				if( !((PBXDictionary)_data[BUILDSETTINGS_KEY]).ContainsKey( key ) ) {
@@ -73,18 +77,23 @@ public bool AddLibrarySearchPaths( PBXList paths, bool recursive = true )
 		{
 			return this.AddSearchPaths( paths, LIBRARY_SEARCH_PATHS_KEY, recursive );
 		}
+
+		public bool AddFrameworkSearchPaths(PBXList paths, bool recursive = true)
+		{
+			return this.AddSearchPaths(paths, FRAMEWORK_SEARCH_PATHS_KEY, recursive);
+		}
 
 		public bool AddOtherCFlags( string flag )
 		{
-			Debug.Log( "INIZIO 1" );
+			//Debug.Log( "INIZIO 1" );
 			PBXList flags = new PBXList();
 			flags.Add( flag );
 			return AddOtherCFlags( flags );
 		}
 
 		public bool AddOtherCFlags( PBXList flags )
 		{
-			Debug.Log( "INIZIO 2" );
+			//Debug.Log( "INIZIO 2" );
 
 			bool modified = false;
 
@@ -110,6 +119,61 @@ public bool AddOtherCFlags( PBXList flags )
 
 			return modified;
 		}
+
+		public bool AddOtherLDFlags( string flag )
+		{
+			//Debug.Log( "INIZIO A" );
+			PBXList flags = new PBXList();
+			flags.Add( flag );
+			return AddOtherLDFlags( flags );
+		}
+
+		public bool AddOtherLDFlags( PBXList flags )
+		{
+			//Debug.Log( "INIZIO B" );
+			
+			bool modified = false;
+			
+			if( !ContainsKey( BUILDSETTINGS_KEY ) )
+				this.Add( BUILDSETTINGS_KEY, new PBXDictionary() );
+			
+			foreach( string flag in flags ) {
+				
+				if( !((PBXDictionary)_data[BUILDSETTINGS_KEY]).ContainsKey( OTHER_LD_FLAGS_KEY ) ) {
+					((PBXDictionary)_data[BUILDSETTINGS_KEY]).Add( OTHER_LD_FLAGS_KEY, new PBXList() );
+				}
+				else if ( ((PBXDictionary)_data[BUILDSETTINGS_KEY])[ OTHER_LD_FLAGS_KEY ] is string ) {
+					string tempString = (string)((PBXDictionary)_data[BUILDSETTINGS_KEY])[OTHER_LD_FLAGS_KEY];
+					((PBXDictionary)_data[BUILDSETTINGS_KEY])[ OTHER_LD_FLAGS_KEY ] = new PBXList();
+					((PBXList)((PBXDictionary)_data[BUILDSETTINGS_KEY])[OTHER_LD_FLAGS_KEY]).Add( tempString );
+				}
+				
+				if( !((PBXList)((PBXDictionary)_data[BUILDSETTINGS_KEY])[OTHER_LD_FLAGS_KEY]).Contains( flag ) ) {
+					((PBXList)((PBXDictionary)_data[BUILDSETTINGS_KEY])[OTHER_LD_FLAGS_KEY]).Add( flag );
+					modified = true;
+				}
+			}
+			
+			return modified;
+		}
+
+		public bool GccEnableCppExceptions (string value)
+		{
+			if (!ContainsKey (BUILDSETTINGS_KEY))
+				this.Add (BUILDSETTINGS_KEY, new PBXDictionary ());
+
+			((PBXDictionary)_data [BUILDSETTINGS_KEY])[GCC_ENABLE_CPP_EXCEPTIONS_KEY] = value;
+			return true;
+		}
+
+		public bool GccEnableObjCExceptions (string value)
+		{
+			if (!ContainsKey (BUILDSETTINGS_KEY))
+				this.Add (BUILDSETTINGS_KEY, new PBXDictionary ());
+
+			((PBXDictionary)_data [BUILDSETTINGS_KEY])[GCC_ENABLE_OBJC_EXCEPTIONS_KEY] = value;
+			return true;
+		}
 
 //	class XCBuildConfiguration(PBXType):
 //    def add_search_paths(self, paths, base, key, recursive=True):

XCMod.cs

@@ -56,6 +56,12 @@ public ArrayList headerpaths {
 				return (ArrayList)_datastore["headerpaths"];
 			}
 		}
+
+		public Hashtable buildSettings {
+			get {
+				return (Hashtable)_datastore["buildSettings"];
+			}
+		}
 
 		public ArrayList files {
 			get {
@@ -86,7 +92,7 @@ public XCMod( string filename )
 			path = System.IO.Path.GetDirectoryName( filename );
 
 			string contents = projectFileInfo.OpenText().ReadToEnd();
-			_datastore = (Hashtable)MiniJSON.jsonDecode( contents );
+			_datastore = (Hashtable)XMiniJSON.jsonDecode( contents );
 
 //			group = (string)_datastore["group"];
 //			patches = (ArrayList)_datastore["patches"];

XCProject.cs

@@ -76,8 +76,13 @@ public XCProject( string filePath ) : this()
 				this.filePath = projects[ 0 ];	
 			}
 
+			// Convert to absolute
+			this.projectRootPath = Path.GetFullPath(this.projectRootPath);
+			
 			projectFileInfo = new FileInfo( Path.Combine( this.filePath, "project.pbxproj" ) );
-			string contents = projectFileInfo.OpenText().ReadToEnd();
+			StreamReader sr = projectFileInfo.OpenText();
+			string contents = sr.ReadToEnd();
+			sr.Close();
 
 			PBXParser parser = new PBXParser();
 			_datastore = parser.Decode( contents );
@@ -239,7 +244,39 @@ public bool AddOtherCFlags( PBXList flags )
 			modified = true;
 			return modified;	
 		}
+
+		public bool AddOtherLDFlags( string flag )
+		{
+			return AddOtherLDFlags( new PBXList( flag ) ); 
+		}
 
+		public bool AddOtherLDFlags( PBXList flags )
+		{
+			foreach( KeyValuePair<string, XCBuildConfiguration> buildConfig in buildConfigurations ) {
+				buildConfig.Value.AddOtherLDFlags( flags );
+			}
+			modified = true;
+			return modified;	
+		}
+
+		public bool GccEnableCppExceptions (string value)
+		{
+			foreach( KeyValuePair<string, XCBuildConfiguration> buildConfig in buildConfigurations ) {
+				buildConfig.Value.GccEnableCppExceptions( value );
+			}
+			modified = true;
+			return modified;	
+		}
+
+		public bool GccEnableObjCExceptions (string value)
+		{
+			foreach( KeyValuePair<string, XCBuildConfiguration> buildConfig in buildConfigurations ) {
+				buildConfig.Value.GccEnableObjCExceptions( value );
+			}
+			modified = true;
+			return modified;
+		}
+
 		public bool AddHeaderSearchPaths( string path )
 		{
 			return AddHeaderSearchPaths( new PBXList( path ) );
@@ -268,6 +305,26 @@ public bool AddLibrarySearchPaths( PBXList paths )
 			modified = true;
 			return modified;
 		}
+
+		public bool AddFrameworkSearchPaths(string path)
+		{
+			return AddFrameworkSearchPaths(new PBXList(path));
+		}
+
+		public bool AddFrameworkSearchPaths(PBXList paths)
+		{
+			foreach (KeyValuePair<string, XCBuildConfiguration> buildConfig in buildConfigurations)
+			{
+				buildConfig.Value.AddFrameworkSearchPaths(paths);
+			}
+			modified = true;
+			return modified;
+		}
+
+		//FRAMEWORK_SEARCH_PATHS = (
+			//		"$(inherited)",
+				//	"\"$(SRCROOT)/../../../../../../../Documents/FacebookSDK\"",
+				//);
 
 
 //		public PBXList GetObjectOfType( string type )
@@ -315,15 +372,15 @@ public PBXDictionary AddFile( string filePath, PBXGroup parent = null, string tr
 //				Debug.Log( "Is rooted: " + absPath );
 			}
 			else if( tree.CompareTo( "SDKROOT" ) != 0) {
-				absPath = Path.Combine( Application.dataPath, filePath );
+				absPath = Path.Combine( Application.dataPath.Replace("Assets", ""), filePath );
 //				Debug.Log( "RElative: " + absPath );
 			}
 
 			if( !( File.Exists( absPath ) || Directory.Exists( absPath ) ) && tree.CompareTo( "SDKROOT" ) != 0 ) {
-				Debug.Log( "Missing file: " + filePath );
+				Debug.Log( "Missing file: " + absPath + " > " + filePath );
 				return results;
 			}
-			else if( tree.CompareTo( "SOURCE_ROOT" ) == 0 ) {
+			else if( tree.CompareTo( "SOURCE_ROOT" ) == 0 || tree.CompareTo( "GROUP" ) == 0 ) {
 				System.Uri fileURI = new System.Uri( absPath );
 				System.Uri rootURI = new System.Uri( ( projectRootPath + "/." ) );
 				filePath = rootURI.MakeRelativeUri( fileURI ).ToString();
@@ -349,7 +406,7 @@ public PBXDictionary AddFile( string filePath, PBXGroup parent = null, string tr
 			parent.AddChild( fileReference );
 			fileReferences.Add( fileReference );
 			results.Add( fileReference.guid, fileReference );
-			
+
 			//Create a build file for reference
 			if( !string.IsNullOrEmpty( fileReference.buildPhase ) && createBuildFiles ) {
 //				PBXDictionary<PBXBuildPhase> currentPhase = GetBuildPhase( fileReference.buildPhase );
@@ -361,9 +418,15 @@ public PBXDictionary AddFile( string filePath, PBXGroup parent = null, string tr
 							buildFiles.Add( buildFile );
 							currentObject.Value.AddBuildFile( buildFile );
 						}
-						if ( !string.IsNullOrEmpty( absPath ) && ( tree.CompareTo( "SOURCE_ROOT" ) == 0 ) && File.Exists( absPath ) ) {
+
+						if ( !string.IsNullOrEmpty( absPath ) && File.Exists(absPath) && tree.CompareTo( "SOURCE_ROOT" ) == 0 ) {
+							//Debug.LogError(absPath);
 							string libraryPath = Path.Combine( "$(SRCROOT)", Path.GetDirectoryName( filePath ) );
-							this.AddLibrarySearchPaths( new PBXList( libraryPath ) ); 
+							this.AddLibrarySearchPaths( new PBXList(libraryPath) );
+						}
+						else if (!string.IsNullOrEmpty( absPath ) && Directory.Exists(absPath) && absPath.EndsWith(".framework") && tree.CompareTo("GROUP") == 0) { // Annt: Add framework search path for FacebookSDK
+							string frameworkPath = Path.Combine( "$(SRCROOT)", Path.GetDirectoryName( filePath ) );
+							this.AddFrameworkSearchPaths(new PBXList(frameworkPath));
 						}
 						break;
 					case "PBXResourcesBuildPhase":
@@ -464,9 +527,10 @@ public bool AddFolder( string folderPath, PBXGroup parent = null, string[] exclu
 			if( !Directory.Exists( folderPath ) )
 				return false;
 			DirectoryInfo sourceDirectoryInfo = new DirectoryInfo( folderPath );
-			
+
 			if( exclude == null )
 				exclude = new string[] {};
+			string regexExclude = string.Format( @"{0}", string.Join( "|", exclude ) );
 
 			PBXDictionary results = new PBXDictionary();
 
@@ -479,6 +543,10 @@ public bool AddFolder( string folderPath, PBXGroup parent = null, string[] exclu
 
 			foreach( string directory in Directory.GetDirectories( folderPath ) )
 			{
+				if( Regex.IsMatch( directory, regexExclude ) ) {
+					continue;
+				}
+
 //				special_folders = ['.bundle', '.framework', '.xcodeproj']	
 				Debug.Log( "DIR: " + directory );
 				if( directory.EndsWith( ".bundle" ) ) {
@@ -494,18 +562,15 @@ public bool AddFolder( string folderPath, PBXGroup parent = null, string[] exclu
 					AddFolder( directory, newGroup, exclude, recursive, createBuildFile );
 				}
 			}
-			
 			// Adding files.
-			string regexExclude = string.Format( @"{0}", string.Join( "|", exclude ) );
 			foreach( string file in Directory.GetFiles( folderPath ) ) {
 				if( Regex.IsMatch( file, regexExclude ) ) {
 					continue;
 				}
-//				Debug.Log( "--> " + file + ", " + newGroup );
+				//Debug.Log( "--> " + file + ", " + newGroup );
 				AddFile( file, newGroup, "SOURCE_ROOT", createBuildFile );
 			}
-			
-			
+
 			modified = true;
 			return modified;
 //		def add_folder(self, os_path, parent=None, excludes=None, recursive=True, create_build_files=True):
@@ -882,7 +947,12 @@ public void ApplyMod( XCMod mod )
 			Debug.Log( "Adding files..." );
 			foreach( string filePath in mod.files ) {
 				string absoluteFilePath = System.IO.Path.Combine( mod.path, filePath );
-				this.AddFile( absoluteFilePath, modGroup );
+
+
+				if( filePath.EndsWith(".framework") )
+					this.AddFile( absoluteFilePath, frameworkGroup, "GROUP", true, false);
+				else
+					this.AddFile( absoluteFilePath, modGroup );
 			}
 
 			Debug.Log( "Adding folders..." );
@@ -896,7 +966,34 @@ public void ApplyMod( XCMod mod )
 				string absoluteHeaderPath = System.IO.Path.Combine( mod.path, headerpath );
 				this.AddHeaderSearchPaths( absoluteHeaderPath );
 			}
-			
+
+			Debug.Log( "Configure build settings..." );
+			Hashtable buildSettings = mod.buildSettings;
+			if( buildSettings.ContainsKey("OTHER_LDFLAGS") )
+			{
+				Debug.Log( "    Adding other linker flags..." );
+				ArrayList otherLinkerFlags = (ArrayList) buildSettings["OTHER_LDFLAGS"];
+				foreach( string linker in otherLinkerFlags ) 
+				{
+					string _linker = linker;
+					if( !_linker.StartsWith("-") )
+						_linker = "-" + _linker;
+					this.AddOtherLDFlags( _linker );
+				}
+			}
+
+			if( buildSettings.ContainsKey("GCC_ENABLE_CPP_EXCEPTIONS") )
+			{
+				Debug.Log( "    GCC_ENABLE_CPP_EXCEPTIONS = " + buildSettings["GCC_ENABLE_CPP_EXCEPTIONS"] );
+				this.GccEnableCppExceptions( (string) buildSettings["GCC_ENABLE_CPP_EXCEPTIONS"] );
+			}
+
+			if( buildSettings.ContainsKey("GCC_ENABLE_OBJC_EXCEPTIONS") )
+			{
+				Debug.Log( "    GCC_ENABLE_OBJC_EXCEPTIONS = " + buildSettings["GCC_ENABLE_OBJC_EXCEPTIONS"] );
+				this.GccEnableObjCExceptions( (string) buildSettings["GCC_ENABLE_OBJC_EXCEPTIONS"] );
+			}
+
 			this.Consolidate();
 		}
 

XCodeEditorMenu.cs

@@ -9,14 +9,14 @@ namespace UnityEditor.XCodeEditor
 	public class XCodeEditorMenu
 	{
 
-		[MenuItem ("Build Tools/XCode Editor/DebugTest %t")]
+		//[MenuItem ("Build Tools/XCode Editor/DebugTest %t")]
 		static void DebugTest()
 		{	
 			string projectPath = Path.Combine( Directory.GetParent( Application.dataPath ).ToString(), "XCode" );
 //			Debug.Log( "XcodePath: " + projectPath );
 
 //			XCProject currentProject = new XCProject( projectPath );
-			XCProject.ApplyMod( projectPath, "/Users/Elyn/Projects/UnityPlugins/Unity Sandbox Project/Assets/Modules/GameCenter/Editor/iOS/GameCenter.projmods" );
+			//XCProject.ApplyMod( projectPath, "/Users/Elyn/Projects/UnityPlugins/Unity Sandbox Project/Assets/Modules/GameCenter/Editor/iOS/GameCenter.projmods" );
 
 			//Debug.Log(
 //			PBXDictionary test = new PBXDictionary();
@@ -62,7 +62,7 @@ static void DebugTest()
 		}
 
 
-		[MenuItem ("Build Tools/XCode Editor/DebugTest2 %y")]
+		//[MenuItem ("Build Tools/XCode Editor/DebugTest2 %y")]
 		static void DebugTest2()
 		{
 			string path1 = "/Users/Elyn/Projects/UnityPlugins/Unity Sandbox Project/Assets/Modules/GameCenter/Editor/iOS/GameCenterManager.m";