<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164134] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164134">164134</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 14:28:36 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsc-cli should allow scripts to access argv
https://bugs.webkit.org/show_bug.cgi?id=127486
Reviewed by Oliver Hunt.
* jsc-cli/jsc-cli.xcodeproj/project.pbxproj:
* jsc-cli/jsc-cli/CLIInstance.h:
* jsc-cli/jsc-cli/CLIInstance.m:
(-[CLIInstance init]):
(-[CLIInstance loadFile:]):
(-[CLIInstance didReceiveArguments:atOffset:withLength:]):
* jsc-cli/jsc-cli/JSRunLoopThread.h:
* jsc-cli/jsc-cli/JSRunLoopThread.m:
(-[JSRunLoopThread initWithContext:]):
(-[JSRunLoopThread loadFile:]):
(-[JSRunLoopThread start]):
* jsc-cli/jsc-cli/main.m:
(printUsage):
(main):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsjscclijsccliCLIInstanceh">trunk/Tools/jsc-cli/jsc-cli/CLIInstance.h</a></li>
<li><a href="#trunkToolsjscclijsccliCLIInstancem">trunk/Tools/jsc-cli/jsc-cli/CLIInstance.m</a></li>
<li><a href="#trunkToolsjscclijsccliJSRunLoopThreadh">trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.h</a></li>
<li><a href="#trunkToolsjscclijsccliJSRunLoopThreadm">trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.m</a></li>
<li><a href="#trunkToolsjscclijscclimainm">trunk/Tools/jsc-cli/jsc-cli/main.m</a></li>
<li><a href="#trunkToolsjscclijscclixcodeprojprojectpbxproj">trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/ChangeLog 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-14 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ jsc-cli should allow scripts to access argv
+ https://bugs.webkit.org/show_bug.cgi?id=127486
+
+ Reviewed by Oliver Hunt.
+
+ * jsc-cli/jsc-cli.xcodeproj/project.pbxproj:
+ * jsc-cli/jsc-cli/CLIInstance.h:
+ * jsc-cli/jsc-cli/CLIInstance.m:
+ (-[CLIInstance init]):
+ (-[CLIInstance loadFile:]):
+ (-[CLIInstance didReceiveArguments:atOffset:withLength:]):
+ * jsc-cli/jsc-cli/JSRunLoopThread.h:
+ * jsc-cli/jsc-cli/JSRunLoopThread.m:
+ (-[JSRunLoopThread initWithContext:]):
+ (-[JSRunLoopThread loadFile:]):
+ (-[JSRunLoopThread start]):
+ * jsc-cli/jsc-cli/main.m:
+ (printUsage):
+ (main):
+
</ins><span class="cx"> 2014-02-14 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge remaining ENABLE(SHADOW_DOM) cruft.
</span></span></pre></div>
<a id="trunkToolsjscclijsccliCLIInstanceh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli/CLIInstance.h (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli/CLIInstance.h 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli/CLIInstance.h 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> @interface CLIInstance : NSObject
</span><span class="cx">
</span><span class="cx"> -(void)loadFile:(NSString *)path;
</span><ins>+-(void)didReceiveArguments:(const char**)args atOffset:(int)offset withLength:(int)length;
</ins><span class="cx"> -(void)run;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsjscclijsccliCLIInstancem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli/CLIInstance.m (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli/CLIInstance.m 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli/CLIInstance.m 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -59,16 +59,24 @@
</span><span class="cx"> return module.exports;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- _jsThread = [[JSRunLoopThread alloc] initWithFiles:@[] andContext:_context];
</del><ins>+ _context[@"ARGV"] = [JSValue valueWithNewArrayInContext:_context];
+ _jsThread = [[JSRunLoopThread alloc] initWithContext:_context];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadFile:(NSString *)path
</span><span class="cx"> {
</span><del>- _baseFile = path;
</del><ins>+ [_jsThread loadFile:path];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)didReceiveArguments:(const char **)args atOffset:(int)offset withLength:(int)length
+{
+ [_context[@"ARGV"] setValue:(_baseFile ? _baseFile : @"") atIndex:0];
+ for (int i = offset; i < length; ++i)
+ [_context[@"ARGV"] setValue:@(args[i]) atIndex:(offset - i + 1)];
+}
+
</ins><span class="cx"> - (void)run
</span><span class="cx"> {
</span><span class="cx"> [_jsThread start];
</span></span></pre></div>
<a id="trunkToolsjscclijsccliJSRunLoopThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.h (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.h 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.h 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx">
</span><span class="cx"> @property dispatch_queue_t asyncQueue;
</span><span class="cx">
</span><del>-- (id)initWithFiles:(NSArray *)files andContext:(JSContext *)context;
</del><ins>+- (id)initWithContext:(JSContext *)context;
+- (void)loadFile:(NSString *)file;
</ins><span class="cx"> - (void)start;
</span><span class="cx"> - (void)join;
</span><span class="cx"> - (JSValue *)didReceiveInput:(NSString *)input;
</span></span></pre></div>
<a id="trunkToolsjscclijsccliJSRunLoopThreadm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.m (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.m 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli/JSRunLoopThread.m 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import <pthread.h>
</span><span class="cx">
</span><span class="cx"> @implementation JSRunLoopThread {
</span><del>- NSArray *m_filesToRun;
</del><ins>+ NSString *m_fileToRun;
</ins><span class="cx"> CFRunLoopRef m_runLoop;
</span><span class="cx"> ScriptInputSource *m_scriptSource;
</span><span class="cx"> JSContext *m_context;
</span><span class="lines">@@ -48,13 +48,12 @@
</span><span class="cx"> return jsThreadMain;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithFiles:(NSArray *)files andContext:(JSContext *)context
</del><ins>+- (id)initWithContext:(JSContext *)context
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- m_filesToRun = files;
</del><span class="cx"> m_context = context;
</span><span class="cx"> m_scriptSource = [[ScriptInputSource alloc] initWithContext:context];
</span><span class="cx"> m_asyncQueue = dispatch_queue_create("node.jsc async queue", DISPATCH_QUEUE_CONCURRENT);
</span><span class="lines">@@ -62,6 +61,11 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)loadFile:(NSString *)file
+{
+ m_fileToRun = file;
+}
+
</ins><span class="cx"> - (void)startRunLoop
</span><span class="cx"> {
</span><span class="cx"> m_runLoop = CFRunLoopGetCurrent();
</span><span class="lines">@@ -76,11 +80,8 @@
</span><span class="cx"> {
</span><span class="cx"> [super start];
</span><span class="cx">
</span><del>- if (![m_filesToRun count])
- return;
-
- for (NSString *file in m_filesToRun) {
- NSString *script = [NSString stringWithContentsOfFile:file encoding:NSUTF8StringEncoding error:nil];
</del><ins>+ if (m_fileToRun) {
+ NSString *script = [NSString stringWithContentsOfFile:m_fileToRun encoding:NSUTF8StringEncoding error:nil];
</ins><span class="cx"> [m_scriptSource runScriptRemotely:script];
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsjscclijscclimainm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli/main.m (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli/main.m 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli/main.m 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -27,15 +27,40 @@
</span><span class="cx">
</span><span class="cx"> #import "CLIInstance.h"
</span><span class="cx">
</span><ins>+static void printUsage()
+{
+ fprintf(stderr, "Usage: jsc-cli file [program-args]\n");
+ fprintf(stderr, " jsc-cli is a command line interface for executing JavaScript code.\n");
+ fprintf(stderr, " file should be a JavaScript source file. Any arguments following the\n");
+ fprintf(stderr, " source file are the arguments to the program itself.\n");
+}
+
</ins><span class="cx"> int main(int argc, const char * argv[])
</span><span class="cx"> {
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> CLIInstance *instance = [[CLIInstance alloc] init];
</span><span class="cx">
</span><del>- // TODO: Add real arguments handling.
- if (argc > 1)
- [instance loadFile:[NSString stringWithCString:argv[1] encoding:NSUTF8StringEncoding]];
</del><ins>+ int offset = 1;
+ if (argc > 1) {
+ NSString *filename = [NSString stringWithCString:argv[1] encoding:NSUTF8StringEncoding];
+ BOOL directory;
+ if (![[NSFileManager defaultManager] fileExistsAtPath:filename isDirectory:&directory]) {
+ fprintf(stderr, "Error: %s does not exist.\n", argv[1]);
+ printUsage();
+ exit(-1);
+ }
</ins><span class="cx">
</span><ins>+ if (directory) {
+ fprintf(stderr, "Error: %s is a directory.\n", argv[1]);
+ printUsage();
+ exit(-1);
+ }
+
+ [instance loadFile:filename];
+ offset = 2;
+ }
+ [instance didReceiveArguments:argv atOffset:offset withLength:argc];
+
</ins><span class="cx"> [instance run];
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkToolsjscclijscclixcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj (164133 => 164134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj 2014-02-14 22:27:04 UTC (rev 164133)
+++ trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj 2014-02-14 22:28:36 UTC (rev 164134)
</span><span class="lines">@@ -15,20 +15,30 @@
</span><span class="cx"> C246591D18902D100029092E /* RunLoopThread.m in Sources */ = {isa = PBXBuildFile; fileRef = C246591C18902D100029092E /* RunLoopThread.m */; };
</span><span class="cx"> C246592018902E150029092E /* ReadEvalPrintLoop.m in Sources */ = {isa = PBXBuildFile; fileRef = C246591F18902E150029092E /* ReadEvalPrintLoop.m */; };
</span><span class="cx"> C246592318902EA40029092E /* ScriptInputSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C246592218902EA40029092E /* ScriptInputSource.m */; };
</span><del>- C246592C18905FC10029092E /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C246592B18905FC10029092E /* JavaScriptCore.framework */; };
</del><ins>+ C296621118ADF56000752922 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C296621018ADF56000752922 /* JavaScriptCore.framework */; };
</ins><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><del>- C24658FF18902ACE0029092E /* Copy Files */ = {
</del><ins>+ C246105418AC4472009F75B5 /* Copy Tests */ = {
</ins><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><del>- dstPath = /usr/share/man/man1/;
- dstSubfolderSpec = 0;
</del><ins>+ dstPath = tests;
+ dstSubfolderSpec = 16;
</ins><span class="cx"> files = (
</span><span class="cx"> );
</span><del>- name = "Copy Files";
- runOnlyForDeploymentPostprocessing = 1;
</del><ins>+ name = "Copy Tests";
+ runOnlyForDeploymentPostprocessing = 0;
</ins><span class="cx"> };
</span><ins>+ C24658FF18902ACE0029092E /* Copy Lib */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 12;
+ dstPath = lib;
+ dstSubfolderSpec = 16;
+ files = (
+ );
+ name = "Copy Lib";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> /* End PBXCopyFilesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFileReference section */
</span><span class="lines">@@ -47,7 +57,7 @@
</span><span class="cx"> C246591F18902E150029092E /* ReadEvalPrintLoop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReadEvalPrintLoop.m; sourceTree = "<group>"; };
</span><span class="cx"> C246592118902EA40029092E /* ScriptInputSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInputSource.h; sourceTree = "<group>"; };
</span><span class="cx"> C246592218902EA40029092E /* ScriptInputSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScriptInputSource.m; sourceTree = "<group>"; };
</span><del>- C246592B18905FC10029092E /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ C296621018ADF56000752922 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = ../../WebKitBuild/Debug/JavaScriptCore.framework; sourceTree = "<group>"; };
</ins><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -55,7 +65,7 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- C246592C18905FC10029092E /* JavaScriptCore.framework in Frameworks */,
</del><ins>+ C296621118ADF56000752922 /* JavaScriptCore.framework in Frameworks */,
</ins><span class="cx"> C246590518902ACE0029092E /* Foundation.framework in Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="lines">@@ -63,9 +73,25 @@
</span><span class="cx"> /* End PBXFrameworksBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXGroup section */
</span><ins>+ C246104C18AC3B45009F75B5 /* tests */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = tests;
+ sourceTree = "<group>";
+ };
+ C246105018AC40F1009F75B5 /* lib */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = lib;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> C24658F818902ACE0029092E = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ C246105018AC40F1009F75B5 /* lib */,
+ C246104C18AC3B45009F75B5 /* tests */,
</ins><span class="cx"> C246590618902ACE0029092E /* jsc-cli */,
</span><span class="cx"> C246590318902ACE0029092E /* Frameworks */,
</span><span class="cx"> C246590218902ACE0029092E /* Products */,
</span><span class="lines">@@ -83,7 +109,7 @@
</span><span class="cx"> C246590318902ACE0029092E /* Frameworks */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- C246592B18905FC10029092E /* JavaScriptCore.framework */,
</del><ins>+ C296621018ADF56000752922 /* JavaScriptCore.framework */,
</ins><span class="cx"> C246590418902ACE0029092E /* Foundation.framework */,
</span><span class="cx"> );
</span><span class="cx"> name = Frameworks;
</span><span class="lines">@@ -118,7 +144,8 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> C24658FD18902ACE0029092E /* Sources */,
</span><span class="cx"> C24658FE18902ACE0029092E /* Frameworks */,
</span><del>- C24658FF18902ACE0029092E /* Copy Files */,
</del><ins>+ C24658FF18902ACE0029092E /* Copy Lib */,
+ C246105418AC4472009F75B5 /* Copy Tests */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -246,7 +273,10 @@
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><del>- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
</del><ins>+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "/Volumes/Data/WebKit-svn-01/OpenSource/WebKitBuild/Debug",
+ );
</ins><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = "";
</span><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "\"@loader_path/.\"";
</span><span class="lines">@@ -266,7 +296,10 @@
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><del>- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
</del><ins>+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "/Volumes/Data/WebKit-svn-01/OpenSource/WebKitBuild/Debug",
+ );
</ins><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = "";
</span><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "\"@loader_path/.\"";
</span></span></pre>
</div>
</div>
</body>
</html>