Updating BUCK build files for .NET bindings

wgoyer · Mar 2, 2018 · 5d88c7b · 5d88c7b
1 parent 176b4a9
commit 5d88c7b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/dotnet/src/support/BUCK b/dotnet/src/support/BUCK
@@ -46,8 +46,9 @@ genrule(
     '(if not exist %OUT% mkdir %OUT%) && ' +
     'for %%G in (%SRCS%) do (' +
       'set target_dir=%%G&& ' +
+      'set platform_dir=%%G\\..&& ' +
       'for %%H in (!target_dir!) do (' +
-        'set platform_moniker=%%~nxH&& ' +
+        'for %%I in (!platform_dir!) do set platform_moniker=%%~nxI&& ' +
         '(if not exist %OUT%\\!platform_moniker! mkdir %OUT%\\!platform_moniker!) && ' +
         'copy !target_dir!\\WebDriver.Support.dll %OUT%\\!platform_moniker! &&' +
         'copy !target_dir!\\WebDriver.Support.xml %OUT%\\!platform_moniker!' +
@@ -105,8 +106,10 @@ genrule(
     '(if not exist %OUT% mkdir %OUT%) && ' +
     'for %%G in (%SRCS%) do (' +
       'set target_dir=%%G&& ' +
+      'set platform_dir=%%G\\..&& ' +
       'for %%H in (!target_dir!) do (' +
-        'set platform_moniker=%%~nxH&& ' +
+        'for %%I in (!platform_dir!) do set full_platform_moniker=%%~nxI&& ' +
+        'for /f "delims=_" %%J in (\"!full_platform_moniker!\") do set platform_moniker=%%J&& ' +
         '(if not exist %OUT%\\!platform_moniker! mkdir %OUT%\\!platform_moniker!) && ' +
         'copy !target_dir!\\WebDriver.Support.dll %OUT%\\!platform_moniker! &&' +
         'copy !target_dir!\\WebDriver.Support.xml %OUT%\\!platform_moniker!' +

diff --git a/dotnet/src/webdriver/BUCK b/dotnet/src/webdriver/BUCK
@@ -137,8 +137,10 @@ genrule(
     '(if not exist %OUT% mkdir %OUT%) && ' +
     'for %%G in (%SRCS%) do (' +
       'set target_dir=%%G&& ' +
+      'set platform_dir=%%G\\..&& ' +
       'for %%H in (!target_dir!) do (' +
-        'set platform_moniker=%%~nxH&& ' +
+        'for %%I in (!platform_dir!) do set full_platform_moniker=%%~nxI&& ' +
+        'for /f "delims=_" %%J in (\"!full_platform_moniker!\") do set platform_moniker=%%J&& ' +
         'if \"!platform_moniker!\"==\"netstandard2.0\" (' +
           '(if not exist %OUT%\\!platform_moniker! mkdir %OUT%\\!platform_moniker!) && ' +
           'copy !target_dir!\\WebDriver.dll %OUT%\\!platform_moniker! &&' +

diff --git a/dotnet/src/webdriverbackedselenium/BUCK b/dotnet/src/webdriverbackedselenium/BUCK
@@ -46,8 +46,9 @@ genrule(
     '(if not exist %OUT% mkdir %OUT%) && ' +
     'for %%G in (%SRCS%) do (' +
       'set target_dir=%%G&& ' +
+      'set platform_dir=%%G\\..&& ' +
       'for %%H in (!target_dir!) do (' +
-        'set platform_moniker=%%~nxH&& ' +
+        'for %%I in (!platform_dir!) do set platform_moniker=%%~nxI&& ' +
         '(if not exist %OUT%\\!platform_moniker! mkdir %OUT%\\!platform_moniker!) && ' +
         'copy !target_dir!\\Selenium.WebDriverBackedSelenium.dll %OUT%\\!platform_moniker! &&' +
         'copy !target_dir!\\Selenium.WebDriverBackedSelenium.xml %OUT%\\!platform_moniker!' +
@@ -105,8 +106,10 @@ genrule(
     '(if not exist %OUT% mkdir %OUT%) && ' +
     'for %%G in (%SRCS%) do (' +
       'set target_dir=%%G&& ' +
+      'set platform_dir=%%G\\..&& ' +
       'for %%H in (!target_dir!) do (' +
-        'set platform_moniker=%%~nxH&& ' +
+        'for %%I in (!platform_dir!) do set full_platform_moniker=%%~nxI&& ' +
+        'for /f \"delims=_\" %%J in (\"!full_platform_moniker!\") do set platform_moniker=%%J&& ' +
         '(if not exist %OUT%\\!platform_moniker! mkdir %OUT%\\!platform_moniker!) && ' +
         'copy !target_dir!\\Selenium.WebDriverBackedSelenium.dll %OUT%\\!platform_moniker! &&' +
         'copy !target_dir!\\Selenium.WebDriverBackedSelenium.xml %OUT%\\!platform_moniker!' +