[or-cvs] r12977: Update README to new project layout; fix typos in ToaST-star (in torbrowser/trunk: . build-scripts docs src src/current-patches)
sjm217 at seul.org
sjm217 at seul.org
Tue Dec 25 15:23:52 UTC 2007
Author: sjm217
Date: 2007-12-25 10:23:52 -0500 (Tue, 25 Dec 2007)
New Revision: 12977
Added:
torbrowser/trunk/src/current-patches/
torbrowser/trunk/src/current-patches/vidalia-killbrowser.patch
Removed:
torbrowser/trunk/src/vidalia-killbrowser.patch
Modified:
torbrowser/trunk/README
torbrowser/trunk/build-scripts/INSTALL
torbrowser/trunk/docs/ToaST-startup.txt
Log:
Update README to new project layout; fix typos in ToaST-startup.txt
Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README 2007-12-25 15:06:44 UTC (rev 12976)
+++ torbrowser/trunk/README 2007-12-25 15:23:52 UTC (rev 12977)
@@ -7,30 +7,34 @@
--------
build-scripts: Code for building and customizing a Tor USB bundle
- \___ README: Further documentation
+ \___ INSTALL: Installation instructions
+ |___ config/: Configuration files for bundle components
docs: Documentation for project
- \___ TODO: Pending tasks and commentary
- |___ ToaST-startup: Rough description of ToaST startup procedure
- |___ build-instructions.txt: Notes on building Vidalia and other
- bundle components
+ \___ ToaST-startup: Rough description of ToaST startup procedure
+ |___ rationale.txt: Reasoning behind bundle design decisions
+ |___ torusb-notes.txt: Experiences from running various other Tor
+ USB bundles
src: Source code
\___ processtest: Qt project for starting Firefox and detecting
| termination behaviour (see included README for
| build instructions)
- |___ old: Previous work from Shishir Nagaraja
+ |___ current-patches: Patches to other applications currently in
+ | testing
+ |___ archived-patches: Patches to other applications which have
+ either been applied upstream or abandoned
Status
------
Using build-scripts/Makefile it is possible to create a working USB
Tor bundle. It's limitations include:
- - It uses the PortableTor and FirefoxPortable binaries
+ - It uses the FirefoxPortable binaries
- The starting program doesn't have a pretty icon
- Polipo is not included, instead Firefox connects directly to Tor
-Further issues are discussed in docs/TODO.
+Further issues are discussed in TODO.
Included applications
---------------------
Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL 2007-12-25 15:06:44 UTC (rev 12976)
+++ torbrowser/trunk/build-scripts/INSTALL 2007-12-25 15:23:52 UTC (rev 12977)
@@ -97,7 +97,7 @@
http://trac.vidalia-project.net/changeset/2207
A patch to close the Browser when Vidalia exits is in:
- ../src/vidalia-killbrowser.patch
+ ../src/current-patches/vidalia-killbrowser.patch
This is not yet useful, since killing FirefoxPortable does not cause
Firefox to exit. This patch has not yet been applied to Vidalia.
Modified: torbrowser/trunk/docs/ToaST-startup.txt
===================================================================
--- torbrowser/trunk/docs/ToaST-startup.txt 2007-12-25 15:06:44 UTC (rev 12976)
+++ torbrowser/trunk/docs/ToaST-startup.txt 2007-12-25 15:23:52 UTC (rev 12977)
@@ -2,19 +2,21 @@
### Rough description of ToaST startup procedure
### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
###
+### $Id:$
+###
Create TorparkMutex
if <ToaST already running>
if <User requests ToST should exit>
UnloadTorParkandFirefox()
-If PreserverTorCacheMode swtich:
+If PreserveTorCacheMode switch:
PreserveTorCache = 1
If DebugMode:
DeugOn = 1
-If DebugModeSlident
+If DebugModeSilent
DebugOn =
-If DebugModeSlident
+If DebugModeSilent
DebugOn = 2
Load INI file
@@ -38,7 +40,7 @@
exit
Ask if user wants to exit:
- UnloadTorparkandFirefox
+ UnloadTorparkAndFirefox
exit
Patch chrome\chrome.rdf (jar:/// and file:///)
@@ -50,12 +52,12 @@
Delete compreg.dat
-If ALLOWMULTIPLAEINSTANCES, set enviroment variable "MOZ_NO_REMOTE"
+If ALLOWMULTIPLEINSTANCES, set environment variable "MOZ_NO_REMOTE"
-SET MOZ_PLAUGINPATH=PLUGINSDIRECTORY
+SET MOZ_PLUGINPATH=PLUGINSDIRECTORY
SET USERPROFILE=USERPROFILEDIRECTORY
-Repeatedly call "Checkforbadfirefox"
+Repeatedly call "CheckForBadFirefox"
Start progress bar
@@ -65,7 +67,7 @@
While 1:
If user clicks cancel, exit
- If Tor is dead, restart it ^
+ If Tor is dead, restart it
Wait for a Tor event or timeout
@@ -76,13 +78,13 @@
else:
break
-Start polipo
-Start firefox
+Start Polipo
+Start Firefox
Wait until Firefox has started
Wait for Firefox to exit
-Kill polipo and Tor
+Kill Polipo and Tor
-function Checkforbadfirefox():
- If firefox is running, show a error and kill Firefox
+function CheckForBadFirefox():
+ If Firefox is running, show a error and kill Firefox
Copied: torbrowser/trunk/src/current-patches/vidalia-killbrowser.patch (from rev 12976, torbrowser/trunk/src/vidalia-killbrowser.patch)
===================================================================
--- torbrowser/trunk/src/current-patches/vidalia-killbrowser.patch (rev 0)
+++ torbrowser/trunk/src/current-patches/vidalia-killbrowser.patch 2007-12-25 15:23:52 UTC (rev 12977)
@@ -0,0 +1,22 @@
+Index: src/vidalia/mainwindow.cpp
+===================================================================
+--- src/vidalia/mainwindow.cpp (revision 2213)
++++ src/vidalia/mainwindow.cpp (working copy)
+@@ -260,6 +260,17 @@
+ _torControl->stop();
+ }
+
++ if (_browserProcess->state() != QProcess::NotRunning) {
++ /* The browser is still running -- ask it to close.
++ Currently this appears to have no affect, probably because killing
++ FirefoxPortable doesn't kill firefox.exe. Switching to kil() did
++ not help either. Once Vidalia starts firefox.exe directly this should work. */
++ // Ignore the finished signal
++ QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
++ // Send the close request
++ _browserProcess->terminate();
++ }
++
+ /* Disconnect all of the TorControl object's signals */
+ QObject::disconnect(_torControl, 0, 0, 0);
+
Deleted: torbrowser/trunk/src/vidalia-killbrowser.patch
===================================================================
--- torbrowser/trunk/src/vidalia-killbrowser.patch 2007-12-25 15:06:44 UTC (rev 12976)
+++ torbrowser/trunk/src/vidalia-killbrowser.patch 2007-12-25 15:23:52 UTC (rev 12977)
@@ -1,22 +0,0 @@
-Index: src/vidalia/mainwindow.cpp
-===================================================================
---- src/vidalia/mainwindow.cpp (revision 2213)
-+++ src/vidalia/mainwindow.cpp (working copy)
-@@ -260,6 +260,17 @@
- _torControl->stop();
- }
-
-+ if (_browserProcess->state() != QProcess::NotRunning) {
-+ /* The browser is still running -- ask it to close.
-+ Currently this appears to have no affect, probably because killing
-+ FirefoxPortable doesn't kill firefox.exe. Switching to kil() did
-+ not help either. Once Vidalia starts firefox.exe directly this should work. */
-+ // Ignore the finished signal
-+ QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
-+ // Send the close request
-+ _browserProcess->terminate();
-+ }
-+
- /* Disconnect all of the TorControl object's signals */
- QObject::disconnect(_torControl, 0, 0, 0);
-
More information about the tor-commits
mailing list