Use shared configurations/scripts from xctoolchain.

parse-community · Oct 9, 2015 · 3c99637 · 3c99637
1 parent 6202a29
commit 3c99637
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 571 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1 @@
+Vendor/xctoolchain/.clang-format
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "Vendor/OCMock"]
 	path = Vendor/OCMock
 	url = https://github.com/erikdoe/ocmock.git
+[submodule "Vendor/xctoolchain"]
+	path = Vendor/xctoolchain
+	url = https://github.com/ParsePlatform/xctoolchain.git
diff --git a/Configurations/Shared b/Configurations/Shared
@@ -0,0 +1 @@
+../Vendor/xctoolchain/Configurations/
diff --git a/Configurations/Shared/Common.xcconfig b/Configurations/Shared/Common.xcconfig
diff --git a/Configurations/Shared/Platform/OSX.xcconfig b/Configurations/Shared/Platform/OSX.xcconfig
diff --git a/Configurations/Shared/Platform/iOS.xcconfig b/Configurations/Shared/Platform/iOS.xcconfig
diff --git a/Configurations/Shared/Platform/watchOS.xcconfig b/Configurations/Shared/Platform/watchOS.xcconfig
diff --git a/Configurations/Shared/Product/Application.xcconfig b/Configurations/Shared/Product/Application.xcconfig
diff --git a/Configurations/Shared/Product/Framework.xcconfig b/Configurations/Shared/Product/Framework.xcconfig
diff --git a/Configurations/Shared/Product/UnitTest.xcconfig b/Configurations/Shared/Product/UnitTest.xcconfig
diff --git a/Configurations/Shared/Project/Debug.xcconfig b/Configurations/Shared/Project/Debug.xcconfig
diff --git a/Configurations/Shared/Project/Release.xcconfig b/Configurations/Shared/Project/Release.xcconfig
diff --git a/Configurations/Shared/Warnings.xcconfig b/Configurations/Shared/Warnings.xcconfig
diff --git a/Rakefile b/Rakefile
@@ -7,8 +7,8 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-require_relative 'Scripts/xctask/build_task'
-require_relative 'Scripts/xctask/build_framework_task'
+require_relative 'Vendor/xctoolchain/Scripts/xctask/build_task'
+require_relative 'Vendor/xctoolchain/Scripts/xctask/build_framework_task'
 
 script_folder = File.expand_path(File.dirname(__FILE__))
 build_folder = File.join(script_folder, 'build')