From: Andrew Lewman <andrew@torproject.org>
Date: Tue, 20 Jun 2006 04:16:46 +0000 (+0000)
Subject: First crack at version checking for OSX installer.
X-Git-Tag: tor-0.1.1.23~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=010954009130b245faf50ed229bcebff075ced64;p=thirdparty%2Ftor.git

First crack at version checking for OSX installer.


svn:r6665
---

diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index 16cc83694e..6708b81192 100644
--- a/contrib/osx/TorBundleInfo.plist.in
+++ b/contrib/osx/TorBundleInfo.plist.in
@@ -12,6 +12,21 @@
 	<string>@VERSION@</string>
 	<key>IFPkgFlagComponentDirectory</key>
 	<string>../.contained_packages</string>
+	<key>IFRequirementDicts</key>
+	<array>
+		<dict>
+		        <key>SpecType</key>
+			<string>plist</string>
+			<key>SpecArgument</key>
+			<string>/System/Library/CoreServices/SystemVersion.plist</string>
+			<key>SpecProperty</key>
+			<string>ProductVersion</string>
+			<key>TestOperator</key>
+			<string>=</string>
+			<key>TestObject</key>
+			<string>OSVER</string>
+		</dict>
+	</array>
 	<key>IFPkgFlagPackageList</key>
 	<array>
 		<dict>
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 989c8f320e..4715c7350d 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -93,10 +93,10 @@ EOF
 DOC=$BUILD_DIR/tor_resources/documents
 mkdir $DOC
 mkdir $DOC/howto
-cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto
-cp doc/website/tor-doc-server.html.* $DOC/howto
-cp doc/website/tor-hidden-service.html.* $DOC/howto
-cp doc/website/tor-switchproxy.html.* $DOC/howto
+#cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto
+#cp doc/website/tor-doc-server.html.* $DOC/howto
+#cp doc/website/tor-hidden-service.html.* $DOC/howto
+#cp doc/website/tor-switchproxy.html.* $DOC/howto
 #mkdir $DOC/img
 #cp doc/img/screenshot-osx* $DOC/img
 cp AUTHORS $DOC/AUTHORS.txt
@@ -149,7 +149,7 @@ mkdir -p "$MPKG/Contents/Resources"
 echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
 cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
 #cp contrib/osx/License.rtf "$MPKG/Contents/Resources"
-cp contrib/osx/TorBundleInfo.plist "$MPKG/Contents/Info.plist"
+sed -E -e "s/OSVER/$OSVER/" 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_logo.gif "$MPKG/Contents/Resources/background.gif"