commit a3d91bf76c16e0e8e3eb0beff961b6de0d813ba9 Author: Erinn Clark <erinn@torproject.org> Date: Tue Feb 12 20:07:29 2013 +0100 remove extraneous pymake build stuff --- build-scripts/versions-alpha.mk | 8 -------- build-scripts/versions.mk | 8 -------- build-scripts/windows.mk | 2 +- 3 files changed, 1 insertions(+), 17 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index e974167..8e5423f 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -83,7 +83,6 @@ LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual @@ -139,9 +138,6 @@ $(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) -$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) - torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) @@ -217,10 +213,6 @@ $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla cp patch-mozilla-build.sh $(MOZBUILD_DIR) cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) - rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ - $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) rm -rf $(OBFSPROXY_DIR) cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 080696b..ff646e1 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -80,7 +80,6 @@ LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build -PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual @@ -136,9 +135,6 @@ $(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) -$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) - $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) - torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) @@ -211,10 +207,6 @@ $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla cp patch-mozilla-build.sh $(MOZBUILD_DIR) cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) -$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) - rm -rf $(PYMAKE_DIR) - cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ - $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) rm -rf $(OBFSPROXY_DIR) cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index c341ff4..793bf36 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -100,7 +100,7 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)"