Added support for Xcode 7 beta

zeroc-ice · Aug 19, 2015 · e49a2fe · e49a2fe
1 parent e7b9df8
commit e49a2fe
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 144 deletions.
diff --git a/Classes/Plugin.m b/Classes/Plugin.m
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 
-#define ICE_BUILDER_VERSION "2.0.3"
+#define ICE_BUILDER_VERSION "2.1.0"
 
 @interface IceBuilder : NSObject {
 }

diff --git a/Classes/SliceCompilerSpecification.m b/Classes/SliceCompilerSpecification.m
diff --git a/Headers/Xcode.h b/Headers/Xcode.h
@@ -1297,7 +1297,6 @@
 //        unsigned char markByte;
 //    } _cmnd2009;
 }
-
 - (id)dependencyNode;
 - (BOOL)outputFilesHaveBeenUpdated;
 - (void)unlockInputAndOutputFiles;
@@ -1415,6 +1414,7 @@
 - (id)outputNodes;
 - (void)addInputNode:(id)arg1;
 - (id)inputNodes;
+- (void)setDiscoveredInputNodes:(id)arg1;
 - (void)invalidateConfigurationSignature;
 - (void)invalidateInputSignature;
 - (void)setPhaseNumber:(unsigned long long)arg1;
@@ -1425,6 +1425,7 @@
 - (void)setBuildContext:(id)arg1 commandNumber:(unsigned long long)arg2;
 - (id)_buildStateId;
 - (id)buildContext;
+- (id)macroExpansionScope;
 - (void)detachFromOtherGraphObjects;
 - (void)dealloc;
 - (id)init;

diff --git a/Info.plist b/Info.plist
@@ -22,15 +22,19 @@
 	<string>1.0</string>
 	<key>DVTPlugInCompatibilityUUIDs</key>
 	<array>
-		<string>37B30044-3B14-46BA-ABAA-F01000C27B63</string>
-		<string>A2E4D43F-41F4-4FB9-BB94-7177011C9AED</string>
+		<!-- 6.0 -->
 		<string>C4A681B0-4A26-480E-93EC-1218098B9AA0</string>
+		<!-- 6.2 -->
 		<string>A16FF353-8441-459E-A50C-B071F53F51B7</string>
-		<string>992275C1-432A-4CF7-B659-D84ED6D42D3F</string>
+		<!-- 6.3 -->
 		<string>9F75337B-21B4-4ADC-B558-F9CADF7073A7</string>
+		<!-- 6.3.2 -->
 		<string>E969541F-E6F9-4D25-8158-72DC3545A6C6</string>
 		<string>8DC44374-2B35-4C57-A6FE-2AD66A36AAD9</string>
+		<!-- 6.4 -->
 		<string>7FDF5C7A-131F-4ABB-9EDC-8C5F8F0B8A90</string>
+		<!-- 7.0 beta -->
+		<string>AABB7188-E14E-4433-AD3B-5CD791EAD9A3</string>
 	</array>
 	<key>LoadAtLaunch</key>
 	<string>YES</string>

diff --git a/test/test2/slice/slice.ice b/test/test2/slice/slice.ice
@@ -20,5 +20,4 @@ string s;
 module Ice
 {
 
-
-};
+};
diff --git a/test/test2/slice/slice2.ice b/test/test2/slice/slice2.ice
@@ -1,3 +1,2 @@
-
 // Test includes
 #include <slice/slice.ice>
diff --git a/test/test2/slice/slice3.ice b/test/test2/slice/slice3.ice
@@ -0,0 +1,7 @@
+
+#include <slice/slice2.ice>
+
+
+
+
+
diff --git a/test/tests.xcodeproj/project.pbxproj b/test/tests.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 		14AD82191AC2BEEC00CFBDF9 /* test4.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14AD82181AC2BEEC00CFBDF9 /* test4.mm */; };
 		14AD82201AC2BF3400CFBDF9 /* slice.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14AD821E1AC2BF3400CFBDF9 /* slice.ice */; };
 		14AD82211AC2BF3400CFBDF9 /* slice2.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14AD821F1AC2BF3400CFBDF9 /* slice2.ice */; };
+		14EE1BA31B84E10000D8FCFC /* slice3.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14EE1BA21B84E10000D8FCFC /* slice3.ice */; };
 		D834434B1AE039070018AF18 /* slice1.ice in Sources */ = {isa = PBXBuildFile; fileRef = D834434A1AE039070018AF18 /* slice1.ice */; };
 		D83443521AE03D570018AF18 /* libtestLib.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D83443331AE0387E0018AF18 /* libtestLib.dylib */; };
 /* End PBXBuildFile section */
@@ -42,6 +43,7 @@
 		14AD82181AC2BEEC00CFBDF9 /* test4.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = test4.mm; sourceTree = "<group>"; };
 		14AD821E1AC2BF3400CFBDF9 /* slice.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.slice; path = slice.ice; sourceTree = "<group>"; };
 		14AD821F1AC2BF3400CFBDF9 /* slice2.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.slice; path = slice2.ice; sourceTree = "<group>"; };
+		14EE1BA21B84E10000D8FCFC /* slice3.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.slice; name = slice3.ice; path = slice/slice3.ice; sourceTree = "<group>"; };
 		D83443331AE0387E0018AF18 /* libtestLib.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libtestLib.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		D834434A1AE039070018AF18 /* slice1.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.slice; path = slice1.ice; sourceTree = "<group>"; };
 		D83443511AE03CCC0018AF18 /* generated */ = {isa = PBXFileReference; lastKnownFileType = folder; path = generated; sourceTree = "<group>"; };
@@ -93,6 +95,7 @@
 			children = (
 				14318C011AC2A87800E53118 /* slice.ice */,
 				14318C021AC2A87800E53118 /* slice2.ice */,
+				14EE1BA21B84E10000D8FCFC /* slice3.ice */,
 			);
 			name = slice;
 			sourceTree = "<group>";
@@ -418,6 +421,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				14EE1BA31B84E10000D8FCFC /* slice3.ice in Sources */,
 				14318C041AC2A87800E53118 /* slice2.ice in Sources */,
 				14318C031AC2A87800E53118 /* slice.ice in Sources */,
 				149D6FDD1AC1DB90008A8B56 /* test2.mm in Sources */,
@@ -577,7 +581,7 @@
 		149D6FD01AC1D942008A8B56 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/ObjC/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/ObjC/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -627,7 +631,7 @@
 		149D6FD11AC1D942008A8B56 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/ObjC/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/ObjC/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -671,7 +675,7 @@
 		149D6FDF1AC1DB90008A8B56 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/Cpp/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/Cpp/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -725,7 +729,7 @@
 		149D6FE01AC1DB90008A8B56 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/Cpp/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/Cpp/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -891,7 +895,7 @@
 		D83443451AE0387E0018AF18 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/ObjC/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/ObjC/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -948,7 +952,7 @@
 		D83443461AE0387E0018AF18 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/SDKs/ObjC/$(PLATFORM_NAME).sdk";
+				ADDITIONAL_SDKS = "$(ICE_TOUCH_HOME)/lib/IceTouch/ObjC/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1051,6 +1055,7 @@
 				D83443461AE0387E0018AF18 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,5 +20,4 @@ string s; @@
     module Ice
     {
-    };
+    };