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.

Author: jimevans

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

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")

cpp/IEDriver/Alert.cpp renamed to cpp/iedriver/Alert.cpp

@@ -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")

cpp/IEDriver/Alert.h renamed to cpp/iedriver/Alert.h

@@ -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"
+)

cpp/IEDriver/AsyncScriptExecutor.cpp renamed to cpp/iedriver/AsyncScriptExecutor.cpp

@@ -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",

cpp/IEDriver/AsyncScriptExecutor.h renamed to cpp/iedriver/AsyncScriptExecutor.h

@@ -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" },

cpp/IEDriver/Browser.cpp renamed to cpp/iedriver/Browser.cpp

@@ -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}"