Title: [165420] trunk/Tools
- Revision
- 165420
- Author
- [email protected]
- Date
- 2014-03-10 17:39:57 -0700 (Mon, 10 Mar 2014)
Log Message
[Win] Unreviewed build fix.
Some bad Windows code was committed at some point that prevents the Apple Windows port
from finding its runtime dependencies reliably.
* win/DLLLauncher/DLLLauncherMain.cpp:
(appleApplicationSupportDirectory): Restored this function.
(modifyPath): Update to use appleApplicationSupportDirectory function.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165419 => 165420)
--- trunk/Tools/ChangeLog 2014-03-11 00:29:56 UTC (rev 165419)
+++ trunk/Tools/ChangeLog 2014-03-11 00:39:57 UTC (rev 165420)
@@ -1,3 +1,14 @@
+2014-03-10 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix.
+
+ Some bad Windows code was committed at some point that prevents the Apple Windows port
+ from finding its runtime dependencies reliably.
+
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (appleApplicationSupportDirectory): Restored this function.
+ (modifyPath): Update to use appleApplicationSupportDirectory function.
+
2014-03-10 Zoltan Horvath <[email protected]>
Let the user define the full address of the performance-site-server for uploading results
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (165419 => 165420)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2014-03-11 00:29:56 UTC (rev 165419)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2014-03-11 00:39:57 UTC (rev 165420)
@@ -95,6 +95,11 @@
return path;
}
+static wstring appleApplicationSupportDirectory()
+{
+ return applePathFromRegistry(L"SOFTWARE\\Apple Inc.\\Apple Application Support", L"InstallDir");
+}
+
static wstring copyEnvironmentVariable(const wstring& variable)
{
DWORD length = ::GetEnvironmentVariableW(variable.c_str(), 0, 0);
@@ -146,11 +151,7 @@
#else
-#if defined(_M_X64)
- static const wstring pathPrefix = L"C:\\Program Files\\Common Files\\Apple\\Apple Application Support";
-#else
- static const wstring pathPrefix = L"C:\\Program Files (x86)\\Common Files\\Apple\\Apple Application Support";
-#endif
+ const wstring& pathPrefix = appleApplicationSupportDirectory();
if (!directoryExists(pathPrefix)) {
fatalError(programName, L"Failed to determine path to AAS directory.");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
