[tor-commits] [torbrowser/maint-2.3] Win: Update the Firefox package sequence to a sane variant.

[erinn at torproject.org]

commit 4e405e991f9fc2994a302c97add7ad2424230e42
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Tue May 22 17:23:20 2012 +0200

    Win: Update the Firefox package sequence to a sane variant.
---
 build-scripts/windows.mk                           |    5 +----
 src/current-patches/mozilla-build/start-msvc.patch |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index e9d2b28..e2537c2 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -111,10 +111,7 @@ copy-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 $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/
-	cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*\.zip
-	rm $(FIREFOX)/App/Firefox/firefox-*\.zip
-	mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/firefox
+	cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(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."
diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch
index 94b31fa..4101d89 100644
--- a/src/current-patches/mozilla-build/start-msvc.patch
+++ b/src/current-patches/mozilla-build/start-msvc.patch
@@ -1,3 +1,14 @@
+This patch changes the start-msvcX batch file to suit our needs.
+First, it adds a 64-bit-aware-when-running-in-a-32-bit-process guess-msvc.bat.
+Second, it adds the option to run 'make' immediately by providing arguments.
+The default make arguments contain the following:
+Targets build, package: these are needed to build an actual package we can use.
+This includes generating manifest and packaging omni.ja, among others.
+INNER_MAKE_PACKAGE=true, when the package target is run it will normally create
+a zip file that contains the completed package.
+Since we grab the staging folder we don't need the zip file.
+So instead of running the actual packaging command we 'run' true instead.
+(See .\toolkit\mozapps\installer\packager.mk in the FF source for more details)
 --- start-msvcx.bat.org	2010-08-17 23:01:48 +0200
 +++ start-msvcx.bat	2011-11-04 15:28:02 +0100
 @@ -7,7 +7,7 @@
@@ -17,5 +28,5 @@
 +if "%1"=="" (
 +	start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i"
 +) else (
-+	cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package"
++	cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true"
 +)