[tor-commits] [torbrowser/master] Patch firefox during unpacking

[erinn at torproject.org]

commit a5036654af593d684a729e256b7b5abb3700fca0
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Feb 22 20:47:35 2012 +0100

    Patch firefox during unpacking
    
    This means we can simply depend on the patch files and start fresh
    completely when one of them changes.
---
 build-scripts/linux.mk    |    7 +------
 build-scripts/osx.mk      |    7 +------
 build-scripts/versions.mk |    3 +++
 build-scripts/windows.mk  |    5 -----
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index d3e942b..5e3d045 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -115,13 +115,8 @@ build-pidgin:
 	echo "We're not building pidgin yet!"
 
 FIREFOX_DIR=$(FETCH_DIR)/mozilla-release
-patch-firefox-source:
-	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
-	cp patch-any-src.sh $(FIREFOX_DIR)
-	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
-	cd $(FIREFOX_DIR) && ./patch-any-src.sh
-
 build-firefox:
+	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cd $(FIREFOX_DIR) && make -f client.mk build
 
 copy-firefox:
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 84dd620..9268112 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -125,13 +125,8 @@ build-tor:
 	cd $(TOR_DIR) && make install
 
 FIREFOX_DIR=$(FETCH_DIR)/mozilla-release
-patch-firefox-source:
-	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
-	cp patch-any-src.sh $(FIREFOX_DIR)
-	cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
-	cd $(FIREFOX_DIR) && ./patch-any-src.sh
-
 build-firefox:
+	cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
 	cd $(FIREFOX_DIR) && make -f client.mk build
 
 copy-firefox:
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 5b21a88..dd7c31a 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -116,3 +116,6 @@ unpack-tor:
 unpack-firefox:
 	-rm -rf $(FETCH_DIR)/mozilla-release
 	cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE)
+	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
+	cp patch-any-src.sh $(FIREFOX_DIR)
+	cd $(FIREFOX_DIR) && ./patch-any-src.sh
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 52d93ed..55e3c2d 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -119,11 +119,6 @@ patch-mozbuild:
 	cp patch-mozilla-build.sh $(MOZ_BUILD)
 	cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER)
 
-patch-firefox-source:
-	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
-	cp patch-any-src.sh $(FIREFOX_DIR)
-	cd $(FIREFOX_DIR) && ./patch-any-src.sh
-
 build-firefox:
 	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"