Changeset 28788 in webkit

Timestamp:

Dec 16, 2007 5:33:16 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2007-12-16 Brent Fulgham <​bfulgham@gmail.com>

Reviewed by Adam Roben.

​http://bugs.webkit.org/show_bug.cgi?id=16315
FindSafari needs a path-only option.

• FindSafari/FindSafari.cpp: (_tmain):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• FindSafari/FindSafari.cpp (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-12-16  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16315
+        FindSafari needs a path-only option.
+
+        * FindSafari/FindSafari.cpp:
+        (_tmain):
+
 2007-12-16  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebKitTools/FindSafari/FindSafari.cpp

@@ -130 +130 @@
 
     bool printLauncher = false;
+    bool printEnvironment = false;
     bool debugger = false;
 
@@ -135 +136 @@
         if (!_tcscmp(argv[i], TEXT("/printSafariLauncher"))) {
             printLauncher = true;
+            continue;
+        }
+        if (!_tcscmp(argv[i], TEXT("/printSafariEnvironment"))) {
+            printEnvironment = true;
             continue;
         }
@@ -143 +148 @@
     }
 
-    if (!printLauncher) {
+    // printLauncher is inclusive of printEnvironment, so do not
+    // leave both enabled:
+    if (printLauncher && printEnvironment)
+        printEnvironment = false;
+
+    if (!printLauncher && !printEnvironment) {
         _tprintf(TEXT("%s\n"), path);
         free(path);
@@ -177 +187 @@
 
     LPCTSTR* endLines = debugger ? debuggerLines : launchLines;
-    for (unsigned i = 0; i < (debugger ? ARRAYSIZE(debuggerLines) : ARRAYSIZE(launchLines)); ++i) {
-        _tprintf(endLines[i], command);
-        _tprintf(TEXT("\n"));
+
+    // Don't print launch command if we just want the environment set up...
+    if (!printEnvironment) {
+       for (unsigned i = 0; i < (debugger ? ARRAYSIZE(debuggerLines) : ARRAYSIZE(launchLines)); ++i) {
+           _tprintf(endLines[i], command);
+           _tprintf(TEXT("\n"));
+       }
     }