Index: README.md |
=================================================================== |
--- a/README.md |
+++ b/README.md |
@@ -5,26 +5,26 @@ The Adblock Plus browser, based on Firef |
Building |
-------- |
First ensure that all dependencies are up to date by calling: |
./ensure_dependencies.py |
-Then just follow Mozilla's [Building Fennec][1] guide. |
+Then just follow Mozilla's [Firefox for Android build instructions][1]. |
Creating a multilocale build |
---------------------------- |
### Automation ### |
While the manual process is still documented below, the easiest way to create a |
-multi-locale build is to use: https://bitbucket.org/adblockplus/adblockbrowser-build. |
+multi-locale build is to use [adblockbrowser-build][2]. |
### Preparations ### |
1. Create a folder outside of the Adblock Browser repo, e.g `abb-multi` |
2. Change into `abb-multi` and clone mozharness via: |
hg clone ssh://hg@bitbucket.org/adblockplus/mozharness -r adblockbrowser |
@@ -53,19 +53,19 @@ Apply the following changes to `abb-mult |
The code to remove looks like this: |
"repos": [{ |
"repo": "https://hg.mozilla.org/%s" % REPO_PATH, |
"tag": "default", |
"dest": BUILD_DIR, |
}], |
-* Change `"hg_l10n_tag"` in `config` from `default` to `FENNEC_44_0_2_RELEASE` |
+* Change `"hg_l10n_tag"` in `config` from `default` to `FENNEC_45_0_2_RELEASE` |
* Add `en-ZA` to `ignore_locales` since it isn't currently supported |
-* [Issue #3047][2] introduced a custom build step named `abb-transform-locales` |
+* [Issue #3047][3] introduced a custom build step named `abb-transform-locales` |
for manipulating search engine availability and order. This must be inserted |
into `default_actions` right before `package-multi` |
* You might want to remove the `"backup-objdir"` build step if you do |
not want your objdir to be backed up. Keep in mind that you then need to |
clobber for a single-locale build. |
An example configuration could look like this: |
@@ -94,17 +94,17 @@ An example configuration could look like |
"locales_file": "%s/%s/locales/maemo-locales" % (BUILD_DIR, ANDROID_DIR), |
"locales_dir": "%s/locales" % ANDROID_DIR, |
"ignore_locales": ["en-US", "en-ZA", "multi"], |
"l10n_repos": [{ |
"repo": "https://hg.mozilla.org/build/compare-locales", |
"tag": "RELEASE_AUTOMATION" |
}], |
"hg_l10n_base": "https://hg.mozilla.org/%s" % L10N_REPO_PATH, |
- "hg_l10n_tag": "FENNEC_44_0_2_RELEASE", |
+ "hg_l10n_tag": "FENNEC_45_0_2_RELEASE", |
"l10n_dir": "l10n", |
"merge_locales": True, |
"mozilla_dir": BUILD_DIR, |
"mozconfig": MOZCONFIG, |
"default_actions": [ |
"pull-locale-source", |
"build", |
"package-en-US", |
@@ -120,10 +120,11 @@ An example configuration could look like |
For performing the multilocale build, invoke |
./mozharness/scripts/multil10n.py --cfg abb-multi-cfg.py |
from inside `abb-multi`. The resulting build is located in |
`BUILD_DIR/OBJ_DIR/dist/` |
-[1]: https://wiki.mozilla.org/Mobile/Fennec/Android |
-[2]: https://issues.adblockplus.org/ticket/3047 |
+[1]: https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Simple_Firefox_for_Android_build |
+[2]: https://hg.adblockplus.org/adblockbrowser-build/ |
+[3]: https://issues.adblockplus.org/ticket/3047 |