[tor-commits] [torbrowser/master] Win: Don't ship tor-resolve (ticket 5403)

[erinn@xxxxxxxxxxxxxx]

commit ada85fd5d3c6a9435453781f807708b20ac8def6
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Fri Mar 16 07:37:20 2012 +0100

    Win: Don't ship tor-resolve (ticket 5403)
---
 build-scripts/osx.mk     |    1 -
 build-scripts/windows.mk |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 81ab780..384ff44 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -248,7 +248,6 @@ directory-structure:
 install-binaries: 
 	# Vidalia
 	cp -R $(VIDALIA) $(APPDIR)/Vidalia.app
-	# Tor (perhaps we want tor-resolve too?)
 	cp $(TOR) $(APPDIR)
 
 ## Fixup
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 32bea32..978c008 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -221,8 +221,7 @@ reallyclean: clean
 
 virus-scan: | $(PYTHON)
 	$(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe
-	$(VIRUSSCAN) $(TOR)/src/or/tor.exe 
-	$(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe
+	$(VIRUSSCAN) $(TOR)/src/or/tor.exe
 
 ##
 ## Generate a non-localized bundle and put in $(DEST)
@@ -253,7 +252,7 @@ install-binaries:
 	cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR)
 	cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)
 	cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR)
-	cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR)
+	cp $(TOR)/src/or/tor.exe $(APPDIR)
 
 ## Fixup
 ## Collect up license files



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