[or-cvs] r8999: - Updated install to remove registry traces and windows/syst (in torpedo/trunk/src: . install)

[sn275@xxxxxxxx]

Author: sn275
Date: 2006-11-26 17:27:36 -0500 (Sun, 26 Nov 2006)
New Revision: 8999

Added:
   torpedo/trunk/src/build.bat
   torpedo/trunk/src/build.txt
Modified:
   torpedo/trunk/src/Changelog
   torpedo/trunk/src/install/license.txt
   torpedo/trunk/src/install/torpedo.nsi
Log:
- Updated install to remove registry traces and windows/system
  directory changes.

- Intermediate checkin for including portable firefox and gaim in the
  installation.



Modified: torpedo/trunk/src/Changelog
===================================================================
--- torpedo/trunk/src/Changelog	2006-11-26 20:01:45 UTC (rev 8998)
+++ torpedo/trunk/src/Changelog	2006-11-26 22:27:36 UTC (rev 8999)
@@ -1,3 +1,10 @@
+2006-10-24    <sn275@SERAPH>
+
+	* install/torpedo.nsi: Removed license 'I decline/accept'
+	radio-button, now replaced by a single 'i accept' default button.
+
+	* install/license.txt (met): formatting changes.
+
 2006-10-22    <sn275@SERAPH>
 
 	* src/install: Basic version of install checked in.  

Added: torpedo/trunk/src/build.bat
===================================================================
--- torpedo/trunk/src/build.bat	2006-11-26 20:01:45 UTC (rev 8998)
+++ torpedo/trunk/src/build.bat	2006-11-26 22:27:36 UTC (rev 8999)
@@ -0,0 +1,8 @@
+% Download firefox and gaim from the kent mirror
+
+wget http://prdownloads.sourceforge.net/portablefirefox/Firefox_Portable_2.0_en-us.paf.exe?use_mirror=kent
+
+wget http://prdownloads.sourceforge.net/portablegaim/Gaim_Portable_2.0_B5_multilingual.paf.exe?use_mirror=kent
+
+
+


Property changes on: torpedo/trunk/src/build.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: torpedo/trunk/src/build.txt
===================================================================
--- torpedo/trunk/src/build.txt	2006-11-26 20:01:45 UTC (rev 8998)
+++ torpedo/trunk/src/build.txt	2006-11-26 22:27:36 UTC (rev 8999)
@@ -0,0 +1,8 @@
+* Install wget from sourceforge.net and make sure it is included in
+  the PATH environment variable.
+
+(http://gnuwin32.sourceforge.net/packages/wget.htm)
+
+* run build.bat
+
+* 


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

Modified: torpedo/trunk/src/install/license.txt
===================================================================
--- torpedo/trunk/src/install/license.txt	2006-11-26 20:01:45 UTC (rev 8998)
+++ torpedo/trunk/src/install/license.txt	2006-11-26 22:27:36 UTC (rev 8999)
@@ -1,29 +1,29 @@
-	Copyright (c) 2006, Shishir Nagaraja, University of Cambridge.
-	All rights reserved.
+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.
 	
-	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.
+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.

Modified: torpedo/trunk/src/install/torpedo.nsi
===================================================================
--- torpedo/trunk/src/install/torpedo.nsi	2006-11-26 20:01:45 UTC (rev 8998)
+++ torpedo/trunk/src/install/torpedo.nsi	2006-11-26 22:27:36 UTC (rev 8999)
@@ -67,9 +67,6 @@
   !insertmacro MUI_UNPAGE_INSTFILES
   !insertmacro MUI_UNPAGE_FINISH
 
-   LicenseForceSelection radiobuttons "i accept" "i decline"
-
-
 ;--------------------------------
 ;Languages
 
@@ -78,42 +75,54 @@
 ;--------------------------------
 ;Installer Sections
 
-Section "Dummy Section" SecDummy
+Section "Tor (Required)" Tor
 
-  SetOutPath "$INSTDIR"
+  SectionIn RO	
+  SetOutPath "$INSTDIR/Tor"
 
   ; Pick up distribution files from here
-  !cd dependencies
 
-  FILE /a /r *.*
+  FILE /a /r "dependencies\Tor\*.*"
 
+SectionEnd
+
+
+Section "Vidalia" Vidalia
+
+  SetOutPath "$INSTDIR/Vidalia"
+
+  ; Pick up distribution files from here
+  ;cd dependencies
+
+  FILE /a /r "dependencies\Vidalia\*.*"
+
   ;Store installation folder
   ;WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
 
   ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  ;WriteUninstaller "$INSTDIR\Uninstall.exe"
 
 SectionEnd
 
+Section "Privoxy" Privoxy
+
+  SetOutPath "$INSTDIR/Privoxy"
+
+  ; Pick up distribution files from here
+
+  FILE /a /r "dependencies\Privoxy\*.*"
+
+SectionEnd
+
+
 ;--------------------------------
 ;Descriptions
 
   ;Language strings
-  LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
+  LangString DESC_SecDummy ${LANG_ENGLISH} "Tor"
 
   ;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