Skip to content

Commit ac525db

Browse files
committed
Work around slash escaping weirdness for non-Windows Visual Studio
1 parent fd9d556 commit ac525db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dotnet/src/webdriver/WebDriver.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</Target>
119119

120120
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildSystem)' == 'visual-studio' And '$(OS)' != 'Windows_NT'">
121-
<Exec Command="for platform_dir in net45; do&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; ]; then&#xD;&#xA; echo Found IE 32-bit native binary, copying from Win32 build target $(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; > /dev/null&#xD;&#xA; else&#xD;&#xA; echo Missing IE 32-bit native binary, copying from Win32 prebuilt location $(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; > /dev/null&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; ]; then&#xD;&#xA; echo Copying Firefox extension from $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; &quot;$(TargetDir)../$platform_dir&quot; > /dev/null&#xD;&#xA; else&#xD;&#xA; echo WARN: No Firefox extension found at $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; echo Copying Firefox preferences file from $(ProjectDir)../../../javascript/firefox-driver/webdriver.json&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../javascript/firefox-driver/webdriver.json&quot; &quot;$(TargetDir)../$platform_dir&quot; > /dev/null&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; ]; then&#xD;&#xA; echo Building getAttribute atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; &quot;./go&quot; //javascript/webdriver/atoms:get-attribute&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying getAttribute atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; > /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found getAttribute atom at $(TargetDir)../$platform_dir/getAttribute.js.&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; ]; then&#xD;&#xA; echo Building isDisplayed atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; &quot;./go&quot; //javascript/atoms/fragments:is-displayed&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying isDisplayed atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; > /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found isDisplayed atom at $(TargetDir)../$platform_dir/isDisplayed.js.&#xD;&#xA; fi&#xD;&#xA;done" />
121+
<Exec Command="js_target_location=//javascript&#xD;&#xA;for platform_dir in net45; do&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; ]; then&#xD;&#xA; echo Found IE 32-bit native binary, copying from Win32 build target $(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Missing IE 32-bit native binary, copying from Win32 prebuilt location $(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; ]; then&#xD;&#xA; echo Copying Firefox extension from $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo WARN: No Firefox extension found at $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; echo Copying Firefox preferences file from $(ProjectDir)../../../javascript/firefox-driver/webdriver.json&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../javascript/firefox-driver/webdriver.json&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; ]; then&#xD;&#xA; echo Building getAttribute atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; &quot;./go&quot; $js_target_location/webdriver/atoms:get-attribute&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying getAttribute atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found getAttribute atom at $(TargetDir)../$platform_dir/getAttribute.js.&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; ]; then&#xD;&#xA; echo Building isDisplayed atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; &quot;./go&quot; $js_target_location/atoms/fragments:is-displayed&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying isDisplayed atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found isDisplayed atom at $(TargetDir)../$platform_dir/isDisplayed.js.&#xD;&#xA; fi&#xD;&#xA;done" />
122122
</Target>
123123

124124
</Project>

dotnet/test/common/WebDriver.Common.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Target>
5858

5959
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
60-
<Exec Command="for platform_dir in net45; do&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; ]; then&#xD;&#xA; echo Found IE 32-bit native binary, copying from Win32 build target $(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&#xD;&#xA;&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; &quot;$(TargetDir)../&#xD;&#xA;$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Missing IE 32-bit native binary, copying from Win32 prebuilt location $(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; ]; then&#xD;&#xA; echo Copying Firefox extension from $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo WARN: No Firefox extension found at $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; echo Copying Firefox preferences file from $(ProjectDir)../../../javascript/firefox-driver/webdriver.json&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../javascript/firefox-driver/webdriver.json&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; ]; then&#xD;&#xA; echo Building getAttribute atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; sh &quot;./go&quot; //javascript/webdriver/atoms:get-attribute&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying getAttribute atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found getAttribute atom at $(TargetDir)../$platform_dir/getAttribute.js.&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; ]; then&#xD;&#xA; echo Building isDisplayed atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; sh &quot;./go&quot; //javascript/atoms/fragments:is-displayed&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying isDisplayed atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found isDisplayed atom at $(TargetDir)../$platform_dir/isDisplayed.js.&#xD;&#xA; fi&#xD;&#xA;done" />
60+
<Exec Command="js_target_location=//javascript&#xD;&#xA;for platform_dir in net45; do&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; ]; then&#xD;&#xA; echo Found IE 32-bit native binary, copying from Win32 build target $(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&#xD;&#xA;&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../build/cpp/Win32/$(ConfigurationName)/IEDriverServer.exe&quot; &quot;$(TargetDir)../&#xD;&#xA;$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Missing IE 32-bit native binary, copying from Win32 prebuilt location $(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../cpp/prebuilt/Win32/Release/IEDriverServer.exe&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; ]; then&#xD;&#xA; echo Copying Firefox extension from $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo WARN: No Firefox extension found at $(ProjectDir)../../../buck-out/gen/javascript/firefox-driver/webdriver/webdriver.xpi&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; echo Copying Firefox preferences file from $(ProjectDir)../../../javascript/firefox-driver/webdriver.json&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../javascript/firefox-driver/webdriver.json&quot; &quot;$(TargetDir)../$platform_dir&quot; &gt; /dev/null&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; ]; then&#xD;&#xA; echo Building getAttribute atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; sh &quot;./go&quot; js_target_location/webdriver/atoms:get-attribute&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying getAttribute atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/webdriver/atoms/get-attribute.js&quot; &quot;$(TargetDir)../$platform_dir/getAttribute.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found getAttribute atom at $(TargetDir)../$platform_dir/getAttribute.js.&#xD;&#xA; fi&#xD;&#xA;&#xD;&#xA; if [ ! -f &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; ]; then&#xD;&#xA; if [ ! -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; ]; then&#xD;&#xA; echo Building isDisplayed atom&#xD;&#xA; pushd &quot;$(ProjectDir)../../..&quot;&#xD;&#xA; sh &quot;./go&quot; js_target_location/atoms/fragments:is-displayed&#xD;&#xA; popd&#xD;&#xA; fi&#xD;&#xA; echo Copying isDisplayed atom&#xD;&#xA; cp -f &quot;$(ProjectDir)../../../buck-out/gen/javascript/atoms/fragments/is-displayed.js&quot; &quot;$(TargetDir)../$platform_dir/isDisplayed.js&quot; &gt; /dev/null&#xD;&#xA; else&#xD;&#xA; echo Found isDisplayed atom at $(TargetDir)../$platform_dir/isDisplayed.js.&#xD;&#xA; fi&#xD;&#xA;done" />
6161
</Target>
6262

6363
</Project>

0 commit comments

Comments
 (0)