[tor-commits] [torbrowser/maint-2.2] W32: Move patch-mozbuild to install target

[erinn@xxxxxxxxxxxxxx]

commit 377a9a6160cd9ed705dfa783ad7328220b920b1c
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Feb 9 01:50:35 2012 +0100

    W32: Move patch-mozbuild to install target
    
    also prevent double-patching the source. Doing the latter makes sense,
    because otherwise a patch might get silently reversed. Doing the former
    makes sense because after extraction of mozillabuild, we need to patch
    it before we can use it further; and when we change the patch we need to
    re-extract to prevent double-patching
    
    While we do that, also set up prerequisites so mozilla-build gets remade
    when the patches change
---
 build-scripts/patch-mozilla-build.sh |    2 +-
 build-scripts/versions.mk            |    8 +++++++-
 build-scripts/windows.mk             |   11 ++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build-scripts/patch-mozilla-build.sh b/build-scripts/patch-mozilla-build.sh
index ba64629..b1a6df1 100644
--- a/build-scripts/patch-mozilla-build.sh
+++ b/build-scripts/patch-mozilla-build.sh
@@ -3,4 +3,4 @@
 
 MSVC_VER=$1
 
-patch start-msvc$MSVC_VER.bat -t < start-msvc.patch || exit 1
+patch start-msvc$MSVC_VER.bat -t -N < start-msvc.patch || exit 1
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index e5e4d53..6024b6c 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -171,12 +171,18 @@ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/*
 	cp patch-any-src.sh $(FIREFOX_DIR)
 	cd $(FIREFOX_DIR) && ./patch-any-src.sh
 
-$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE)
+$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh
 	rm -rf $(MOZBUILD_DIR) /c/mozilla-build
 # We could try passing a /D argument here, but then we'd need to convert
 # mingw paths into windows paths. We'll just go with the default here.
 	cd $(FETCH_DIR) && cmd.exe /c "$(MOZBUILD_PACKAGE) /S"
 	mv /c/mozilla-build $(MOZBUILD_DIR)
+# We have to patch mozillabuild
+	cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR)
+	cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)
+	cp patch-mozilla-build.sh $(MOZBUILD_DIR)
+	cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER)
+
 
 clean-fetch-%:
 	rm -rf $(FETCH_DIR)/$($($*)_PACKAGE)
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index fc57040..e03977f 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -113,16 +113,9 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
 	cd $(TOR_DIR) && make install
 	touch build-tor
 
-patch-mozbuild: $(MOZBUILD_DIR)
-	cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR)
-	cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)
-	cp patch-mozilla-build.sh $(MOZBUILD_DIR)
-	cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER)
-	touch patch-mozbuild
-
-build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat
+build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat
 	cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
-	cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"
+	cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"
 	touch build-firefox
 
 copy-firefox:



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits