[tor-commits] [torbrowser/maint-2.3] add makefile target for copying a built firefox into the right place

erinn at torproject.org erinn at torproject.org
Thu Nov 10 03:46:12 UTC 2011


commit ee1c9c6c89fe22f779c70539e799f483b91987e6
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Nov 10 03:45:33 2011 +0000

    add makefile target for copying a built firefox into the right place
---
 build-scripts/windows.mk |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 50efe76..7d70227 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -124,7 +124,14 @@ build-firefox:
 	cd $(FIREFOX_DIR) && ./patch-any-src.sh
 	cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"
 
-build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor
+copy-firefox:
+	-rm -rf $(FIREFOX)
+	-mkdir -p $(FIREFOX)
+	cp -r config/firefox-portable/* $(FIREFOX)
+	cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox
+	cp -r $(FIREFOX_DIR)/obj-*/dist/bin/* $(FIREFOX)/App/Firefox
+
+build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox
 	echo "If we're here, we've done something right."
 
 ## Location of compiled libraries



More information about the tor-commits mailing list