- Able to edit build settings

Author: beannt

XCBuildConfiguration.cs

@@ -11,6 +11,8 @@ public class XCBuildConfiguration : PBXObject
 		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 )
 		{
@@ -83,15 +85,15 @@ public bool AddFrameworkSearchPaths(PBXList paths, bool recursive = true)
 
 		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;
 
@@ -120,15 +122,15 @@ public bool AddOtherCFlags( PBXList flags )
 
 		public bool AddOtherLDFlags( string flag )
 		{
-			Debug.Log( "INIZIO A" );
+			//Debug.Log( "INIZIO A" );
 			PBXList flags = new PBXList();
 			flags.Add( flag );
 			return AddOtherLDFlags( flags );
 		}
 
 		public bool AddOtherLDFlags( PBXList flags )
 		{
-			Debug.Log( "INIZIO B" );
+			//Debug.Log( "INIZIO B" );
 
 			bool modified = false;
 
@@ -154,6 +156,24 @@ public bool AddOtherLDFlags( PBXList flags )
 
 			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

@@ -57,9 +57,9 @@ public ArrayList headerpaths {
 			}
 		}
 
-		public ArrayList linkers {
+		public Hashtable buildSettings {
 			get {
-				return (ArrayList)_datastore["linkers"];
+				return (Hashtable)_datastore["buildSettings"];
 			}
 		}
 
@@ -92,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

@@ -258,7 +258,25 @@ public bool AddOtherLDFlags( PBXList 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 ) );
@@ -354,12 +372,12 @@ 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 || tree.CompareTo( "GROUP" ) == 0 ) {
@@ -402,7 +420,7 @@ public PBXDictionary AddFile( string filePath, PBXGroup parent = null, string tr
 						}
 
 						if ( !string.IsNullOrEmpty( absPath ) && File.Exists(absPath) && tree.CompareTo( "SOURCE_ROOT" ) == 0 ) {
-							Debug.LogError(absPath);
+							//Debug.LogError(absPath);
 							string libraryPath = Path.Combine( "$(SRCROOT)", Path.GetDirectoryName( filePath ) );
 							this.AddLibrarySearchPaths( new PBXList(libraryPath) );
 						}
@@ -509,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();
 
@@ -524,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" ) ) {
@@ -539,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):
@@ -947,14 +967,33 @@ public void ApplyMod( XCMod mod )
 				this.AddHeaderSearchPaths( absoluteHeaderPath );
 			}
 
-			Debug.Log( "Adding other linker flags..." );
-			foreach( string linker in mod.linkers ) {
-				string _linker = linker;
-				if( !_linker.StartsWith("-") )
-					_linker = "-" + _linker;
-				this.AddOtherLDFlags( _linker );
+			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();
 		}