| ... |
... |
@@ -30,7 +30,7 @@ def rootLocalProperties = new File(gradle.mozconfig.topsrcdir, "local.properties |
|
30
|
30
|
[
|
|
31
|
31
|
"autoPublish.application-services.dir",
|
|
32
|
32
|
"autoPublish.glean.dir",
|
|
33
|
|
- "uniffiBindgenNoop.dir",
|
|
|
33
|
+ "uniffiBindgenNoop.executable",
|
|
34
|
34
|
].each { key ->
|
|
35
|
35
|
def relativeOrAbsolutePath = rootLocalProperties."$key"
|
|
36
|
36
|
if (relativeOrAbsolutePath != null) {
|
| ... |
... |
@@ -41,8 +41,8 @@ def rootLocalProperties = new File(gradle.mozconfig.topsrcdir, "local.properties |
|
41
|
41
|
|
|
42
|
42
|
gradle.settingsEvaluated {
|
|
43
|
43
|
if (gradle.hasProperty("localProperties.autoPublish.application-services.dir")) {
|
|
44
|
|
- if (!gradle.hasProperty("localProperties.uniffiBindgenNoop.dir")) {
|
|
45
|
|
- throw new GradleException("Set uniffiBindgenNoop.dir to your local.properties in order to auto publish application-services.")
|
|
|
44
|
+ if (!gradle.hasProperty("localProperties.uniffiBindgenNoop.executable")) {
|
|
|
45
|
+ throw new GradleException("Set uniffiBindgenNoop.executable to your local.properties in order to auto publish application-services.")
|
|
46
|
46
|
}
|
|
47
|
47
|
|
|
48
|
48
|
def appServicesLocalPath = gradle."localProperties.autoPublish.application-services.dir"
|
| ... |
... |
@@ -53,15 +53,15 @@ gradle.settingsEvaluated { |
|
53
|
53
|
if (System.properties["os.name"].toLowerCase().contains("windows")) {
|
|
54
|
54
|
publishAppServicesCmd << "py";
|
|
55
|
55
|
}
|
|
56
|
|
- publishAppServicesCmd << "./automation/publish_to_maven_local_if_modified.py" << gradle."localProperties.uniffiBindgenNoop.dir";
|
|
|
56
|
+ publishAppServicesCmd << "./automation/publish_to_maven_local_if_modified.py" << gradle."localProperties.uniffiBindgenNoop.executable";
|
|
57
|
57
|
runCmd(publishAppServicesCmd, appServicesLocalPath, "Published application-services for local development.", false)
|
|
58
|
58
|
} else {
|
|
59
|
59
|
logger.lifecycle("settings.gradle> Disabled auto-publication of application-services. Enable it by settings 'autoPublish.application-services.dir' in local.properties")
|
|
60
|
60
|
}
|
|
61
|
61
|
|
|
62
|
62
|
if (gradle.hasProperty("localProperties.autoPublish.glean.dir")) {
|
|
63
|
|
- if (!gradle.hasProperty("localProperties.uniffiBindgenNoop.dir")) {
|
|
64
|
|
- throw new GradleException("Set uniffiBindgenNoop.dir to your local.properties in order to auto publish glean.")
|
|
|
63
|
+ if (!gradle.hasProperty("localProperties.uniffiBindgenNoop.executable")) {
|
|
|
64
|
+ throw new GradleException("Set uniffiBindgenNoop.executable to your local.properties in order to auto publish glean.")
|
|
65
|
65
|
}
|
|
66
|
66
|
|
|
67
|
67
|
def gleanLocalPath = gradle."localProperties.autoPublish.glean.dir"
|
| ... |
... |
@@ -74,7 +74,7 @@ gradle.settingsEvaluated { |
|
74
|
74
|
|
|
75
|
75
|
// We do not have a fork of Glean. In order for this to work, on your local
|
|
76
|
76
|
// copy of the Glean repo, modify this python script to accept and use the uniffi-bindgen path.
|
|
77
|
|
- publishGleanCmd << "./build-scripts/publish_to_maven_local_if_modified.py" << gradle."localProperties.uniffiBindgenNoop.dir";
|
|
|
77
|
+ publishGleanCmd << "./build-scripts/publish_to_maven_local_if_modified.py" << gradle."localProperties.uniffiBindgenNoop.executable";
|
|
78
|
78
|
runCmd(publishGleanCmd, gleanLocalPath, "Published Glean for local development.", false)
|
|
79
|
79
|
} else {
|
|
80
|
80
|
logger.lifecycle("settings.gradle> Disabled auto-publication of Glean. Enable it by settings 'autoPublish.glean.dir' in local.properties")
|