Include actual documentation with the installation, include the

uninstaller in executable format, and make the install pretty.


svn:r6119

4 files changed, 27 insertions, 18 deletions

diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am
index 40dc7c7d9f..9bde37f3e7 100644
--- a/contrib/osx/Makefile.am
+++ b/contrib/osx/Makefile.am
@@ -5,5 +5,5 @@ EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist    \
     TorBundleInfo.plist.in TorBundleWelcome.rtf TorDesc.plist.in        \
     TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist            \
     package.sh privoxy.config TorPostflight addsysuser 	\
-    Tor_Uninstaller.applescript uninstall_tor_bundle.sh
-
+    Tor_Uninstaller.applescript uninstall_tor_bundle.sh tor-resolve.pdf \
+    tor-reference.pdf
diff --git a/contrib/osx/TorInfo.plist.in b/contrib/osx/TorInfo.plist.in
index b542299200..e9ef586669 100644
--- a/contrib/osx/TorInfo.plist.in
+++ b/contrib/osx/TorInfo.plist.in
@@ -18,5 +18,9 @@
 	<true/>
 	<key>IFPkgFlagRootVolumeOnly</key>
 	<true/>
+	<key>IfPkgFlagBackgroundScaling</key>
+	<string>proportional</string>
+	<key>IFPkgFlagBackgroundAlignment</key>
+	<string>bottomleft</string>
 </dict>
 </plist>
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index d7c3835dd0..037237eb42 100644
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -66,3 +66,9 @@ fi
 if [ -d /Library/StartupItems/Privoxy ]; then
   find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel
 fi
+
+# Copy Documentation
+cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+
+# Copy Uninstaller
+cp -r $PACKAGE_PATH/Contents/Resources/*ninstall* $TARGET/
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index fc77298b03..e88be19c63 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -79,6 +79,7 @@ cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
 cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
 cp contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/Tor_Uninstaller.applescript
 cp contrib/osx/uninstall_tor_bundle.sh $BUILD_DIR/tor_resources/uninstall_tor_bundle.sh
+cp contrib/osx/tor_logo.gif $BUILD_DIR/tor_resources/background.gif
 cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt
 Tor: an anonymous Internet communication system
 
@@ -86,6 +87,19 @@ Tor is a system for using the internet anonymously, and allowing
 others to do so.
 EOF
 
+### Assemble documentation
+
+DOC=$BUILD_DIR/tor_resources/documents
+mkdir $DOC
+cp doc/tor-doc.html doc/tor-doc.css doc/tor-doc-osx.html $DOC
+cp AUTHORS $DOC/AUTHORS.txt
+groff doc/tor.1.in -T ps -m man | pstopdf -i -o $DOC/tor-reference.pdf
+groff doc/tor-resolve.1 -T ps -m man | pstopdf -i -o $DOC/tor-resolve.pdf
+mkdir $DOC/Advanced
+cp doc/tor-spec.txt doc/rend-spec.txt doc/control-spec.txt doc/socks-extensions.txt doc/version-spec.txt $DOC/Advanced
+cp doc/HACKING $DOC/Advanced/HACKING.txt
+cp ChangeLog $DOC/Advanced/ChangeLog.txt
+
 find $BUILD_DIR/tor_packageroot -print0 |sudo xargs -0 chown root:wheel
 
 $PACKAGEMAKER -build              \
@@ -131,8 +145,7 @@ cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
 cp contrib/osx/TorBundleInfo.plist "$MPKG/Contents/Info.plist"
 cp contrib/osx/TorBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
 cp contrib/osx/TorBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
-cp contrib/osx/Tor_Uninstaller.applescript "$MPKG/Contents/Resources/Tor_Uninstaller.applescript"
-cp contrib/osx/uninstall_tor_bundle.sh "$MPKG/Contents/Resources/uninstall_tor_bundle.sh"
+cp contrib/osx/tor_logo.gif "$MPKG/Contents/Resources/background.gif"
 
 # Move all the subpackages into place.  unzip Privoxy.pkg into place,
 # and fix its file permissions so we can rm -rf it later.
@@ -147,20 +160,6 @@ cp $PRIVOXY_RESDIR/ReadMe.txt $BUILD_DIR/output/Privoxy\ ReadMe.txt
 cp contrib/osx/ReadMe.rtf $BUILD_DIR/output/Tor\ ReadMe.rtf
 cp LICENSE $BUILD_DIR/output/Tor\ License.txt
 
-### Assemble documentation
-
-DOC=$BUILD_DIR/output/Documents
-mkdir $DOC
-cp doc/tor-doc.html doc/tor-doc.css doc/tor-doc-osx.html $DOC
-cp AUTHORS $DOC/AUTHORS.txt
-groff doc/tor.1 -T ps -m man | pstopdf - $DOC/tor-reference.pdf
-groff doc/tor-resolve.1 -T ps -m man | pstopdf - $DOC/tor-resolve.pdf
-
-mkdir $DOC/Advanced
-cp doc/tor-spec.txt doc/rend-spec.txt doc/control-spec.txt doc/socks-extensions.txt doc/version-spec.txt $DOC/Advanced
-cp doc/HACKING $DOC/Advanced/HACKING.txt
-cp ChangeLog $DOC/Advanced/ChangeLog.txt
-
 ### Package it all into a DMG
 
 find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel