diff options
| -rw-r--r-- | contrib/polipo/README | 35 | ||||
| -rw-r--r-- | contrib/polipo/package.sh | 4 | ||||
| -rw-r--r-- | contrib/polipo/polipo-mingw.nsi | 2 | ||||
| -rw-r--r-- | contrib/polipo/uninstall_polipo_bundle.sh | 3 |
4 files changed, 38 insertions, 6 deletions
diff --git a/contrib/polipo/README b/contrib/polipo/README index 28333393bc..038e354413 100644 --- a/contrib/polipo/README +++ b/contrib/polipo/README @@ -1,23 +1,52 @@ -These are hacks to get polipo to work with Tor. Someday, they will be -commited upstream to the real polipo codebase. They need some work: +Copyright 2007-2008 Andrew Lewman +---------------- +General Comments +---------------- + +These are some hacks for making polipo work and install a package native +to OSX or Windows. + +They need some work before they can be committed upstream: - Merge the three makefiles into one with specific builds such as "make dist-osx" or "make dist-win32" - Configure the options for tor in polipo config, just leave them commented out for easy activation. - Work out better polipo config options for Tor. +As always, I'm happy to accept patches. + +-------------------------- +Pre-requisites for Windows +-------------------------- + +Polipo for Win32 requires the mingw gnu regex library and dlls at +http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=73286&release_id=140957 + +You'll need to download the -bin and -dev tarballs. And extract them +into your MinGW directory. + Instructions for building polipo under mingw32 for Windows: 1) Copy Makefile.mingw over Makefile. 2) Run 'make'. You should have a polipo.exe in the current directory. +------------------------------------------- +Creating an installation package in Windows +------------------------------------------- + If you want to build an installer using the Nullsoft Installer, install the NSI Compiler. In Windows Explorer, navigate to the directory in which you placed polipo-mingw.nsi. Right click on polipo-mingw.nsi and choose Compile NSIS Script. You'll then create a polipo installer. -Instructions for building a polipo universal binary package under OSX Tiger: +The Polipo NSI installer assumes libgnurx-0.dll is in the same directory as polipo.exe. +You'll need to copy libgnurx-0.dll into "./" in order to make the +installation package. + +--------------------------------------------- +OSX Universal Binary and Installation package +--------------------------------------------- 1) Copy Makefile.osx over Makefile. 2) Run 'make'. 3) Copy the contents of this directory into a directory named "contrib". diff --git a/contrib/polipo/package.sh b/contrib/polipo/package.sh index 22d110d3dd..fea13b7ad9 100644 --- a/contrib/polipo/package.sh +++ b/contrib/polipo/package.sh @@ -1,8 +1,8 @@ #!/bin/sh # $Id: package.sh 8992 2006-12-23 03:12:09Z phobos $ # Copyright 2004-2005 Nick Mathewson & Andrew Lewman. -# Copyright 2005-2007 Andrew Lewman -# See LICENSE in Polipo distribution for licensing information. +# Copyright 2005-2008 Andrew Lewman +# This is licensed under the Modified BSD License. ### # Helpful info on OS X packaging: diff --git a/contrib/polipo/polipo-mingw.nsi b/contrib/polipo/polipo-mingw.nsi index 93361c7131..624e825eb6 100644 --- a/contrib/polipo/polipo-mingw.nsi +++ b/contrib/polipo/polipo-mingw.nsi @@ -1,7 +1,7 @@ ;polipo-mingw.nsi - A basic win32 installer for Polipo ; Originally written by J Doe. ; Modified by Andrew Lewman -; See LICENSE for licencing information +; This is licensed under a Modified BSD license. ;----------------------------------------- ; !include "MUI.nsh" diff --git a/contrib/polipo/uninstall_polipo_bundle.sh b/contrib/polipo/uninstall_polipo_bundle.sh index 26a2a6554e..73507701a0 100644 --- a/contrib/polipo/uninstall_polipo_bundle.sh +++ b/contrib/polipo/uninstall_polipo_bundle.sh @@ -1,5 +1,8 @@ #!/bin/sh # +# Original version 2005 by loki der quaeler +# Copyright 2007-2008 Andrew Lewman +# This is licensed under a Modified BSD license. ### this is the location of a file which contains all the actual package names |