blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Allow builds with a local android-components to work on Windows

master
Mark Hammond 2020-02-28 16:36:27 +11:00 committed by Grisha Kruglov
parent f9b716286a
commit 0411233fc3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings.gradle
View File

@ -20,6 +20,10 @@ def runCmd(cmd, workingDir, successMessage) {
return standardOutput return standardOutput
} }
def gradlew = './gradlew'
if (System.properties['os.name'].toLowerCase().contains('windows')) {
gradlew += ".bat"
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Local Development overrides // Local Development overrides
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -55,7 +59,7 @@ if (localProperties != null) {
if (androidComponentsLocalPath != null) { if (androidComponentsLocalPath != null) {
log("Enabling automatic publication of android-components from: $androidComponentsLocalPath") log("Enabling automatic publication of android-components from: $androidComponentsLocalPath")
log("Determining if android-components are up-to-date...") log("Determining if android-components are up-to-date...")
def compileAcCmd = ["./gradlew", "compileReleaseKotlin"] def compileAcCmd = [gradlew, "compileReleaseKotlin"]
def compileOutput = runCmd(compileAcCmd, androidComponentsLocalPath, "Compiled android-components.") def compileOutput = runCmd(compileAcCmd, androidComponentsLocalPath, "Compiled android-components.")
// This is somewhat brittle: parse last line of gradle output, to fish out how many tasks were executed. // This is somewhat brittle: parse last line of gradle output, to fish out how many tasks were executed.
// One executed task means gradle didn't do any work other than executing the top-level 'compile' task. // One executed task means gradle didn't do any work other than executing the top-level 'compile' task.
@ -64,7 +68,7 @@ if (localProperties != null) {
log("android-components are up-to-date, skipping publication.") log("android-components are up-to-date, skipping publication.")
} else { } else {
log("android-components changed, publishing locally...") log("android-components changed, publishing locally...")
def publishAcCmd = ["${androidComponentsLocalPath}/gradlew", "publishToMavenLocal", "-Plocal=true"] def publishAcCmd = ["${androidComponentsLocalPath}/{gradlew}", "publishToMavenLocal", "-Plocal=true"]
runCmd(publishAcCmd, androidComponentsLocalPath, "Published android-components.") runCmd(publishAcCmd, androidComponentsLocalPath, "Published android-components.")
} }
} else { } else {