[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8249: Remove architecture from builds. The official builds are uni (tor/trunk/contrib/osx)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8249: Remove architecture from builds. The official builds are uni (tor/trunk/contrib/osx)
- From: phobos@xxxxxxxx
- Date: Sun, 27 Aug 2006 21:06:44 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sun, 27 Aug 2006 21:06:51 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: phobos
Date: 2006-08-27 21:06:44 -0400 (Sun, 27 Aug 2006)
New Revision: 8249
Modified:
tor/trunk/contrib/osx/package.sh
Log:
Remove architecture from builds. The official builds are universal
binaries.
Modified: tor/trunk/contrib/osx/package.sh
===================================================================
--- tor/trunk/contrib/osx/package.sh 2006-08-28 00:41:32 UTC (rev 8248)
+++ tor/trunk/contrib/osx/package.sh 2006-08-28 01:06:44 UTC (rev 8249)
@@ -26,18 +26,12 @@
# man packagemaker
# Make sure VERSION is set, so we don't name the package
-# "Tor--$OS-$ARCH-Bundle.dmg"
+# "Tor--$OS-Bundle.dmg"
if [ "XX$VERSION" = 'XX' ]; then
echo "VERSION not set."
exit 1
fi
-if [ -x /usr/bin/arch ]; then
- ARCH=`/usr/bin/arch`
-else
- ARCH="unknown"
-fi
-
## Determine OSX Version
# map version to name
if [ -x /usr/bin/sw_vers ]; then
@@ -153,7 +147,7 @@
### Assemble the metapackage. Packagemaker won't buld metapackages from
# the command line, so we need to do it by hand.
-MPKG=$BUILD_DIR/output/Tor-$VERSION-$OS-$ARCH-Bundle.mpkg
+MPKG=$BUILD_DIR/output/Tor-$VERSION-$OS-Bundle.mpkg
mkdir -p "$MPKG/Contents/Resources"
echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
@@ -180,10 +174,10 @@
find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel
-mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle"
-rm -f "Tor-$VERSION-$OS-$ARCH-Bundle.dmg"
+mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$OS-Bundle"
+rm -f "Tor-$VERSION-$OS-Bundle.dmg"
USER="`whoami`"
-sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg"
-sudo chown "$USER" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg"
+sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$OS-Bundle" "Tor-$VERSION-$OS-Bundle.dmg"
+sudo chown "$USER" "Tor-$VERSION-$OS-Bundle.dmg"
sudo rm -rf $BUILD_DIR