Commit c359853b authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 28573: Include all locales in Android testbuild

parent 9ec8d7fb
...@@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild ...@@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild
The testbuild makefile target allows you to do a build quickly in the The testbuild makefile target allows you to do a build quickly in the
testbuild directory, skipping the generation of all the locales and the testbuild directory, skipping the generation of all the locales and the
mar files. This is useful during development. .mar files. This is useful during development.
In the case of Android builds, we are generating a multi-locale apk,
contrary to the desktop builds where we have one bundle for each locale.
Removing locales in a multi-locale bundle does not make a significant
difference in build time, therefore we still include all the locales in
the Android testbuild. There are also no .mar files generated in the
Android builds, so currently, in the Android case, the only difference
introduced by the testbuild target is the output directory.
By default the testbuild is based on the alpha build. All the options By default the testbuild is based on the alpha build. All the options
can have a different definition for the alpha, release and nightly builds. can have a different definition for the alpha, release and nightly builds.
......
...@@ -209,7 +209,8 @@ popd ...@@ -209,7 +209,8 @@ popd
# Prepare our language packs for using the proper search engines and embed # Prepare our language packs for using the proper search engines and embed
# our default bookmarks. See bugs 18915 and 21879 for more details. # our default bookmarks. See bugs 18915 and 21879 for more details.
[% FOREACH lang = c('var/locales') %] [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
[% FOREACH lang = locales %]
[% SET lang = tmpl(lang); [% SET lang = tmpl(lang);
SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi';
%] %]
...@@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ ...@@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
# If we did not create a multi-lingual package above, create a package for # If we did not create a multi-lingual package above, create a package for
# each locale. # each locale.
[% IF ! c("var/multi_lingual") %] [% IF ! c("var/multi_lingual") %]
[% FOREACH lang = c('var/locales') %] [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
[% FOREACH lang = locales %]
[% SET lang = tmpl(lang); [% SET lang = tmpl(lang);
SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi';
SET tbdir = '$distdir/tor-browser_' _ lang; SET tbdir = '$distdir/tor-browser_' _ lang;
......
...@@ -58,7 +58,7 @@ input_files: ...@@ -58,7 +58,7 @@ input_files:
enable: '[% ! c("var/android") %]' enable: '[% ! c("var/android") %]'
- project: firefox-langpacks - project: firefox-langpacks
name: firefox-langpacks name: firefox-langpacks
enable: '[% c("var/locales").size && ! c("var/android") %]' enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
- project: tor-launcher - project: tor-launcher
name: tor-launcher name: tor-launcher
enable: '[% ! c("var/android") %]' enable: '[% ! c("var/android") %]'
......
...@@ -136,8 +136,7 @@ targets: ...@@ -136,8 +136,7 @@ targets:
- alpha - alpha
testbuild: testbuild:
var: var:
# To make build faster, don't build any locale testbuild: 1
locales: []
# Don't create mar files to save time # Don't create mar files to save time
build_mar: 0 build_mar: 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment