Update the osx dmg creation instructions

Make sure we follow basic whitespace sanity principles, update a
few links
This commit is contained in:
Sebastian Hahn 2010-02-21 00:19:41 +01:00
parent ee8b0893af
commit eeba8581b2

View File

@ -2,7 +2,8 @@
## ##
## The loose table of contents: ## The loose table of contents:
## Single Architecture Binaries for PowerPc or i386 architecture, not both. ## Single Architecture Binaries for PowerPc or i386 architecture, not both.
## Backwards compatible single-architecture binaries for OSX i386 10.4 from newer versions of OS X. ## Backwards compatible single-architecture binaries for OSX i386 10.4 from
## newer versions of OS X.
## Universal Binaries for OSX PPC and i386 ## Universal Binaries for OSX PPC and i386
## Each section is delineated by ###. ## Each section is delineated by ###.
@ -21,20 +22,20 @@ http://www.monkey.org/~provos/libevent/
2) The first step of compiling libevent is to configure it as 2) The first step of compiling libevent is to configure it as
follows: follows:
./configure --enable-static --disable-shared ./configure --enable-static --disable-shared
3) Complete the "make" and "make install". You will need to be root, 3) Complete the "make" and "make install". You will need to be root,
or sudo -s, to complete the "make install". or sudo -s, to complete the "make install".
## Compiling Tor ## ## Compiling Tor ##
4) Get your preferred version of the tor source from https://www.torproject.org. Extract the 4) Get your preferred version of the tor source from
tarball. https://www.torproject.org/dist/ or
http://archive.torproject.org/tor-package-archive/. Extract the tarball.
5) In the top level, this means /path/to/tor/, not tor/contrib/osx, 5) In the top level, this means /path/to/tor/, not tor/contrib/osx,
do a configure with these parameters: do a configure with these parameters:
CPPFLAGS='-DSSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION=0x0010' \
CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \ CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \
--bindir=/Library/Tor --sysconfdir=/Library --bindir=/Library/Tor --sysconfdir=/Library
@ -44,7 +45,8 @@ CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \
####################################### #######################################
# #
# Section 2 # Section 2
# Backwards compatible single-architecture binaries for OSX x86 10.4 from newer versions of OS X. # Backwards compatible single-architecture binaries for OSX x86 10.4 from
# newer versions of OS X.
# #
####################################### #######################################
@ -58,9 +60,11 @@ http://www.monkey.org/~provos/libevent/
3) The first step of compiling libevent is to configure it as 3) The first step of compiling libevent is to configure it as
follows: follows:
CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \ CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot \
/Developer/SDKs/MacOSX10.4u.sdk -arch i386" \
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
./configure --enable-static --disable-shared --disable-dependency-tracking ./configure --enable-static --disable-shared --disable-dependency-tracking \
CC="gcc-4.0"
4) Complete the "make" and "make install". You will need to be root, 4) Complete the "make" and "make install". You will need to be root,
or sudo -s, to complete the "make install". or sudo -s, to complete the "make install".
@ -72,20 +76,23 @@ or sudo -s, to complete the "make install".
Your output should be: Your output should be:
"/usr/local/lib/libevent.a (for architecture i386): current ar archive random library" "/usr/local/lib/libevent.a (for architecture i386):
current ar archive random library"
6) Get your preferred version of the tor source from https://www.torproject.org/download. 6) Get your preferred version of the tor source from
https://www.torproject.org/dist/ or
http://archive.torproject.org/tor-package-archive/.
Extract the tarball. Extract the tarball.
7) In the top level, this means /path/to/tor/, not tor/contrib/osx, 7) In the top level, this means /path/to/tor/, not tor/contrib/osx,
do a configure with these parameters: do a configure with these parameters:
CPPFLAGS='-DSSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION=0x0010' \ CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot \
CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \ /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
CONFDIR=/Library/Tor \ CONFDIR=/Library/Tor \
./configure --prefix=/Library/Tor --bindir=/Library/Tor \ ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
--sysconfdir=/Library --disable-dependency-tracking --sysconfdir=/Library --disable-dependency-tracking CC="gcc-4.0"
8) "make dist-osx" 8) "make dist-osx"
@ -96,7 +103,8 @@ src/or/tor (for architecture i386): Mach-O executable i386
10) There should exist in the top-level directory a 10) There should exist in the top-level directory a
Tor-$VERSION-i386-Bundle.dmg Tor-$VERSION-i386-Bundle.dmg
11) Congrats. You have a backwards-compatible binary. You are now ready to install Tor. 11) Congrats. You have a backwards-compatible binary.
You are now ready to install Tor.
#################################################################### ####################################################################
# #
@ -116,9 +124,11 @@ http://www.monkey.org/~provos/libevent/
3) The first step of compiling libevent is to configure it as 3) The first step of compiling libevent is to configure it as
follows: follows:
CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \ CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot \
/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
./configure --enable-static --disable-shared --disable-dependency-tracking ./configure --enable-static --disable-shared --disable-dependency-tracking \
CC="gcc-4.0"
4) Complete the "make" and "make install". You will need to be root, 4) Complete the "make" and "make install". You will need to be root,
or sudo -s, to complete the "make install". or sudo -s, to complete the "make install".
@ -130,21 +140,25 @@ or sudo -s, to complete the "make install".
Your output should be: Your output should be:
/usr/local/lib/libevent.a: Mach-O fat file with 2 architectures /usr/local/lib/libevent.a: Mach-O fat file with 2 architectures
/usr/local/lib/libevent.a (for architecture i386): current ar archive random library /usr/local/lib/libevent.a (for architecture i386):
/usr/local/lib/libevent.a (for architecture ppc): current ar archive current ar archive random library
/usr/local/lib/libevent.a (for architecture ppc):
current ar archive
6) Get your preferred version of the tor source from https://www.torproject.org/download. 6) Get your preferred version of the tor source from
https://www.torproject.org/dist/ or
http://archive.torproject.org/tor-package-archive/.
Extract the tarball. Extract the tarball.
7) In the top level, this means /path/to/tor/, not tor/contrib/osx, 7) In the top level, this means /path/to/tor/, not tor/contrib/osx,
do a configure with these parameters: do a configure with these parameters:
CPPFLAGS='-DSSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION=0x0010' \ CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot \
CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \ /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
CONFDIR=/Library/Tor \ CONFDIR=/Library/Tor \
./configure --prefix=/Library/Tor --bindir=/Library/Tor \ ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
--sysconfdir=/Library --disable-dependency-tracking --sysconfdir=/Library --disable-dependency-tracking CC="gcc-4.0"
8) "make dist-osx" 8) "make dist-osx"