[or-cvs] r12791: Update build scripts to remove Portable Tor dependency (in torpedo/trunk/build-scripts: . config)

[sjm217 at seul.org]

Author: sjm217
Date: 2007-12-12 18:18:34 -0500 (Wed, 12 Dec 2007)
New Revision: 12791

Added:
   torpedo/trunk/build-scripts/config/torrc
Modified:
   torpedo/trunk/build-scripts/buildpackage.py
   torpedo/trunk/build-scripts/config/vidalia.conf
Log:
Update build scripts to remove Portable Tor dependency

Modified: torpedo/trunk/build-scripts/buildpackage.py
===================================================================
--- torpedo/trunk/build-scripts/buildpackage.py	2007-12-12 23:01:43 UTC (rev 12790)
+++ torpedo/trunk/build-scripts/buildpackage.py	2007-12-12 23:18:34 UTC (rev 12791)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 ##
-## Produce a Tor+Vidalia+Firefox bundle from PortableTor, FirefoxPortable and Vidalia
+## Produce a Tor+Vidalia+Firefox bundle from Tor, FirefoxPortable and Vidalia
 ## Steven J. Mudoch <http://www.cl.cam.ac.uk/users/sjm217/>
 ## $Id$
 ##
@@ -14,9 +14,8 @@
 ## Output directory (will be overwritten)
 dest = "Tor Browser"
 
-## Extracted directories containing FirefoxPortable, PortableTor and Vidalia
+## Extracted directories containing FirefoxPortable, Vidalia/Tor
 fp_src = "FirefoxPortable"
-tp_src = "PortableTor/PortableTor"
 vi_src = "release"
 
 ## Location of config files
@@ -25,43 +24,53 @@
 ## 7zip executable
 sevenzip = os.path.join("C:\\", "Program Files", "7-Zip", "7z.exe")
 
-## Make output directory
+##
+## Make output directories
+##
 try:
     shutil.rmtree(dest)
 except:
     pass
 
 os.mkdir(dest)
+os.mkdir(os.path.join(dest, "App"))
+os.mkdir(os.path.join(dest, "Data"))
+os.mkdir(os.path.join(dest, "Data", "Tor"))
+os.mkdir(os.path.join(dest, "Data", "Vidalia"))
 
+##
+## Firefox Portable
+##
+
 ## Copy over Firefox Portable
 shutil.copytree(fp_src, os.path.join(dest, "FirefoxPortable"))
-shutil.copytree(tp_src, os.path.join(dest, "PortableTor"))
 
 ## Set config options
 prefs_fn = os.path.join(dest, "FirefoxPortable", "App", "DefaultData", "profile", "prefs.js")
 oldprefs_fn = prefs_fn+".orig"
 os.rename(prefs_fn, oldprefs_fn)
-
 shutil.copyfile(os.path.join(conf_src, "prefs.js"), prefs_fn)
 
-## Remove Privoxy
-os.unlink(os.path.join(dest, "PortableTor","App","privoxy.exe"))
-shutil.rmtree(os.path.join(dest, "PortableTor","Docs","Privoxy"))
-shutil.rmtree(os.path.join(dest, "PortableTor","Data","Privoxy"))
-
-## Replace vidalia.conf
-shutil.copyfile(os.path.join(conf_src, "vidalia.conf"), os.path.join(dest, "PortableTor", "Data", "Vidalia", "vidalia.conf"))
-
 ## Apply .ini file
 shutil.copyfile(os.path.join(conf_src, "FirefoxPortable.ini"), os.path.join(dest, "FirefoxPortable", "FirefoxPortable.ini"))
 
-## Replace Vidalia
+##
+## Vidalia/Tor
+##
+
+## Add vidalia.conf
+shutil.copyfile(os.path.join(conf_src, "vidalia.conf"), os.path.join(dest, "Data", "Vidalia", "vidalia.conf"))
+
+## Add torrc
+shutil.copyfile(os.path.join(conf_src, "torrc"), os.path.join(dest, "Data", "Tor", "torrc"))
+
+## Add Vidalia and Tor
 for fn in os.listdir(vi_src):
-        shutil.copyfile(os.path.join(vi_src, fn), os.path.join(dest, "PortableTor", "App", fn))
+        shutil.copyfile(os.path.join(vi_src, fn), os.path.join(dest, "App", fn))
                 
 ## Write launcher
 fh = file(os.path.join(dest, "Tor Browser.bat"), "wt")
-fh.write('start /b .\\PortableTor\\App\\vidalia.exe --datadir .\\PortableTor\\Data\\Vidalia\\'+'\n')
+fh.write('start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\'+'\n')
 fh.close()
 
 ## Compress it all

Added: torpedo/trunk/build-scripts/config/torrc
===================================================================
--- torpedo/trunk/build-scripts/config/torrc	                        (rev 0)
+++ torpedo/trunk/build-scripts/config/torrc	2007-12-12 23:18:34 UTC (rev 12791)
@@ -0,0 +1,14 @@
+# If non-zero, try to write to disk less frequently than we would otherwise.
+AvoidDiskWrites 1
+# If set, Tor will accept connections from the same machine (localhost only)
+# on this port, and allow those connections to control the Tor process using
+# the Tor Control Protocol (described incontrol-spec.txt).
+ControlPort 9051
+# Store working data, state, keys, and caches here.
+DataDirectory .\Data\Tor
+# Where to send logging messages.  Format is minSeverity[-maxSeverity]
+# (stderr|stdout|syslog|file FILENAME).
+Log notice stdout
+# Bind to this address to listen to connections from SOCKS-speaking
+# applications.
+SocksListenAddress 127.0.0.1

Modified: torpedo/trunk/build-scripts/config/vidalia.conf
===================================================================
--- torpedo/trunk/build-scripts/config/vidalia.conf	2007-12-12 23:01:43 UTC (rev 12790)
+++ torpedo/trunk/build-scripts/config/vidalia.conf	2007-12-12 23:18:34 UTC (rev 12791)
@@ -3,5 +3,5 @@
 
 [Tor]
 ControlPort=9051
-TorExecutable=.\\PortableTor\\App\\tor.exe
-Torrc=.\\PortableTor\\Data\\Tor\\torrc
+TorExecutable=.\\App\\tor.exe
+Torrc=.\\Data\\Tor\\torrc