commit 4ca40a1370dc7a42f2558d8d3898ac7ef8ab813a
Author: Erinn Clark <[email protected]>
Date: Mon Sep 5 02:07:46 2011 +0100
firefox 6.0.2 isn't officially out yet, so add a target that updates
langpacks to use the current version we're shipping
---
build-scripts/linux.mk | 10 +++++++++-
build-scripts/osx.mk | 10 +++++++++-
build-scripts/windows.mk | 10 +++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index d05b8c4..58470fe 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -431,8 +431,16 @@ install-betterprivacy: betterprivacy.xpi
cp betterprivacy.xpi
$(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip
(cd
$(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ &&
unzip *.zip && rm *.zip);
+
## Language extensions need to be handled differently from other extensions
-install-lang-extensions: $(filter-out
langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+ifneq ($(LANGCODE), en-US)
+ rm -fr xx
+ mkdir xx
+ (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e
"s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r
../langpack_$(LANGCODE).xpi .)
+endif
+
+install-lang-extensions: $(filter-out
langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf
ifneq ($(LANGCODE), en-US)
mkdir -p $(BUNDLE)/Data/profile/extensions
cp langpack_$(LANGCODE).xpi
$(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index d523b7a..7d03546 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -388,7 +388,15 @@ install-extensions: $(DEFAULT_EXTENSIONS)
done
## Language extensions need to be handled differently from other extensions
-install-lang-extensions: $(filter-out
langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+
+fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+ifneq ($(LANGCODE), en-US)
+ rm -fr xx
+ mkdir xx
+ (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e
"s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r
../langpack_$(LANGCODE).xpi .)
+endif
+
+install-lang-extensions: $(filter-out
langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf
ifneq ($(LANGCODE), en-US)
mkdir -p $(BUNDLE)/Library/Application\
Support/Firefox/Profiles/profile/extensions/
cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\
Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 01b2413..696e5b2 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -402,7 +402,15 @@ copy-files_%: generic-bundle.stamp
BUNDLE=$(NAME)_$(LANGCODE)/$(NAME)
DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile
-install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+
+fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
+ifneq ($(LANGCODE), en-US)
+ rm -fr xx
+ mkdir xx
+ (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e
"s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r
../langpack_$(LANGCODE).xpi .)
+endif
+
+install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
fix-install-rdf
## Make a dummy profile to stop Firefox creating some large files
cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
