[or-cvs] r8791: A utility that detects the drive letter of the usb disk. Bas (in torpedo/trunk: . src src/install)

[sn275@xxxxxxxx]

Author: sn275
Date: 2006-10-22 18:16:53 -0400 (Sun, 22 Oct 2006)
New Revision: 8791

Added:
   torpedo/trunk/src/Changelog
   torpedo/trunk/src/install/
   torpedo/trunk/src/install/license.txt
   torpedo/trunk/src/install/torpedo.nsi
Modified:
   torpedo/trunk/todo
Log:
A utility that detects the drive letter of the usb disk.

Basic version of install that installs privoxy, vidalia and Tor. See
Todo for what remains to be done.

Added: torpedo/trunk/src/Changelog
===================================================================
--- torpedo/trunk/src/Changelog	2006-10-22 08:10:44 UTC (rev 8790)
+++ torpedo/trunk/src/Changelog	2006-10-22 22:16:53 UTC (rev 8791)
@@ -0,0 +1,7 @@
+2006-10-22    <sn275@SERAPH>
+
+	* src/install: Basic version of install checked in.  
+
+	* src/usbdrivedetect: USB drive detection utility written and unit tested.
+	
+


Property changes on: torpedo/trunk/src/Changelog
___________________________________________________________________
Name: svn:executable
   + *

Added: torpedo/trunk/src/install/license.txt
===================================================================
--- torpedo/trunk/src/install/license.txt	2006-10-22 08:10:44 UTC (rev 8790)
+++ torpedo/trunk/src/install/license.txt	2006-10-22 22:16:53 UTC (rev 8791)
@@ -0,0 +1,29 @@
+	Copyright (c) 2006, Shishir Nagaraja, University of Cambridge.
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are
+	met:
+	
+	    * Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above
+	copyright notice, this list of conditions and the following disclaimer
+	in the documentation and/or other materials provided with the
+	distribution.
+	    * Neither the name of the University of Cambridge nor the
+	names of its contributors may be used to endorse or promote
+	products derived from this software without specific prior
+	written permission.
+	
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Property changes on: torpedo/trunk/src/install/license.txt
___________________________________________________________________
Name: svn:executable
   + *

Added: torpedo/trunk/src/install/torpedo.nsi
===================================================================
--- torpedo/trunk/src/install/torpedo.nsi	2006-10-22 08:10:44 UTC (rev 8790)
+++ torpedo/trunk/src/install/torpedo.nsi	2006-10-22 22:16:53 UTC (rev 8791)
@@ -0,0 +1,119 @@
+; Torpedo install script
+
+;	Copyright (c) 2006, Shishir Nagaraja, University of Cambridge.
+;	All rights reserved.
+;	
+;	Redistribution and use in source and binary forms, with or without
+;	modification, are permitted provided that the following conditions are
+;	met:
+;	
+;	    * Redistributions of source code must retain the above copyright
+;	notice, this list of conditions and the following disclaimer.
+;	    * Redistributions in binary form must reproduce the above
+;	copyright notice, this list of conditions and the following disclaimer
+;	in the documentation and/or other materials provided with the
+;	distribution.
+;	    * Neither the name of the University of Cambridge nor the
+;	names of its contributors may be used to endorse or promote
+;	products derived from this software without specific prior
+;	written permission.
+;	
+;	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+;	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+;	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+;	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+;	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI.nsh"
+
+;--------------------------------
+;General
+
+  ;Name and file
+  Name "Torpedo Install"
+  OutFile "torpedo-install.exe"
+
+  ;Default installation folder
+  InstallDir "$PROGRAMFILES\Torpedo"
+
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE "license.txt"
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+
+  !insertmacro MUI_UNPAGE_WELCOME
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  !insertmacro MUI_UNPAGE_FINISH
+
+   LicenseForceSelection radiobuttons "i accept" "i decline"
+
+
+;--------------------------------
+;Languages
+
+  !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+;Installer Sections
+
+Section "Dummy Section" SecDummy
+
+  SetOutPath "$INSTDIR"
+
+  ; Pick up distribution files from here
+  !cd dependencies
+
+  FILE /a /r *.*
+
+  ;Store installation folder
+  ;WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
+
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+  ;Language strings
+  LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
+
+  ;Assign language strings to sections
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  Delete "$INSTDIR\Uninstall.exe"
+
+  RMDir /r "$INSTDIR"
+
+
+SectionEnd


Property changes on: torpedo/trunk/src/install/torpedo.nsi
___________________________________________________________________
Name: svn:executable
   + *

Modified: torpedo/trunk/todo
===================================================================
--- torpedo/trunk/todo	2006-10-22 08:10:44 UTC (rev 8790)
+++ torpedo/trunk/todo	2006-10-22 22:16:53 UTC (rev 8791)
@@ -72,3 +72,17 @@
 polipo/privoxy, and gaim on the usb disk.
 
 Completion date: Next weekend, 22 October 2006
+
+-------------------------------------------------------
+Components
+
+######## Install
+1) Multiple language support.
+2) Target directory should reside on a usb drive.
+3) Prevent multiple versions of install running at the same time.
+4) 
+
+
+####### Configuration
+1) Close firefox. Leave proxy and Tor running if they are already running.
+2) 
\ No newline at end of file