[tor-commits] [torbrowser/master] W32: Use mozbuild's python

[erinn@xxxxxxxxxxxxxx]

commit 810b86fe2bed60bb3c988bf8fb284c4921b268ed
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Feb 9 03:14:17 2012 +0100

    W32: Use mozbuild's python
    
    Means the user has one less thing to install
---
 build-scripts/windows.mk |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index e03977f..ee6daf6 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -46,7 +46,7 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER)
 
 ## Location of utility applications
 PWD:=$(shell pwd)
-PYTHON=/c/Python26/python.exe
+PYTHON=$(MOZBUILD_DIR)/python/python.exe
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
 PYGET=$(PYTHON) $(PWD)/pyget.py
 WGET=wget
@@ -245,7 +245,7 @@ reallyclean: clean
 ## Scan .exe files against VirusTotal to check for false positives
 ##
 
-virus-scan:
+virus-scan: | $(PYTHON)
 	$(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe
 	$(VIRUSSCAN) $(TOR)/src/or/tor.exe 
 	$(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe
@@ -448,3 +448,5 @@ SRCDEST=/tmp
 SRCDESTPATH=$(SRCDEST)/$(SRCNAME)
 srcdist:
 	cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz
+
+$(PYTHON): | $(MOZBUILD_DIR) ;



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