[tor-commits] [torbrowser/maint-2.2] Move duplicated extension fetching code to versions.mk

[erinn at torproject.org]

commit fdc2c70a056dd96a60077d591d6102a6ee25010c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Feb 16 07:13:28 2012 +0100

    Move duplicated extension fetching code to versions.mk
---
 build-scripts/linux.mk    |   24 ------------------------
 build-scripts/osx.mk      |   24 ------------------------
 build-scripts/versions.mk |   20 ++++++++++++++++++++
 build-scripts/windows.mk  |   24 ------------------------
 4 files changed, 20 insertions(+), 72 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 67db913..742bc65 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -367,30 +367,6 @@ remove-bundle-shared-lib-symlinks:
 	./remove-shared-lib-symlinks $(LIBSDIR)/libz
 
 ##
-## How to create required extensions
-##
-
-## Torbutton development version
-torbutton.xpi:
-	$(WGET) -O $@ $(TORBUTTON)
-
-## NoScript development version
-noscript.xpi: 
-	$(WGET) -O $@ $(NOSCRIPT)
-
-## HTTPS Everywhere
-httpseverywhere.xpi:
-	$(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE)
-
-## Generic language pack rule
-langpack_%.xpi:
-	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
-
-## English comes as default
-#langpack_en-US.xpi:
-#	touch $@
-
-##
 ## Customize the bundle
 ##
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index bda3216..e8fe22a 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -330,30 +330,6 @@ strip-it-stripper:
 	strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia
 
 ##
-## How to create required extensions
-##
-
-## Torbutton development version
-torbutton.xpi:
-	$(WGET) --no-check-certificate -O $@ $(TORBUTTON)
-
-## NoScript development version
-noscript.xpi: 
-	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT)
-
-## HTTPS Everywhere
-httpseverywhere.xpi:
-	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE)
-
-## Generic language pack rule
-langpack_%.xpi:
-	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
-
-## English comes as default
-#langpack_en-US.xpi:
-#	touch $@
-
-##
 ## Customize the bundle
 ##
 
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 910d25a..d021f5f 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -81,6 +81,26 @@ fetch-firefox:
 	-rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE)
 	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
 
+## Torbutton development version
+torbutton.xpi:
+	$(WGET) -O $@ $(TORBUTTON)
+
+## NoScript development version
+noscript.xpi:
+	$(WGET) -O $@ $(NOSCRIPT)
+
+## HTTPS Everywhere
+httpseverywhere.xpi:
+	$(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE)
+
+## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE
+langpack_%.xpi:
+	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+
+## English comes as default, so nothing to do here for the language packe
+langpack_en-US.xpi:
+	touch $@
+
 unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox
 
 unpack-zlib:
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 3250219..8c00ff5 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -352,30 +352,6 @@ launcher:
 	cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe"
 
 ##
-## How to create required extensions
-##
-
-## Torbutton development version
-torbutton.xpi:
-	$(PYGET) -O $@ $(TORBUTTON)
-
-## English comes as default
-langpack_en-US.xpi:
-	touch $@
-
-## NoScript development version
-noscript.xpi: 
-	$(PYGET) -O $@ $(NOSCRIPT)
-
-## HTTPS Everywhere
-httpseverywhere.xpi:
-	$(PYGET) -O $@ $(HTTPSEVERYWHERE)
-
-## Generic language pack rule
-langpack_%.xpi:
-	$(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
-
-##
 ## Customize the bundle
 ##