Remove architecture from builds. The official builds are universal

binaries. 


svn:r8249
This commit is contained in:
Andrew Lewman 2006-08-28 01:06:44 +00:00
parent e6eebf05a4
commit 91b41369c6

View File

@ -26,18 +26,12 @@ PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.3.zip
# 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 @@ $PACKAGEMAKER -build \
### 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 @@ cp LICENSE $BUILD_DIR/output/Tor\ License.txt
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