Modifying build process for C++ components built with Visual Studio.

Breaking out individual build artifacts to use individual build.desc files. Also renaming directory to lower-case to conform to project norms.
mbadov · Aug 15, 2013 · fbd9df9 · fbd9df9
1 parent 3e8628b
commit fbd9df9
Show file tree

Hide file tree

Showing 130 changed files with 74 additions and 76 deletions.
diff --git a/WebDriver.sln b/WebDriver.sln
@@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-interactions", "c
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox", "cpp\webdriver-firefox\webdriver-firefox.vcxproj", "{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "cpp\IEDriver\IEDriver.vcxproj", "{BB72383B-427F-4191-B692-E4345A30E33C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "cpp\iedriver\IEDriver.vcxproj", "{BB72383B-427F-4191-B692-E4345A30E33C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "third_party\json-cpp\json-cpp.vcxproj", "{320F3BBE-8223-4E7F-ABEE-18D3BD57B1FD}"
 EndProject
@@ -70,7 +70,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-previous"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Safari.Tests", "dotnet\test\safari\WebDriver.Safari.Tests.csproj", "{92551430-7C30-421B-A81E-0B08163AC59C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "cpp\IEDriverServer\IEDriverServer.vcxproj", "{08C3286F-F132-44EC-80F0-2DF30D87A5D3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "cpp\iedriverserver\IEDriverServer.vcxproj", "{08C3286F-F132-44EC-80F0-2DF30D87A5D3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.PhantomJS.Tests", "dotnet\test\phantomjs\WebDriver.PhantomJS.Tests.csproj", "{2329720E-A694-4A6F-B4E6-EDEA911298E0}"
 EndProject

diff --git a/cpp/build.desc b/cpp/build.desc
@@ -1,38 +1,3 @@
-visualc_library(name = "firefox_dll",
-  platform = "Win32",
-  project = "webdriver-firefox/webdriver-firefox.vcxproj",
-  file_deps = "third_party/gecko-2/win32",
-  out = "Win32/Release/webdriver-firefox.dll"
-)
-
-visualc_library(name = "firefoxprevious_esr_dll",
-  platform = "Win32",
-  project = "webdriver-firefox/webdriver-firefox-esr-previous.vcxproj",
-  file_deps = "third_party/gecko-10/win32",
-  out = "Win32/Release/webdriver-firefox-esr-previous.dll"
-)
-
-visualc_library(name = "firefoxlatest_esr_dll",
-  platform = "Win32",
-  project = "webdriver-firefox/webdriver-firefox-esr-latest.vcxproj",
-  file_deps = "third_party/gecko-17/win32",
-  out = "Win32/Release/webdriver-firefox-esr-latest.dll"
-)
-
-visualc_library(name = "firefoxprevious_dll",
-  platform = "Win32",
-  project = "webdriver-firefox/webdriver-firefox-previous.vcxproj",
-  file_deps = "third_party/gecko-22/win32",
-  out = "Win32/Release/webdriver-firefox-previous.dll"
-)
-
-visualc_library(name = "firefoxlatest_dll",
-  platform = "Win32",
-  project = "webdriver-firefox/webdriver-firefox-latest.vcxproj",
-  file_deps = "third_party/gecko-23/win32",
-  out = "Win32/Release/webdriver-firefox-latest.dll"
-)
-
 mozilla_xpt(name = "native_events_xpt",
   srcs = [ "webdriver-firefox/nsINativeEvents.idl" ])
 
@@ -144,35 +109,3 @@ visualc_library(name = "imehandler_dll",
   project = "imehandler/imehandler.vcxproj",
   out = "Win32/Release/imehandler.dll"
 )
-
-visualc_release(name = "ie_win32_exe",
-  deps = [
-    "//javascript/ie-driver:atoms",
-    ":ie_result_type_cpp",
-    ":sizzle"
-  ],
-  platform = "Win32",
-  project = "IEDriverServer/IEDriverServer.vcxproj",
-  desc = "InternetExplorerDriver standalone server for 32-bit IE",
-  out = "Win32/Release/IEDriverServer.exe"
-)
-
-visualc_release(name = "ie_x64_exe",
-  deps = [
-    "//javascript/ie-driver:atoms",
-    ":ie_result_type_cpp",
-    ":sizzle"
-  ],
-  platform = "x64",
-  project = "IEDriverServer/IEDriverServer.vcxproj",
-  desc = "InternetExplorerDriver standalone server for 64-bit IE",
-  out = "x64/Release/IEDriverServer.exe"
-)
-
-rake_task(name = "sizzle",
-  task_name = "sizzle_header",
-  out = "cpp/IEDriver/Generated/sizzle.h")
-
-rake_task(name = "ie_result_type_cpp",
-  task_name = "ie_result_type_cpp",
-  out = "cpp/IEDriver/Generated/IEReturnTypes.h")
diff --git a/cpp/IEDriver/Alert.cpp → cpp/iedriver/Alert.cpp b/cpp/IEDriver/Alert.cpp → cpp/iedriver/Alert.cpp
diff --git a/cpp/IEDriver/Alert.h → cpp/iedriver/Alert.h b/cpp/IEDriver/Alert.h → cpp/iedriver/Alert.h
diff --git a/cpp/IEDriver/AsyncScriptExecutor.cpp → cpp/iedriver/AsyncScriptExecutor.cpp b/cpp/IEDriver/AsyncScriptExecutor.cpp → cpp/iedriver/AsyncScriptExecutor.cpp
diff --git a/cpp/IEDriver/AsyncScriptExecutor.h → cpp/iedriver/AsyncScriptExecutor.h b/cpp/IEDriver/AsyncScriptExecutor.h → cpp/iedriver/AsyncScriptExecutor.h
diff --git a/cpp/IEDriver/Browser.cpp → cpp/iedriver/Browser.cpp b/cpp/IEDriver/Browser.cpp → cpp/iedriver/Browser.cpp
diff --git a/cpp/IEDriver/Browser.h → cpp/iedriver/Browser.h b/cpp/IEDriver/Browser.h → cpp/iedriver/Browser.h
diff --git a/cpp/IEDriver/BrowserFactory.cpp → cpp/iedriver/BrowserFactory.cpp b/cpp/IEDriver/BrowserFactory.cpp → cpp/iedriver/BrowserFactory.cpp
diff --git a/cpp/IEDriver/BrowserFactory.h → cpp/iedriver/BrowserFactory.h b/cpp/IEDriver/BrowserFactory.h → cpp/iedriver/BrowserFactory.h
diff --git a/...mmandHandlers/AcceptAlertCommandHandler.h → ...mmandHandlers/AcceptAlertCommandHandler.h b/...mmandHandlers/AcceptAlertCommandHandler.h → ...mmandHandlers/AcceptAlertCommandHandler.h
diff --git a/...CommandHandlers/AddCookieCommandHandler.h → ...CommandHandlers/AddCookieCommandHandler.h b/...CommandHandlers/AddCookieCommandHandler.h → ...CommandHandlers/AddCookieCommandHandler.h
diff --git a/...mandHandlers/ClearElementCommandHandler.h → ...mandHandlers/ClearElementCommandHandler.h b/...mandHandlers/ClearElementCommandHandler.h → ...mandHandlers/ClearElementCommandHandler.h
diff --git a/...mandHandlers/ClickElementCommandHandler.h → ...mandHandlers/ClickElementCommandHandler.h b/...mandHandlers/ClickElementCommandHandler.h → ...mandHandlers/ClickElementCommandHandler.h
diff --git a/...mmandHandlers/CloseWindowCommandHandler.h → ...mmandHandlers/CloseWindowCommandHandler.h b/...mmandHandlers/CloseWindowCommandHandler.h → ...mmandHandlers/CloseWindowCommandHandler.h
diff --git a/...Handlers/DeleteAllCookiesCommandHandler.h → ...Handlers/DeleteAllCookiesCommandHandler.h b/...Handlers/DeleteAllCookiesCommandHandler.h → ...Handlers/DeleteAllCookiesCommandHandler.h
diff --git a/...mandHandlers/DeleteCookieCommandHandler.h → ...mandHandlers/DeleteCookieCommandHandler.h b/...mandHandlers/DeleteCookieCommandHandler.h → ...mandHandlers/DeleteCookieCommandHandler.h
diff --git a/...mandHandlers/DismissAlertCommandHandler.h → ...mandHandlers/DismissAlertCommandHandler.h b/...mandHandlers/DismissAlertCommandHandler.h → ...mandHandlers/DismissAlertCommandHandler.h
diff --git a/...andHandlers/ElementEqualsCommandHandler.h → ...andHandlers/ElementEqualsCommandHandler.h b/...andHandlers/ElementEqualsCommandHandler.h → ...andHandlers/ElementEqualsCommandHandler.h
diff --git a/...ndlers/ExecuteAsyncScriptCommandHandler.h → ...ndlers/ExecuteAsyncScriptCommandHandler.h b/...ndlers/ExecuteAsyncScriptCommandHandler.h → ...ndlers/ExecuteAsyncScriptCommandHandler.h
diff --git a/...andHandlers/ExecuteScriptCommandHandler.h → ...andHandlers/ExecuteScriptCommandHandler.h b/...andHandlers/ExecuteScriptCommandHandler.h → ...andHandlers/ExecuteScriptCommandHandler.h
diff --git a/...Handlers/FindChildElementCommandHandler.h → ...Handlers/FindChildElementCommandHandler.h b/...Handlers/FindChildElementCommandHandler.h → ...Handlers/FindChildElementCommandHandler.h
diff --git a/...andlers/FindChildElementsCommandHandler.h → ...andlers/FindChildElementsCommandHandler.h b/...andlers/FindChildElementsCommandHandler.h → ...andlers/FindChildElementsCommandHandler.h
diff --git a/...mmandHandlers/FindElementCommandHandler.h → ...mmandHandlers/FindElementCommandHandler.h b/...mmandHandlers/FindElementCommandHandler.h → ...mmandHandlers/FindElementCommandHandler.h
diff --git a/...mandHandlers/FindElementsCommandHandler.h → ...mandHandlers/FindElementsCommandHandler.h b/...mandHandlers/FindElementsCommandHandler.h → ...mandHandlers/FindElementsCommandHandler.h
diff --git a/...Handlers/GetActiveElementCommandHandler.h → ...Handlers/GetActiveElementCommandHandler.h b/...Handlers/GetActiveElementCommandHandler.h → ...Handlers/GetActiveElementCommandHandler.h
diff --git a/...mandHandlers/GetAlertTextCommandHandler.h → ...mandHandlers/GetAlertTextCommandHandler.h b/...mandHandlers/GetAlertTextCommandHandler.h → ...mandHandlers/GetAlertTextCommandHandler.h
diff --git a/...andHandlers/GetAllCookiesCommandHandler.h → ...andHandlers/GetAllCookiesCommandHandler.h b/...andHandlers/GetAllCookiesCommandHandler.h → ...andHandlers/GetAllCookiesCommandHandler.h
diff --git a/...dlers/GetAllWindowHandlesCommandHandler.h → ...dlers/GetAllWindowHandlesCommandHandler.h b/...dlers/GetAllWindowHandlesCommandHandler.h → ...dlers/GetAllWindowHandlesCommandHandler.h
diff --git a/...andHandlers/GetCurrentUrlCommandHandler.h → ...andHandlers/GetCurrentUrlCommandHandler.h b/...andHandlers/GetCurrentUrlCommandHandler.h → ...andHandlers/GetCurrentUrlCommandHandler.h
diff --git a/...rs/GetCurrentWindowHandleCommandHandler.h → ...rs/GetCurrentWindowHandleCommandHandler.h b/...rs/GetCurrentWindowHandleCommandHandler.h → ...rs/GetCurrentWindowHandleCommandHandler.h
diff --git a/...dlers/GetElementAttributeCommandHandler.h → ...dlers/GetElementAttributeCommandHandler.h b/...dlers/GetElementAttributeCommandHandler.h → ...dlers/GetElementAttributeCommandHandler.h
diff --git a/...ndlers/GetElementLocationCommandHandler.h → ...ndlers/GetElementLocationCommandHandler.h b/...ndlers/GetElementLocationCommandHandler.h → ...ndlers/GetElementLocationCommandHandler.h
diff --git a/...ationOnceScrolledIntoViewCommandHandler.h → ...ationOnceScrolledIntoViewCommandHandler.h b/...ationOnceScrolledIntoViewCommandHandler.h → ...ationOnceScrolledIntoViewCommandHandler.h
diff --git a/...ndHandlers/GetElementSizeCommandHandler.h → ...ndHandlers/GetElementSizeCommandHandler.h b/...ndHandlers/GetElementSizeCommandHandler.h → ...ndHandlers/GetElementSizeCommandHandler.h
diff --git a/...andlers/GetElementTagNameCommandHandler.h → ...andlers/GetElementTagNameCommandHandler.h b/...andlers/GetElementTagNameCommandHandler.h → ...andlers/GetElementTagNameCommandHandler.h
diff --git a/...ndHandlers/GetElementTextCommandHandler.h → ...ndHandlers/GetElementTextCommandHandler.h b/...ndHandlers/GetElementTextCommandHandler.h → ...ndHandlers/GetElementTextCommandHandler.h
diff --git a/...ElementValueOfCssPropertyCommandHandler.h → ...ElementValueOfCssPropertyCommandHandler.h b/...ElementValueOfCssPropertyCommandHandler.h → ...ElementValueOfCssPropertyCommandHandler.h
diff --git a/...andHandlers/GetPageSourceCommandHandler.h → ...andHandlers/GetPageSourceCommandHandler.h b/...andHandlers/GetPageSourceCommandHandler.h → ...andHandlers/GetPageSourceCommandHandler.h
diff --git a/...rs/GetSessionCapabilitiesCommandHandler.h → ...rs/GetSessionCapabilitiesCommandHandler.h b/...rs/GetSessionCapabilitiesCommandHandler.h → ...rs/GetSessionCapabilitiesCommandHandler.h
diff --git a/.../CommandHandlers/GetTitleCommandHandler.h → .../CommandHandlers/GetTitleCommandHandler.h b/.../CommandHandlers/GetTitleCommandHandler.h → .../CommandHandlers/GetTitleCommandHandler.h
diff --git a/...andlers/GetWindowPositionCommandHandler.h → ...andlers/GetWindowPositionCommandHandler.h b/...andlers/GetWindowPositionCommandHandler.h → ...andlers/GetWindowPositionCommandHandler.h
diff --git a/...andHandlers/GetWindowSizeCommandHandler.h → ...andHandlers/GetWindowSizeCommandHandler.h b/...andHandlers/GetWindowSizeCommandHandler.h → ...andHandlers/GetWindowSizeCommandHandler.h
diff --git a/...er/CommandHandlers/GoBackCommandHandler.h → ...er/CommandHandlers/GoBackCommandHandler.h b/...er/CommandHandlers/GoBackCommandHandler.h → ...er/CommandHandlers/GoBackCommandHandler.h
diff --git a/...CommandHandlers/GoForwardCommandHandler.h → ...CommandHandlers/GoForwardCommandHandler.h b/...CommandHandlers/GoForwardCommandHandler.h → ...CommandHandlers/GoForwardCommandHandler.h
diff --git a/...r/CommandHandlers/GoToUrlCommandHandler.h → ...r/CommandHandlers/GoToUrlCommandHandler.h b/...r/CommandHandlers/GoToUrlCommandHandler.h → ...r/CommandHandlers/GoToUrlCommandHandler.h
diff --git a/...ndlers/IsElementDisplayedCommandHandler.h → ...ndlers/IsElementDisplayedCommandHandler.h b/...ndlers/IsElementDisplayedCommandHandler.h → ...ndlers/IsElementDisplayedCommandHandler.h
diff --git a/...Handlers/IsElementEnabledCommandHandler.h → ...Handlers/IsElementEnabledCommandHandler.h b/...Handlers/IsElementEnabledCommandHandler.h → ...Handlers/IsElementEnabledCommandHandler.h
diff --git a/...andlers/IsElementSelectedCommandHandler.h → ...andlers/IsElementSelectedCommandHandler.h b/...andlers/IsElementSelectedCommandHandler.h → ...andlers/IsElementSelectedCommandHandler.h
diff --git a/...ndHandlers/MaximizeWindowCommandHandler.h → ...ndHandlers/MaximizeWindowCommandHandler.h b/...ndHandlers/MaximizeWindowCommandHandler.h → ...ndHandlers/MaximizeWindowCommandHandler.h
diff --git a/...dHandlers/MouseButtonDownCommandHandler.h → ...dHandlers/MouseButtonDownCommandHandler.h b/...dHandlers/MouseButtonDownCommandHandler.h → ...dHandlers/MouseButtonDownCommandHandler.h
diff --git a/...andHandlers/MouseButtonUpCommandHandler.h → ...andHandlers/MouseButtonUpCommandHandler.h b/...andHandlers/MouseButtonUpCommandHandler.h → ...andHandlers/MouseButtonUpCommandHandler.h
diff --git a/...ommandHandlers/MouseClickCommandHandler.h → ...ommandHandlers/MouseClickCommandHandler.h b/...ommandHandlers/MouseClickCommandHandler.h → ...ommandHandlers/MouseClickCommandHandler.h
diff --git a/...Handlers/MouseDoubleClickCommandHandler.h → ...Handlers/MouseDoubleClickCommandHandler.h b/...Handlers/MouseDoubleClickCommandHandler.h → ...Handlers/MouseDoubleClickCommandHandler.h
diff --git a/...mmandHandlers/MouseMoveToCommandHandler.h → ...mmandHandlers/MouseMoveToCommandHandler.h b/...mmandHandlers/MouseMoveToCommandHandler.h → ...mmandHandlers/MouseMoveToCommandHandler.h
diff --git a/...ommandHandlers/NewSessionCommandHandler.h → ...ommandHandlers/NewSessionCommandHandler.h b/...ommandHandlers/NewSessionCommandHandler.h → ...ommandHandlers/NewSessionCommandHandler.h
diff --git a/...iver/CommandHandlers/QuitCommandHandler.h → ...iver/CommandHandlers/QuitCommandHandler.h b/...iver/CommandHandlers/QuitCommandHandler.h → ...iver/CommandHandlers/QuitCommandHandler.h
diff --git a/...r/CommandHandlers/RefreshCommandHandler.h → ...r/CommandHandlers/RefreshCommandHandler.h b/...r/CommandHandlers/RefreshCommandHandler.h → ...r/CommandHandlers/RefreshCommandHandler.h
diff --git a/...ommandHandlers/ScreenshotCommandHandler.h → ...ommandHandlers/ScreenshotCommandHandler.h b/...ommandHandlers/ScreenshotCommandHandler.h → ...ommandHandlers/ScreenshotCommandHandler.h
diff --git a/.../CommandHandlers/SendKeysCommandHandler.h → .../CommandHandlers/SendKeysCommandHandler.h b/.../CommandHandlers/SendKeysCommandHandler.h → .../CommandHandlers/SendKeysCommandHandler.h
diff --git a/...s/SendKeysToActiveElementCommandHandler.h → ...s/SendKeysToActiveElementCommandHandler.h b/...s/SendKeysToActiveElementCommandHandler.h → ...s/SendKeysToActiveElementCommandHandler.h
diff --git a/...dHandlers/SendKeysToAlertCommandHandler.h → ...dHandlers/SendKeysToAlertCommandHandler.h b/...dHandlers/SendKeysToAlertCommandHandler.h → ...dHandlers/SendKeysToAlertCommandHandler.h
diff --git a/...ers/SetAsyncScriptTimeoutCommandHandler.h → ...ers/SetAsyncScriptTimeoutCommandHandler.h b/...ers/SetAsyncScriptTimeoutCommandHandler.h → ...ers/SetAsyncScriptTimeoutCommandHandler.h
diff --git a/...rs/SetImplicitWaitTimeoutCommandHandler.h → ...rs/SetImplicitWaitTimeoutCommandHandler.h b/...rs/SetImplicitWaitTimeoutCommandHandler.h → ...rs/SetImplicitWaitTimeoutCommandHandler.h
diff --git a/...ommandHandlers/SetTimeoutCommandHandler.h → ...ommandHandlers/SetTimeoutCommandHandler.h b/...ommandHandlers/SetTimeoutCommandHandler.h → ...ommandHandlers/SetTimeoutCommandHandler.h
diff --git a/...andlers/SetWindowPositionCommandHandler.h → ...andlers/SetWindowPositionCommandHandler.h b/...andlers/SetWindowPositionCommandHandler.h → ...andlers/SetWindowPositionCommandHandler.h
diff --git a/...andHandlers/SetWindowSizeCommandHandler.h → ...andHandlers/SetWindowSizeCommandHandler.h b/...andHandlers/SetWindowSizeCommandHandler.h → ...andHandlers/SetWindowSizeCommandHandler.h
diff --git a/...andHandlers/SubmitElementCommandHandler.h → ...andHandlers/SubmitElementCommandHandler.h b/...andHandlers/SubmitElementCommandHandler.h → ...andHandlers/SubmitElementCommandHandler.h
diff --git a/...andHandlers/SwitchToFrameCommandHandler.h → ...andHandlers/SwitchToFrameCommandHandler.h b/...andHandlers/SwitchToFrameCommandHandler.h → ...andHandlers/SwitchToFrameCommandHandler.h
diff --git a/...ndHandlers/SwitchToWindowCommandHandler.h → ...ndHandlers/SwitchToWindowCommandHandler.h b/...ndHandlers/SwitchToWindowCommandHandler.h → ...ndHandlers/SwitchToWindowCommandHandler.h
diff --git a/cpp/IEDriver/DocumentHost.cpp → cpp/iedriver/DocumentHost.cpp b/cpp/IEDriver/DocumentHost.cpp → cpp/iedriver/DocumentHost.cpp
diff --git a/cpp/IEDriver/DocumentHost.h → cpp/iedriver/DocumentHost.h b/cpp/IEDriver/DocumentHost.h → cpp/iedriver/DocumentHost.h
diff --git a/cpp/IEDriver/Element.cpp → cpp/iedriver/Element.cpp b/cpp/IEDriver/Element.cpp → cpp/iedriver/Element.cpp
diff --git a/cpp/IEDriver/Element.h → cpp/iedriver/Element.h b/cpp/IEDriver/Element.h → cpp/iedriver/Element.h
diff --git a/cpp/IEDriver/ElementFinder.cpp → cpp/iedriver/ElementFinder.cpp b/cpp/IEDriver/ElementFinder.cpp → cpp/iedriver/ElementFinder.cpp
diff --git a/cpp/IEDriver/ElementFinder.h → cpp/iedriver/ElementFinder.h b/cpp/IEDriver/ElementFinder.h → cpp/iedriver/ElementFinder.h
diff --git a/cpp/IEDriver/ElementRepository.cpp → cpp/iedriver/ElementRepository.cpp b/cpp/IEDriver/ElementRepository.cpp → cpp/iedriver/ElementRepository.cpp
diff --git a/cpp/IEDriver/ElementRepository.h → cpp/iedriver/ElementRepository.h b/cpp/IEDriver/ElementRepository.h → cpp/iedriver/ElementRepository.h
diff --git a/cpp/IEDriver/Generated/atoms.h → cpp/iedriver/Generated/atoms.h b/cpp/IEDriver/Generated/atoms.h → cpp/iedriver/Generated/atoms.h
diff --git a/cpp/IEDriver/Generated/cookies.h → cpp/iedriver/Generated/cookies.h b/cpp/IEDriver/Generated/cookies.h → cpp/iedriver/Generated/cookies.h
diff --git a/cpp/IEDriver/Generated/sizzle.h → cpp/iedriver/Generated/sizzle.h b/cpp/IEDriver/Generated/sizzle.h → cpp/iedriver/Generated/sizzle.h
diff --git a/cpp/IEDriver/HtmlDialog.cpp → cpp/iedriver/HtmlDialog.cpp b/cpp/IEDriver/HtmlDialog.cpp → cpp/iedriver/HtmlDialog.cpp
diff --git a/cpp/IEDriver/HtmlDialog.h → cpp/iedriver/HtmlDialog.h b/cpp/IEDriver/HtmlDialog.h → cpp/iedriver/HtmlDialog.h
diff --git a/cpp/IEDriver/IECommandExecutor.cpp → cpp/iedriver/IECommandExecutor.cpp b/cpp/IEDriver/IECommandExecutor.cpp → cpp/iedriver/IECommandExecutor.cpp
diff --git a/cpp/IEDriver/IECommandExecutor.h → cpp/iedriver/IECommandExecutor.h b/cpp/IEDriver/IECommandExecutor.h → cpp/iedriver/IECommandExecutor.h
diff --git a/cpp/IEDriver/IECommandHandler.cpp → cpp/iedriver/IECommandHandler.cpp b/cpp/IEDriver/IECommandHandler.cpp → cpp/iedriver/IECommandHandler.cpp
diff --git a/cpp/IEDriver/IECommandHandler.h → cpp/iedriver/IECommandHandler.h b/cpp/IEDriver/IECommandHandler.h → cpp/iedriver/IECommandHandler.h
diff --git a/cpp/IEDriver/IEDriver.def → cpp/iedriver/IEDriver.def b/cpp/IEDriver/IEDriver.def → cpp/iedriver/IEDriver.def
diff --git a/cpp/IEDriver/IEDriver.vcxproj → cpp/iedriver/IEDriver.vcxproj b/cpp/IEDriver/IEDriver.vcxproj → cpp/iedriver/IEDriver.vcxproj
diff --git a/cpp/IEDriver/IEDriver.vcxproj.filters → cpp/iedriver/IEDriver.vcxproj.filters b/cpp/IEDriver/IEDriver.vcxproj.filters → cpp/iedriver/IEDriver.vcxproj.filters
diff --git a/cpp/IEDriver/IEServer.cpp → cpp/iedriver/IEServer.cpp b/cpp/IEDriver/IEServer.cpp → cpp/iedriver/IEServer.cpp
diff --git a/cpp/IEDriver/IEServer.h → cpp/iedriver/IEServer.h b/cpp/IEDriver/IEServer.h → cpp/iedriver/IEServer.h
diff --git a/cpp/IEDriver/IESession.cpp → cpp/iedriver/IESession.cpp b/cpp/IEDriver/IESession.cpp → cpp/iedriver/IESession.cpp
diff --git a/cpp/IEDriver/IESession.h → cpp/iedriver/IESession.h b/cpp/IEDriver/IESession.h → cpp/iedriver/IESession.h
diff --git a/cpp/IEDriver/InputManager.cpp → cpp/iedriver/InputManager.cpp b/cpp/IEDriver/InputManager.cpp → cpp/iedriver/InputManager.cpp
diff --git a/cpp/IEDriver/InputManager.h → cpp/iedriver/InputManager.h b/cpp/IEDriver/InputManager.h → cpp/iedriver/InputManager.h
diff --git a/cpp/IEDriver/LocationInfo.h → cpp/iedriver/LocationInfo.h b/cpp/IEDriver/LocationInfo.h → cpp/iedriver/LocationInfo.h
diff --git a/cpp/IEDriver/ProxyManager.cpp → cpp/iedriver/ProxyManager.cpp b/cpp/IEDriver/ProxyManager.cpp → cpp/iedriver/ProxyManager.cpp
diff --git a/cpp/IEDriver/ProxyManager.h → cpp/iedriver/ProxyManager.h b/cpp/IEDriver/ProxyManager.h → cpp/iedriver/ProxyManager.h
diff --git a/cpp/IEDriver/RegistryUtilities.cpp → cpp/iedriver/RegistryUtilities.cpp b/cpp/IEDriver/RegistryUtilities.cpp → cpp/iedriver/RegistryUtilities.cpp
diff --git a/cpp/IEDriver/RegistryUtilities.h → cpp/iedriver/RegistryUtilities.h b/cpp/IEDriver/RegistryUtilities.h → cpp/iedriver/RegistryUtilities.h
diff --git a/cpp/IEDriver/Script.cpp → cpp/iedriver/Script.cpp b/cpp/IEDriver/Script.cpp → cpp/iedriver/Script.cpp
diff --git a/cpp/IEDriver/Script.h → cpp/iedriver/Script.h b/cpp/IEDriver/Script.h → cpp/iedriver/Script.h
diff --git a/cpp/IEDriver/StringUtilities.cpp → cpp/iedriver/StringUtilities.cpp b/cpp/IEDriver/StringUtilities.cpp → cpp/iedriver/StringUtilities.cpp
diff --git a/cpp/IEDriver/StringUtilities.h → cpp/iedriver/StringUtilities.h b/cpp/IEDriver/StringUtilities.h → cpp/iedriver/StringUtilities.h
diff --git a/cpp/IEDriver/VariantUtilities.cpp → cpp/iedriver/VariantUtilities.cpp b/cpp/IEDriver/VariantUtilities.cpp → cpp/iedriver/VariantUtilities.cpp
diff --git a/cpp/IEDriver/VariantUtilities.h → cpp/iedriver/VariantUtilities.h b/cpp/IEDriver/VariantUtilities.h → cpp/iedriver/VariantUtilities.h
diff --git a/cpp/IEDriver/WebDriver.cpp → cpp/iedriver/WebDriver.cpp b/cpp/IEDriver/WebDriver.cpp → cpp/iedriver/WebDriver.cpp
diff --git a/cpp/IEDriver/WebDriver.h → cpp/iedriver/WebDriver.h b/cpp/IEDriver/WebDriver.h → cpp/iedriver/WebDriver.h
diff --git a/cpp/IEDriver/messages.h → cpp/iedriver/messages.h b/cpp/IEDriver/messages.h → cpp/iedriver/messages.h
diff --git a/cpp/IEDriver/result_types.txt → cpp/iedriver/result_types.txt b/cpp/IEDriver/result_types.txt → cpp/iedriver/result_types.txt
diff --git a/cpp/IEDriver/stdafx.cpp → cpp/iedriver/stdafx.cpp b/cpp/IEDriver/stdafx.cpp → cpp/iedriver/stdafx.cpp
diff --git a/cpp/IEDriver/stdafx.h → cpp/iedriver/stdafx.h b/cpp/IEDriver/stdafx.h → cpp/iedriver/stdafx.h
diff --git a/cpp/IEDriver/targetver.h → cpp/iedriver/targetver.h b/cpp/IEDriver/targetver.h → cpp/iedriver/targetver.h
diff --git a/cpp/IEDriverServer/CHANGELOG → cpp/iedriverserver/CHANGELOG b/cpp/IEDriverServer/CHANGELOG → cpp/iedriverserver/CHANGELOG
diff --git a/cpp/IEDriverServer/CommandLineArguments.cpp → cpp/iedriverserver/CommandLineArguments.cpp b/cpp/IEDriverServer/CommandLineArguments.cpp → cpp/iedriverserver/CommandLineArguments.cpp
diff --git a/cpp/IEDriverServer/CommandLineArguments.h → cpp/iedriverserver/CommandLineArguments.h b/cpp/IEDriverServer/CommandLineArguments.h → cpp/iedriverserver/CommandLineArguments.h
diff --git a/cpp/IEDriverServer/IEDriverServer.cpp → cpp/iedriverserver/IEDriverServer.cpp b/cpp/IEDriverServer/IEDriverServer.cpp → cpp/iedriverserver/IEDriverServer.cpp
diff --git a/cpp/IEDriverServer/IEDriverServer.rc → cpp/iedriverserver/IEDriverServer.rc b/cpp/IEDriverServer/IEDriverServer.rc → cpp/iedriverserver/IEDriverServer.rc
diff --git a/cpp/IEDriverServer/IEDriverServer.vcxproj → cpp/iedriverserver/IEDriverServer.vcxproj b/cpp/IEDriverServer/IEDriverServer.vcxproj → cpp/iedriverserver/IEDriverServer.vcxproj
diff --git a/...iverServer/IEDriverServer.vcxproj.filters → ...iverserver/IEDriverServer.vcxproj.filters b/...iverServer/IEDriverServer.vcxproj.filters → ...iverserver/IEDriverServer.vcxproj.filters
diff --git a/cpp/iedriverserver/build.desc b/cpp/iedriverserver/build.desc
@@ -0,0 +1,31 @@
+visualc_release(name = "win32",
+  deps = [
+    "//javascript/ie-driver:atoms",
+    ":ie_result_type_cpp",
+    ":sizzle"
+  ],
+  platform = "Win32",
+  project = "IEDriverServer.vcxproj",
+  desc = "InternetExplorerDriver standalone server for 32-bit IE",
+  out = "Win32/Release/IEDriverServer.exe"
+)
+
+visualc_release(name = "x64",
+  deps = [
+    "//javascript/ie-driver:atoms",
+    ":ie_result_type_cpp",
+    ":sizzle"
+  ],
+  platform = "x64",
+  project = "IEDriverServer.vcxproj",
+  desc = "InternetExplorerDriver standalone server for 64-bit IE",
+  out = "x64/Release/IEDriverServer.exe"
+)
+
+rake_task(name = "sizzle",
+  task_name = "sizzle_header",
+  out = "cpp/IEDriver/Generated/sizzle.h")
+
+rake_task(name = "ie_result_type_cpp",
+  task_name = "ie_result_type_cpp",
+  out = "cpp/IEDriver/Generated/IEReturnTypes.h")
diff --git a/cpp/IEDriverServer/resource.h → cpp/iedriverserver/resource.h b/cpp/IEDriverServer/resource.h → cpp/iedriverserver/resource.h
diff --git a/cpp/IEDriverServer/stdafx.cpp → cpp/iedriverserver/stdafx.cpp b/cpp/IEDriverServer/stdafx.cpp → cpp/iedriverserver/stdafx.cpp
diff --git a/cpp/IEDriverServer/stdafx.h → cpp/iedriverserver/stdafx.h b/cpp/IEDriverServer/stdafx.h → cpp/iedriverserver/stdafx.h
diff --git a/cpp/IEDriverServer/targetver.h → cpp/iedriverserver/targetver.h b/cpp/IEDriverServer/targetver.h → cpp/iedriverserver/targetver.h
diff --git a/cpp/webdriver-firefox/build.desc b/cpp/webdriver-firefox/build.desc
@@ -0,0 +1,34 @@
+visualc_library(name = "firefox",
+  platform = "Win32",
+  project = "webdriver-firefox.vcxproj",
+  file_deps = "third_party/gecko-2/win32",
+  out = "Win32/Release/webdriver-firefox.dll"
+)
+
+visualc_library(name = "previous_esr",
+  platform = "Win32",
+  project = "webdriver-firefox-esr-previous.vcxproj",
+  file_deps = "third_party/gecko-10/win32",
+  out = "Win32/Release/webdriver-firefox-esr-previous.dll"
+)
+
+visualc_library(name = "latest_esr",
+  platform = "Win32",
+  project = "webdriver-firefox-esr-latest.vcxproj",
+  file_deps = "third_party/gecko-17/win32",
+  out = "Win32/Release/webdriver-firefox-esr-latest.dll"
+)
+
+visualc_library(name = "previous",
+  platform = "Win32",
+  project = "webdriver-firefox-previous.vcxproj",
+  file_deps = "third_party/gecko-22/win32",
+  out = "Win32/Release/webdriver-firefox-previous.dll"
+)
+
+visualc_library(name = "latest",
+  platform = "Win32",
+  project = "webdriver-firefox-latest.vcxproj",
+  file_deps = "third_party/gecko-23/win32",
+  out = "Win32/Release/webdriver-firefox-latest.dll"
+)
diff --git a/java/client/src/org/openqa/selenium/ie/build.desc b/java/client/src/org/openqa/selenium/ie/build.desc
@@ -2,7 +2,7 @@
 java_library(name = "ie",
   srcs  = [ "*.java" ],
   deps = [
-    "//cpp:sizzle",
+    "//cpp/iedriverserver:sizzle",
     "//java/client/src/org/openqa/selenium/browserlaunchers:windows_proxy_manager",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote",

diff --git a/javascript/firefox-driver/build.desc b/javascript/firefox-driver/build.desc
@@ -48,11 +48,11 @@ mozilla_extension(name = "webdriver",
     "//cpp:native_ime_xpt",
   ],
   resources = [
-    { "//cpp:firefox_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox.dll" },
-    { "//cpp:firefoxprevious_esr_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
-    { "//cpp:firefoxlatest_esr_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
-    { "//cpp:firefoxprevious_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
-    { "//cpp:firefoxlatest_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
+    { "//cpp/webdriver-firefox:firefox" : "platform/WINNT_x86-msvc/components/webdriver-firefox.dll" },
+    { "//cpp/webdriver-firefox:previous_esr" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
+    { "//cpp/webdriver-firefox:latest_esr" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
+    { "//cpp/webdriver-firefox:previous" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
+    { "//cpp/webdriver-firefox:latest" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
     { "//cpp:imehandler_dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" },
     { "//cpp:webdriver_firefox_ff3" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-ff3.so" },
     { "//cpp:webdriver_firefox_esr_previous" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },

diff --git a/rake-tasks/crazy_fun/mappings/visualstudio.rb b/rake-tasks/crazy_fun/mappings/visualstudio.rb
@@ -648,7 +648,7 @@ def get_version(dir)
 module CrazyFunVisualC
   class VisualCLibrary < Tasks
     def handle(fun, dir, args)
-      full_path = File.join("build", dir, args[:out])
+      full_path = File.join("build/cpp", args[:out])
       desc_path = full_path.gsub("/", Platform.dir_separator)
       desc "Build #{desc_path}"