[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40974: Fix firefox-android with the release target.

Title: GitLab

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build

Commits:

  • bf0dfe66
    by Pier Angelo Vendrame at 2023-10-11T09:51:01+02:00 
    Bug 40974: Fix firefox-android with the release target.

In the firefox-android project we look for the geckoview artifacts to
detect its version.
For alpha and nightly its directory incldues the channel, so we were
looking for `geckoview-release-omni`, but for release the directory is
`geckoview-omni` only.

1 changed file:

Changes:

  • projects/firefox-android/build
    ... ... @@ -53,7 +53,12 @@ cd $builddir-[% c('version') %]
    53 53 
     patch -p1 < $rootdir/repos.diff
    54 54 
     sed -i 's|^\(val VERSION = \).*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
    55 55 
     sed -i 's|^\(val CHANNEL = \).*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
    56 
    -gv_version=$(find "$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
    56 
    +[% IF c("var/channel") == "release" -%]
    57 
    +  gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-omni"
    58 
    +[% ELSE -%]
    59 
    +  gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni"
    60 
    +[% END -%]
    61 
    +gv_version=$(find "$gv_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
    57 62 
     sed -i "s|\(\s*const val version = \).*|\1\"$gv_version\"|" android-components/plugins/dependencies/src/main/java/Gecko.kt
    58 63 
     sed -i 's|\(\s*val channel = \).*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt
    59 64

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits