aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-06-20 04:16:46 +0000
committerAndrew Lewman <andrew@torproject.org>2006-06-20 04:16:46 +0000
commit010954009130b245faf50ed229bcebff075ced64 (patch)
treeee4856acd338a0e1e86fc852f8b53bc0538f14a2
parent4283b81a48f918daa69e68b1099fdb4172892ac4 (diff)
downloadtor-010954009130b245faf50ed229bcebff075ced64.tar
tor-010954009130b245faf50ed229bcebff075ced64.tar.gz
First crack at version checking for OSX installer.
svn:r6665
-rw-r--r--contrib/osx/TorBundleInfo.plist.in15
-rw-r--r--contrib/osx/package.sh10
2 files changed, 20 insertions, 5 deletions
diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index 16cc83694..6708b8119 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 989c8f320..4715c7350 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"