diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-10-11 18:47:14 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-11-10 04:04:29 +0100 |
| commit | fcdf1470c04b5ef19a7b9d28a48401f4d5c17293 (patch) | |
| tree | 4d85ad080bc51a30070d8c37a62dc553fd8633f6 /contrib/polipo/README | |
| parent | 6b4db953c9c1416683da160bd2419dc0eb50e9bd (diff) | |
| download | tor-fcdf1470c04b5ef19a7b9d28a48401f4d5c17293.tar.gz tor-fcdf1470c04b5ef19a7b9d28a48401f4d5c17293.zip | |
Remove everything related to os x expert package
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.
The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
Diffstat (limited to 'contrib/polipo/README')
| -rw-r--r-- | contrib/polipo/README | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/contrib/polipo/README b/contrib/polipo/README index 6670d579ec..98deec3e4e 100644 --- a/contrib/polipo/README +++ b/contrib/polipo/README @@ -6,14 +6,14 @@ General Comments ---------------- These are some hacks for making polipo work and install a package native -to OSX or Windows. +to 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" + - Change the Makefile so it has a specific build such as "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. + - Work out better polipo config options for Tor. As always, I'm happy to accept patches. @@ -45,14 +45,3 @@ choose Compile NSIS Script. You'll then create a polipo installer. 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 ---------------------------------------------- -You'll need the contrib/polipo directory from Tor's source distribution. -1) Copy Makefile.osx over Makefile. -2) Run 'make'. -3) Copy the contents of contrib/polipo into a directory named "contrib". -4) Run 'chmod +x ./contrib/package.sh' -5) Run './contrib/package.sh' -6) You should have a Polipo-version.dmg ready for installation. |