Dan Ballard pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
5616f8f6 by Dan Ballard at 2025-02-13T16:48:29+00:00
Bug 42669: Add ability for patched application services to take a gradle
property to get path to nimbus-fml binary (for use in local dev builds)
- - - - -
1 changed file:
- projects/application-services/offline-nimbus-fml.diff
Changes:
=====================================
projects/application-services/offline-nimbus-fml.diff
=====================================
@@ -14,7 +14,7 @@ index 67c9e66d0..6dd949c92 100644
import javax.inject.Inject
import groovy.transform.Immutable
-@@ -84,46 +89,13 @@ abstract class NimbusAssembleToolsTask extends DefaultTask
{
+@@ -84,46 +89,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask
{
@TaskAction
void assembleTools() {
@@ -48,8 +48,14 @@ index 67c9e66d0..6dd949c92 100644
- fmlBinary.get().asFile.setExecutable(true)
- }
- visitedFilePaths.add(details.relativePath)
-- }
-- }
++ String nimbusFmlPath = System.getenv("NIMBUS_FML")
++ Path source
++ if (nimbusFmlPath == null) {
++ nimbusFmlPath = System.getProperty("nimbusFml")
++ if (nimbusFmlPath == null) {
++ throw new GradleException("NIMBUS_FML and property nimbusFml
are not defined.")
+ }
+ }
-
- if (visitedFilePaths.empty) {
- throw new GradleException("Couldn't find any files in archive
matching unzip spec: (${unzipSpec.includePatterns.get().collect { "`$it`"
}.join(' | ')})")
@@ -57,11 +63,8 @@ index 67c9e66d0..6dd949c92 100644
-
- if (visitedFilePaths.size() > 1) {
- throw new GradleException("Ambiguous unzip spec matched
${visitedFilePaths.size()} files in archive: ${visitedFilePaths.collect {
"`$it`" }.join(', ')}")
-+ String nimbusFmlPath = System.getenv("NIMBUS_FML");
-+ if (nimbusFmlPath == null) {
-+ throw new GradleException("NIMBUS_FML is not defined.")
- }
-+ Path source = Paths.get(nimbusFmlPath)
+- }
++ source = Paths.get(nimbusFmlPath)
+ Path dest = fmlBinary.get().asFile.toPath()
+ Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING)
}
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5616f8f6d98ed15bf7d375906427323a975546da
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5616f8f6d98ed15bf7d375906427323a975546da
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
