Bug 1527796 - Part 3. Use gradlew.bat on Windows. r=nalexander
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 26 Feb 2019 11:06:12 +0900
changeset 466663 230ed445be2c2413cf3dff9a6db8e64eafda4ab4
parent 466662 440350958e77ea77422d48538416a113c1e3d888
child 466664 3f50c0fa29d8fdc07cb57d79fe971f4b6394d5c5
push id112593
push userm_kato@ga2.so-net.ne.jp
push dateFri, 29 Mar 2019 09:12:58 +0000
treeherdermozilla-inbound@6e20e4acf4e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1527796
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1527796 - Part 3. Use gradlew.bat on Windows. r=nalexander There is gradlew.bat to run gradle on Windows, so we should use it. Differential Revision: https://phabricator.services.mozilla.com/D20451
gradlew.bat
mobile/android/gradle.configure
new file mode 100644
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/mobile/android/gradle.configure
+++ b/mobile/android/gradle.configure
@@ -17,21 +17,25 @@ def with_gradle(value):
     if not value:
         die('Building --without-gradle is no longer supported: '
             'see https://bugzilla.mozilla.org/show_bug.cgi?id=1414415.')
 
     if value:
         return True
 
 
-@depends('--with-gradle', check_build_environment)
+@depends(host, '--with-gradle', check_build_environment)
 @imports(_from='os.path', _import='isfile')
-def gradle(value, build_env):
-    gradle = value[0] if len(value) else \
-        os.path.join(build_env.topsrcdir, 'gradlew')
+def gradle(host, value, build_env):
+    if len(value):
+        gradle = value[0]
+    else:
+        gradle = os.path.join(build_env.topsrcdir, 'gradlew')
+        if host.os == 'WINNT':
+            gradle = gradle + '.bat'
 
     # TODO: verify that $GRADLE is executable.
     if not isfile(gradle):
         die('GRADLE must be executable: %s', gradle)
 
     return gradle
 
 set_config('GRADLE', gradle)