Commit 57c3e267 authored by Eloy Duran's avatar Eloy Duran

Stash work on getting examples to build.

parent adb89ec5
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Pods/Pods.xcodeproj'/><FileRef location='group:AFNetworking Mac Example.xcodeproj'/></Workspace>
<Workspace \ No newline at end of file
version = "1.0">
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
<FileRef
location = "group:AFNetworking Mac Example.xcodeproj">
</FileRef>
</Workspace>
...@@ -2,7 +2,7 @@ PODS: ...@@ -2,7 +2,7 @@ PODS:
- AFNetworking (0.7.0): - AFNetworking (0.7.0):
- JSONKit - JSONKit
- FormatterKit (0.7.0) - FormatterKit (0.7.0)
- JSONKit (1.4) - JSONKit (1.5pre)
DEPENDENCIES: DEPENDENCIES:
- AFNetworking (~> 0.7.0) - AFNetworking (~> 0.7.0)
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:AFNetworking iOS Example.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
<Workspace \ No newline at end of file
version = "1.0">
<FileRef
location = "group:AFNetworking iOS Example.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
...@@ -2,7 +2,7 @@ PODS: ...@@ -2,7 +2,7 @@ PODS:
- AFNetworking (0.7.0): - AFNetworking (0.7.0):
- JSONKit - JSONKit
- FormatterKit (0.7.0) - FormatterKit (0.7.0)
- JSONKit (1.4) - JSONKit (1.5pre)
DEPENDENCIES: DEPENDENCIES:
- AFNetworking (~> 0.7.0) - AFNetworking (~> 0.7.0)
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Pods/Pods.xcodeproj'/><FileRef location='group:MGSplitView.xcodeproj'/></Workspace>
<Workspace \ No newline at end of file
version = "1.0">
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
<FileRef
location = "group:MGSplitView.xcodeproj">
</FileRef>
</Workspace>
...@@ -20,19 +20,21 @@ ...@@ -20,19 +20,21 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1D088A498E1E4E6A93B7BED4 /* libPods-debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-debug.a"; sourceTree = BUILT_PRODUCTS_DIR; };
51657568144AFA12002A4EFA /* MacRubySample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacRubySample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 51657568144AFA12002A4EFA /* MacRubySample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacRubySample.app; sourceTree = BUILT_PRODUCTS_DIR; };
5165756C144AFA12002A4EFA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 5165756C144AFA12002A4EFA /* Cocoa.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
5165756E144AFA12002A4EFA /* MacRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacRuby.framework; path = Library/Frameworks/MacRuby.framework; sourceTree = DEVELOPER_DIR; }; 5165756E144AFA12002A4EFA /* MacRuby.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = MacRuby.framework; path = Library/Frameworks/MacRuby.framework; sourceTree = DEVELOPER_DIR; };
51657575144AFA12002A4EFA /* MacRubySample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MacRubySample-Info.plist"; sourceTree = "<group>"; }; 51657575144AFA12002A4EFA /* MacRubySample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MacRubySample-Info.plist"; sourceTree = "<group>"; };
51657577144AFA12002A4EFA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 51657577144AFA12002A4EFA /* en */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
51657579144AFA12002A4EFA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 51657579144AFA12002A4EFA /* main.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5165757B144AFA12002A4EFA /* MacRubySample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MacRubySample-Prefix.pch"; sourceTree = "<group>"; }; 5165757B144AFA12002A4EFA /* MacRubySample-Prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MacRubySample-Prefix.pch"; sourceTree = "<group>"; };
5165757E144AFA12002A4EFA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; }; 5165757E144AFA12002A4EFA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
51657581144AFA12002A4EFA /* rb_main.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = rb_main.rb; sourceTree = "<group>"; }; 51657581144AFA12002A4EFA /* rb_main.rb */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.ruby; path = rb_main.rb; sourceTree = "<group>"; };
51657583144AFA12002A4EFA /* AppDelegate.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = AppDelegate.rb; sourceTree = "<group>"; }; 51657583144AFA12002A4EFA /* AppDelegate.rb */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.ruby; path = AppDelegate.rb; sourceTree = "<group>"; };
51657597144B2608002A4EFA /* Pods.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; }; 51657597144B2608002A4EFA /* Pods.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
5165759A144B265B002A4EFA /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = Pods/build/Release/libPods.a; sourceTree = "<group>"; }; 5165759A144B265B002A4EFA /* libPods.a */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = archive.ar; name = libPods.a; path = Pods/build/Release/libPods.a; sourceTree = "<group>"; };
516575F0144B498E002A4EFA /* Pods.bridgesupport */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = Pods.bridgesupport; path = Pods/Pods.bridgesupport; sourceTree = SOURCE_ROOT; }; 516575F0144B498E002A4EFA /* Pods.bridgesupport */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = text.xml; name = Pods.bridgesupport; path = Pods/Pods.bridgesupport; sourceTree = SOURCE_ROOT; };
B067261347BD4EF3A1CC914B /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -73,6 +75,8 @@ ...@@ -73,6 +75,8 @@
children = ( children = (
5165756C144AFA12002A4EFA /* Cocoa.framework */, 5165756C144AFA12002A4EFA /* Cocoa.framework */,
5165756E144AFA12002A4EFA /* MacRuby.framework */, 5165756E144AFA12002A4EFA /* MacRuby.framework */,
1D088A498E1E4E6A93B7BED4 /* libPods-debug.a */,
B067261347BD4EF3A1CC914B /* libPods.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -127,6 +131,7 @@ ...@@ -127,6 +131,7 @@
51657565144AFA12002A4EFA /* Frameworks */, 51657565144AFA12002A4EFA /* Frameworks */,
51657566144AFA12002A4EFA /* Resources */, 51657566144AFA12002A4EFA /* Resources */,
51F33E491450BB7D00C19A4B /* ShellScript */, 51F33E491450BB7D00C19A4B /* ShellScript */,
CB7130C27CA248848BDDB33E /* Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
...@@ -193,6 +198,20 @@ ...@@ -193,6 +198,20 @@
shellScript = "${SRCROOT}/Pods/Pods-resources.sh"; shellScript = "${SRCROOT}/Pods/Pods-resources.sh";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
CB7130C27CA248848BDDB33E /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
...@@ -284,6 +303,7 @@ ...@@ -284,6 +303,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacRubySample/MacRubySample-Prefix.pch"; GCC_PREFIX_HEADER = "MacRubySample/MacRubySample-Prefix.pch";
INFOPLIST_FILE = "MacRubySample/MacRubySample-Info.plist"; INFOPLIST_FILE = "MacRubySample/MacRubySample-Info.plist";
PODS_ROOT = "${SRCROOT}/Pods";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
...@@ -302,6 +322,7 @@ ...@@ -302,6 +322,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacRubySample/MacRubySample-Prefix.pch"; GCC_PREFIX_HEADER = "MacRubySample/MacRubySample-Prefix.pch";
INFOPLIST_FILE = "MacRubySample/MacRubySample-Info.plist"; INFOPLIST_FILE = "MacRubySample/MacRubySample-Info.plist";
PODS_ROOT = "${SRCROOT}/Pods";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Pods/Pods.xcodeproj'/><FileRef location='group:MacRubySample.xcodeproj'/></Workspace>
<Workspace \ No newline at end of file
version = "1.0">
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
<FileRef
location = "group:MacRubySample.xcodeproj">
</FileRef>
</Workspace>
...@@ -5,14 +5,6 @@ generate_bridge_support! ...@@ -5,14 +5,6 @@ generate_bridge_support!
dependency 'ASIHTTPRequest' dependency 'ASIHTTPRequest'
dependency 'SBJson' dependency 'SBJson'
target :debug do
dependency 'CocoaLumberjack'
end
#target :test, :exclusive => true do
# dependency 'Kiwi'
#end
# Enable garbage collection support, which MacRuby requires. # Enable garbage collection support, which MacRuby requires.
post_install do |installer| post_install do |installer|
installer.project.targets.each do |target| installer.project.targets.each do |target|
......
PODS: PODS:
- ASIHTTPRequest (1.8.1) - ASIHTTPRequest (1.8.1)
- CocoaLumberjack (1.3.2)
- SBJson (3.0.4) - SBJson (3.0.4)
DEPENDENCIES: DEPENDENCIES:
- ASIHTTPRequest - ASIHTTPRequest
- CocoaLumberjack
- SBJson - SBJson
platform :ios platform :ios
workspace "RelativePathProject/TheWorkspaceOfTheRelativeProject.xcworkspace"
xcodeproj "RelativePathProject/RelativePathProject.xcodeproj" xcodeproj "RelativePathProject/RelativePathProject.xcodeproj"
dependency "AFNetworking" dependency "AFNetworking"
PODS: PODS:
- AFNetworking (0.9.0) - AFNetworking (0.9.1)
DEPENDENCIES: DEPENDENCIES:
- AFNetworking - AFNetworking
<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:RelativePathProject.xcodeproj'/><FileRef location='group:../Pods/Pods.xcodeproj'/></Workspace> <?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:RelativePathProject.xcodeproj'/><FileRef location='group:../Pods/Pods.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/><FileRef location='group:RelativePathProject/RelativePathProject.xcodeproj'/></Workspace>
\ No newline at end of file \ No newline at end of file
...@@ -17,11 +17,6 @@ module Pod ...@@ -17,11 +17,6 @@ module Pod
# Only need to write out the user's project if any of the target # Only need to write out the user's project if any of the target
# integrators actually did some work. # integrators actually did some work.
target_integrators.map(&:integrate!) target_integrators.map(&:integrate!)
unless config.silent?
# TODO this really shouldn't be here
puts "[!] From now on use `#{workspace_path.basename}' instead of `#{user_project_path.basename}'."
end
end end
def workspace_path def workspace_path
...@@ -49,6 +44,9 @@ module Pod ...@@ -49,6 +44,9 @@ module Pod
project_path = project_path.relative_path_from(config.project_root).to_s project_path = project_path.relative_path_from(config.project_root).to_s
workspace << project_path unless workspace.include?(project_path) workspace << project_path unless workspace.include?(project_path)
end end
unless workspace_path.exist? || config.silent?
puts "[!] From now on use `#{workspace_path.basename}'."
end
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment