[tor-commits] [torbrowser/maint-2.3] put the windows mozconfig into the firefox build directory before each build

erinn at torproject.org erinn at torproject.org
Sat Jan 21 11:26:36 UTC 2012


commit ce83fe26a7fb58a800867f7aeafc4941688793f4
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Jan 21 12:25:07 2012 +0100

    put the windows mozconfig into the firefox build directory before each build
---
 build-scripts/windows.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 5d2371b..159f1b2 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -117,7 +117,6 @@ patch-mozbuild:
 	cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD)
 	cp patch-mozilla-build.sh $(MOZ_BUILD)
 	cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER)
-	cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 
 patch-firefox-source:
 	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
@@ -125,6 +124,7 @@ patch-firefox-source:
 	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)"
 
 copy-firefox:



More information about the tor-commits mailing list