[tor-commits] [torbrowser/maint-2.4] remove external pymake. new Firefox ships with its own pymake which we'll use from now on.

[erinn at torproject.org]

commit 6afe2ff7b4608facb0209f46fae5f9cb74bfc38a
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Jan 25 16:27:27 2013 +0100

    remove external pymake. new Firefox ships with its own pymake which we'll use from now on.
---
 build-scripts/versions-alpha.mk |    5 +----
 build-scripts/windows-alpha.mk  |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index f28860b..4c0f3d7 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -12,7 +12,6 @@ TOR_VER=0.2.4.9-alpha
 PIDGIN_VER=2.6.4
 FIREFOX_VER=17.0.2esr
 MOZBUILD_VER=1.5.1
-PYMAKE_VER=87d436cd8974
 TORBUTTON_VER=1.5.0pre-alpha
 NOSCRIPT_VER=2.6.4.3
 HTTPSEVERYWHERE_VER=4.0development.4
@@ -34,7 +33,6 @@ TOR_PACKAGE=tor-$(TOR_VER).tar.gz
 PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2
 FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2
 MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe
-PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2
 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi
 NOSCRIPT_PACKAGE=addon-722-latest.xpi
 HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi
@@ -52,7 +50,6 @@ TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE)
 PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)
 FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE)
 MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_PACKAGE)
-PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE)
 #TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE)
 TORBUTTON_URL=https://people.torproject.org/~mikeperry/$(TORBUTTON_PACKAGE)
 NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
@@ -86,7 +83,7 @@ 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=$(BUILD_DIR)/pymake-$(PYMAKE_VER)
+PYMAKE_DIR=$(FIREFOX_DIR)/build/pymake
 OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER)
 
 # Empty targets are written in arch-dependent $(BUILD_DIR). Usual
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index 9b4efb6..8f6391d 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -32,7 +32,7 @@ VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins
 ## Location of utility applications
 PWD:=$(shell pwd)
 PYTHON=$(MOZBUILD_DIR)/python/python.exe
-PYMAKE=$(PYMAKE_DIR)/make.py
+PYMAKE=$(FIREFOX_DIR)/build/pymake/make.py
 SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe"
 WGET=wget
 VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py