Bug 686637 - Stop extracting hyphenation files from the APK [r=dougt]

This commit is contained in:
Mark Finkle 2011-09-15 13:43:59 -04:00
Родитель eb0081091d
Коммит adf688ddf8
3 изменённых файлов: 52 добавлений и 62 удалений

Просмотреть файл

@ -492,21 +492,11 @@ abstract public class GeckoApp
// copy any .xpi file into an extensions/ directory
Enumeration<? extends ZipEntry> zipEntries = zip.entries();
while (zipEntries.hasMoreElements()) {
ZipEntry entry = zipEntries.nextElement();
if (entry.getName().startsWith("extensions/") && entry.getName().endsWith(".xpi")) {
Log.i("GeckoAppJava", "installing extension : " + entry.getName());
unpackFile(zip, buf, entry, entry.getName());
}
}
// copy any hyphenation dictionaries file into a hyphenation/ directory
Enumeration<? extends ZipEntry> hyphenEntries = zip.entries();
while (hyphenEntries.hasMoreElements()) {
ZipEntry entry = hyphenEntries.nextElement();
if (entry.getName().startsWith("hyphenation/")) {
Log.i("GeckoAppJava", "installing hyphenation : " + entry.getName());
unpackFile(zip, buf, entry, entry.getName());
}
ZipEntry entry = zipEntries.nextElement();
if (entry.getName().startsWith("extensions/") && entry.getName().endsWith(".xpi")) {
Log.i("GeckoAppJava", "installing extension : " + entry.getName());
unpackFile(zip, buf, entry, entry.getName());
}
}
}

Просмотреть файл

@ -90,49 +90,50 @@ HTTP(..) == arabic-shaping-1.html arabic-shaping-1-ref.html
# check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.html
# Tests for hyphenation with -moz-hyphens
== auto-hyphenation-1.html auto-hyphenation-1-ref.html
!= auto-hyphenation-1.html auto-hyphenation-1-notref.html
== auto-hyphenation-1a.html auto-hyphenation-1-ref.html
== auto-hyphenation-2.html auto-hyphenation-2-ref.html
== auto-hyphenation-3.html auto-hyphenation-3-ref.html
== auto-hyphenation-4.html auto-hyphenation-4-ref.html
== auto-hyphenation-5.html auto-hyphenation-5-ref.html
== auto-hyphenation-6.html auto-hyphenation-6-ref.html
== auto-hyphenation-7.html auto-hyphenation-7-ref.html
== auto-hyphenation-af-1.html auto-hyphenation-af-1-ref.html
== auto-hyphenation-bg-1.html auto-hyphenation-bg-1-ref.html
== auto-hyphenation-ca-1.html auto-hyphenation-ca-1-ref.html
== auto-hyphenation-cy-1.html auto-hyphenation-cy-1-ref.html
== auto-hyphenation-da-1.html auto-hyphenation-da-1-ref.html
== auto-hyphenation-de-1901-1.html auto-hyphenation-de-1901-1-ref.html
== auto-hyphenation-de-1996-1.html auto-hyphenation-de-1996-1-ref.html
!= auto-hyphenation-de-1901-1.html auto-hyphenation-de-1996-1.html
== auto-hyphenation-de-ch-1.html auto-hyphenation-de-ch-1-ref.html
== auto-hyphenation-eo-1.html auto-hyphenation-eo-1-ref.html
== auto-hyphenation-es-1.html auto-hyphenation-es-1-ref.html
== auto-hyphenation-et-1.html auto-hyphenation-et-1-ref.html
== auto-hyphenation-fi-1.html auto-hyphenation-fi-1-ref.html
== auto-hyphenation-fr-1.html auto-hyphenation-fr-1-ref.html
== auto-hyphenation-gl-1.html auto-hyphenation-gl-1-ref.html
== auto-hyphenation-hr-1.html auto-hyphenation-hr-1-ref.html
== auto-hyphenation-hsb-1.html auto-hyphenation-hsb-1-ref.html
== auto-hyphenation-hu-1.html auto-hyphenation-hu-1-ref.html
== auto-hyphenation-ia-1.html auto-hyphenation-ia-1-ref.html
== auto-hyphenation-is-1.html auto-hyphenation-is-1-ref.html
== auto-hyphenation-it-1.html auto-hyphenation-it-1-ref.html
== auto-hyphenation-kmr-1.html auto-hyphenation-kmr-1-ref.html
== auto-hyphenation-la-1.html auto-hyphenation-la-1-ref.html
== auto-hyphenation-lt-1.html auto-hyphenation-lt-1-ref.html
== auto-hyphenation-mn-1.html auto-hyphenation-mn-1-ref.html
== auto-hyphenation-nb-1.html auto-hyphenation-nb-1-ref.html
== auto-hyphenation-nl-1.html auto-hyphenation-nl-1-ref.html
== auto-hyphenation-nn-1.html auto-hyphenation-nn-1-ref.html
== auto-hyphenation-pt-1.html auto-hyphenation-pt-1-ref.html
== auto-hyphenation-ru-1.html auto-hyphenation-ru-1-ref.html
== auto-hyphenation-sh-1.html auto-hyphenation-sh-1-ref.html
== auto-hyphenation-sl-1.html auto-hyphenation-sl-1-ref.html
== auto-hyphenation-sr-1.html auto-hyphenation-sr-1-ref.html
== auto-hyphenation-sv-1.html auto-hyphenation-sv-1-ref.html # test swedish patterns
!= auto-hyphenation-sv-1.html auto-hyphenation-sv-1-notref.html # verify swedish != english
== auto-hyphenation-tr-1.html auto-hyphenation-tr-1-ref.html
== auto-hyphenation-uk-1.html auto-hyphenation-uk-1-ref.html
# Android does not ship the hyphenation dictionaries
skip-if(Android) == auto-hyphenation-1.html auto-hyphenation-1-ref.html
skip-if(Android) != auto-hyphenation-1.html auto-hyphenation-1-notref.html
skip-if(Android) == auto-hyphenation-1a.html auto-hyphenation-1-ref.html
skip-if(Android) == auto-hyphenation-2.html auto-hyphenation-2-ref.html
skip-if(Android) == auto-hyphenation-3.html auto-hyphenation-3-ref.html
skip-if(Android) == auto-hyphenation-4.html auto-hyphenation-4-ref.html
skip-if(Android) == auto-hyphenation-5.html auto-hyphenation-5-ref.html
skip-if(Android) == auto-hyphenation-6.html auto-hyphenation-6-ref.html
skip-if(Android) == auto-hyphenation-7.html auto-hyphenation-7-ref.html
skip-if(Android) == auto-hyphenation-af-1.html auto-hyphenation-af-1-ref.html
skip-if(Android) == auto-hyphenation-bg-1.html auto-hyphenation-bg-1-ref.html
skip-if(Android) == auto-hyphenation-ca-1.html auto-hyphenation-ca-1-ref.html
skip-if(Android) == auto-hyphenation-cy-1.html auto-hyphenation-cy-1-ref.html
skip-if(Android) == auto-hyphenation-da-1.html auto-hyphenation-da-1-ref.html
skip-if(Android) == auto-hyphenation-de-1901-1.html auto-hyphenation-de-1901-1-ref.html
skip-if(Android) == auto-hyphenation-de-1996-1.html auto-hyphenation-de-1996-1-ref.html
skip-if(Android) != auto-hyphenation-de-1901-1.html auto-hyphenation-de-1996-1.html
skip-if(Android) == auto-hyphenation-de-ch-1.html auto-hyphenation-de-ch-1-ref.html
skip-if(Android) == auto-hyphenation-eo-1.html auto-hyphenation-eo-1-ref.html
skip-if(Android) == auto-hyphenation-es-1.html auto-hyphenation-es-1-ref.html
skip-if(Android) == auto-hyphenation-et-1.html auto-hyphenation-et-1-ref.html
skip-if(Android) == auto-hyphenation-fi-1.html auto-hyphenation-fi-1-ref.html
skip-if(Android) == auto-hyphenation-fr-1.html auto-hyphenation-fr-1-ref.html
skip-if(Android) == auto-hyphenation-gl-1.html auto-hyphenation-gl-1-ref.html
skip-if(Android) == auto-hyphenation-hr-1.html auto-hyphenation-hr-1-ref.html
skip-if(Android) == auto-hyphenation-hsb-1.html auto-hyphenation-hsb-1-ref.html
skip-if(Android) == auto-hyphenation-hu-1.html auto-hyphenation-hu-1-ref.html
skip-if(Android) == auto-hyphenation-ia-1.html auto-hyphenation-ia-1-ref.html
skip-if(Android) == auto-hyphenation-is-1.html auto-hyphenation-is-1-ref.html
skip-if(Android) == auto-hyphenation-it-1.html auto-hyphenation-it-1-ref.html
skip-if(Android) == auto-hyphenation-kmr-1.html auto-hyphenation-kmr-1-ref.html
skip-if(Android) == auto-hyphenation-la-1.html auto-hyphenation-la-1-ref.html
skip-if(Android) == auto-hyphenation-lt-1.html auto-hyphenation-lt-1-ref.html
skip-if(Android) == auto-hyphenation-mn-1.html auto-hyphenation-mn-1-ref.html
skip-if(Android) == auto-hyphenation-nb-1.html auto-hyphenation-nb-1-ref.html
skip-if(Android) == auto-hyphenation-nl-1.html auto-hyphenation-nl-1-ref.html
skip-if(Android) == auto-hyphenation-nn-1.html auto-hyphenation-nn-1-ref.html
skip-if(Android) == auto-hyphenation-pt-1.html auto-hyphenation-pt-1-ref.html
skip-if(Android) == auto-hyphenation-ru-1.html auto-hyphenation-ru-1-ref.html
skip-if(Android) == auto-hyphenation-sh-1.html auto-hyphenation-sh-1-ref.html
skip-if(Android) == auto-hyphenation-sl-1.html auto-hyphenation-sl-1-ref.html
skip-if(Android) == auto-hyphenation-sr-1.html auto-hyphenation-sr-1-ref.html
skip-if(Android) == auto-hyphenation-sv-1.html auto-hyphenation-sv-1-ref.html # test swedish patterns
skip-if(Android) != auto-hyphenation-sv-1.html auto-hyphenation-sv-1-notref.html # verify swedish != english
skip-if(Android) == auto-hyphenation-tr-1.html auto-hyphenation-tr-1-ref.html
skip-if(Android) == auto-hyphenation-uk-1.html auto-hyphenation-uk-1-ref.html

Просмотреть файл

@ -267,7 +267,6 @@ DIST_FILES = \
components \
defaults \
modules \
hyphenation \
res \
lib \
lib.id \