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

[erinn at torproject.org]

commit de216a9a8d146ca4e182c37c28d3d70d33dc267d
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Thu Jun 7 09:07:49 2012 +0200

    Linux: Update the Firefox package sequence to a sane variant.
    
    build-firefox will now 'make build package' so that we get an entire
    finished build of firefox in this target. The added INNER_MAKE_PACKAGE
    is responsible for actually packaging up the staging folder.
    We don't need the package so we make it 'run' true instead.
    
    In copy-firefox we will copy the staging directory which is normally
    packaged into a tarball.
    
    (See .\toolkit\mozapps\installer\packager.mk in the FF source for more
    details)
---
 build-scripts/linux.mk |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 32c9dda..7694b7a 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -86,14 +86,13 @@ build-firefox: config/dot_mozconfig $(FIREFOX_DIR)
 	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
 	cp branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
+	cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true
 	touch $(STAMP_DIR)/build-firefox
 
 copy-firefox:
 	-rm -rf $(BUILD_DIR)/Firefox
-	## This is so ugly. Update it to use cool tar --transform soon.
-	cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package
-	cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR)
-	cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox
+	mkdir -p $(BUILD_DIR)/Firefox
+	cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox
 
 build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox
 	echo "If we're here, we've done something right."