[vidalia-svn] r3775: Create an option for osx-split-bundle. (in vidalia/trunk/pkg: . osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-05-16 23:43:53 -0400 (Sat, 16 May 2009)
New Revision: 3775

Modified:
   vidalia/trunk/pkg/osx/builddmg.sh.in
   vidalia/trunk/pkg/package.sh
Log:
Create an option for osx-split-bundle.


Modified: vidalia/trunk/pkg/osx/builddmg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/builddmg.sh.in	2009-05-16 02:09:38 UTC (rev 3774)
+++ vidalia/trunk/pkg/osx/builddmg.sh.in	2009-05-17 03:43:53 UTC (rev 3775)
@@ -54,6 +54,8 @@
 # Set the name of the output .dmg file
 if [ $3 = "bundle" ]; then
   DMG="vidalia-bundle-$TORVERSION-$VERSION-$ARCH.dmg"
+elseif [ $3 = "split-bundle" ]; then
+  DMG="vidalia-bundle-$TORVERSION-$VERSION-$ARCH.dmg"
 else
   DMG="vidalia-$VERSION-$ARCH.dmg"
 fi
@@ -77,6 +79,10 @@
 ln -s /Applications $BUILD_DIR/Applications
 
 # Create the disk image
-hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG"
+if [ $3 = "bundle" ]; then
+  hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG"
+elseif [ $3 = "split-bundle" ]; then
+  hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG" &&
+  hdiutil segment -segmentSize 1.5m -o "split-$DMG" "$DMG"
+fi
 rm -rf "$BUILD_DIR"
-

Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2009-05-16 02:09:38 UTC (rev 3774)
+++ vidalia/trunk/pkg/package.sh	2009-05-17 03:43:53 UTC (rev 3775)
@@ -16,7 +16,7 @@
 # Check for proper script arguments
 if [ "$#" -eq 0 ]
 then
-  echo "Usage: $0 <tarball|win32|osx|osx-bundle>"
+  echo "Usage: $0 <tarball|win32|osx|osx-bundle|osx-split-bundle>"
   exit 1
 fi
 
@@ -89,7 +89,39 @@
   srcfiles="Vidalia.app README LEGAL .background .DS_Store"
   osx/builddmg.sh "$srcdir" "$srcfiles" "bundle" "$torversion"
   ;;
+
+#
+# OS X (Split Bundle)
+#
+"osx-split-bundle")
+  if [ $# -ne 4 ]
+  then
+    echo "Usage: $0 osx-split-bundle <path-to-tor> <path-to-polipo> <path-to-torbutton-file>"
+    exit 1
+  fi
+  torpath="$2"
+  polipopath="$3"
+  torbuttonpath="$4"
+  torversion=`echo "$torpath" | sed -e "s/.*\///" | sed -e "s/tor-//"`
   
+  mkdir ../LEGAL
+  mkdir ../.background
+  cp -R ../README ../src/vidalia/Vidalia.app ../
+  cp osx/background.png ../.background/
+  cp osx/bundle-ds_store ../.DS_Store
+  cp osx/vidalia.conf.sample ../Vidalia.app/Contents/Resources/vidalia.conf
+  cp ../CREDITS ../CHANGELOG ../Vidalia.app/
+  cp ../LICENSE ../LICENSE-GPLV2 ../LICENSE-GPLV3 ../LICENSE-LGPLV3 ../LICENSE-OPENSSL ../LEGAL/
+  cp -R ../LEGAL ../Vidalia.app/
+  cp $torpath/src/or/tor $torpath/src/tools/tor-checkkey $torpath/src/tools/tor-gencert $torpath/src/tools/tor-resolve ../Vidalia.app/
+  cp $torpath/src/config/geoip $torpath/src/config/torrc.sample ../Vidalia.app/
+  cp $polipopath/polipo $polipopath/contrib/tor-polipo.conf ../Vidalia.app/
+  cp $torbuttonpath ../Vidalia.app/
+  srcdir="../"
+  srcfiles="Vidalia.app README LEGAL .background .DS_Store"
+  osx/builddmg.sh "$srcdir" "$srcfiles" "split-bundle" "$torversion"
+  ;;
+  
 #
 #  rpm package
 #