Fix .bat launchers (#811)

Fixes #801
google · Dec 10, 2019 · 61bdedc · 61bdedc
1 parent fc0c754
commit 61bdedc
Show file tree

Hide file tree

Showing 20 changed files with 221 additions and 141 deletions.
diff --git a/build/travis/python-launch.bat b/build/travis/python-launch.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 %*
   ) ELSE (
-    python %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 %*
+    ) ELSE (
+      python %*
+    )
   )
 )
diff --git a/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/fake_compiler.bat b/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/fake_compiler.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/interestingness_test.bat b/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/interestingness_test.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/weak_interestingness_test.bat b/graphicsfuzz/src/main/scripts/examples/glsl-reduce-walkthrough/weak_interestingness_test.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/backtrace-summary.bat b/python/src/main/python/drivers/backtrace-summary.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/gapidfuzz.bat b/python/src/main/python/drivers/gapidfuzz.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/glsl-generate.bat b/python/src/main/python/drivers/glsl-generate.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/glsl-reduce.bat b/python/src/main/python/drivers/glsl-reduce.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/glsl-server.bat b/python/src/main/python/drivers/glsl-server.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/glsl-to-spv-worker.bat b/python/src/main/python/drivers/glsl-to-spv-worker.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/graphicsfuzz-piglit-converter.bat b/python/src/main/python/drivers/graphicsfuzz-piglit-converter.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
-)
+)
diff --git a/python/src/main/python/drivers/graphicsfuzz-tool.bat b/python/src/main/python/drivers/graphicsfuzz-tool.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/inspect-compute-results.bat b/python/src/main/python/drivers/inspect-compute-results.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/knownvalue-shader-generator.bat b/python/src/main/python/drivers/knownvalue-shader-generator.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )
diff --git a/python/src/main/python/drivers/piglit-worker.bat b/python/src/main/python/drivers/piglit-worker.bat
@@ -16,14 +16,18 @@
 @REM  limitations under the License.
 @REM
 
-where /q py
-IF ERRORLEVEL 0 (
-  py -3 "%~dpn0.py" %*
+IF DEFINED PYTHON_GF (
+  "%PYTHON_GF%" "%~dpn0.py" %*
 ) ELSE (
-  where /q python3
-  IF ERRORLEVEL 0 (
-    python3 "%~dpn0.py" %*
+  where /q py
+  IF %ERRORLEVEL% EQU 0 (
+    py -3 "%~dpn0.py" %*
   ) ELSE (
-    python "%~dpn0.py" %*
+    where /q python3
+    IF %ERRORLEVEL% EQU 0 (
+      python3 "%~dpn0.py" %*
+    ) ELSE (
+      python "%~dpn0.py" %*
+    )
   )
 )