[or-cvs] r12790: Update build-instructions.txt, Makefile to include Tor (in torpedo/trunk: build-scripts docs)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2007-12-12 18:01:43 -0500 (Wed, 12 Dec 2007)
New Revision: 12790

Modified:
   torpedo/trunk/build-scripts/Makefile
   torpedo/trunk/docs/build-instructions.txt
Log:
Update build-instructions.txt, Makefile to include Tor

Modified: torpedo/trunk/build-scripts/Makefile
===================================================================
--- torpedo/trunk/build-scripts/Makefile	2007-12-12 22:51:35 UTC (rev 12789)
+++ torpedo/trunk/build-scripts/Makefile	2007-12-12 23:01:43 UTC (rev 12790)
@@ -1,24 +1,29 @@
-###
-### Makefile for testing Vidalia
-### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-###
-
-MING=/c/MinGW/bin
-QT=/c/Qt/4.3.2/bin
-VIDALIA=/c/build/vidalia
-SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-
-all: build-package
-
-## Package up all the Vidalia pre-requisites
-## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>
-build-release: build-release.stamp
-build-release.stamp: 
-	mkdir release
-	cp $(MING)/mingwm10.dll release
-	cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll release 
-	cp $(VIDALIA)/src/vidalia/vidalia.exe release
-	touch build-release.stamp
-
-build-package: build-release
-	cd release; $(SEVENZIP) a -sfx7z.sfx "Vidalia Package.exe" .	
+###
+### Makefile for testing Vidalia
+### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
+###
+
+MING=/c/MinGW/bin
+QT=/c/Qt/4.3.2/bin
+VIDALIA=/c/build/vidalia
+TOR=/c/build/tor-0.2.0.12-alpha
+SEVENZIP="/c/Program Files/7-Zip/7z.exe"
+DEST=release
+
+all:
+	echo "Nothing to do"
+
+## Package up all the Vidalia and Tor pre-requisites
+## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>
+build-release: build-release.stamp
+build-release.stamp: 
+	mkdir $(DEST)
+	cp $(MING)/mingwm10.dll $(DEST)
+	cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll \
+           $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(DEST) 
+	cp $(VIDALIA)/src/vidalia/vidalia.exe $(DEST)
+	cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(DEST)
+	touch build-release.stamp
+
+package:
+	cd release; $(SEVENZIP) a -sfx7z.sfx "Package.exe" .

Modified: torpedo/trunk/docs/build-instructions.txt
===================================================================
--- torpedo/trunk/docs/build-instructions.txt	2007-12-12 22:51:35 UTC (rev 12789)
+++ torpedo/trunk/docs/build-instructions.txt	2007-12-12 23:01:43 UTC (rev 12790)
@@ -89,3 +89,4 @@
 For libevent, I used 1.3e, as suggested by the document above.
 libevent 1.4.0 is newer but untested.
 
+It is tor-resolve, not tor_resolve.exe