Scale the 128-pixel icon down a little, so that it looks better in the dock.

Strip terminal control characters out of the build scripts, so that their
buildbot output is readable.

svn path=/trunk/; revision=24709

packaging/macosx/osx-app.sh

@@ -67,26 +67,26 @@ help()
 echo -e "
 Create an app bundle for OS X
 
-\033[1mUSAGE\033[0m
+USAGE
 	$0 [-s] [-l /path/to/libraries] -bp /path/to/wireshark/binaries -p /path/to/Info.plist
 
-\033[1mOPTIONS\033[0m
-	\033[1m-h,--help\033[0m
+OPTIONS
+	-h,--help
 		display this help message
-	\033[1m-s\033[0m
+	-s
 		strip the libraries and executables from debugging symbols
-	\033[1m-l,--libraries\033[0m
+	-l,--libraries
 		specify the path to the librairies Wireshark depends on
 		(typically /sw or /opt/local)
-	\033[1m-bp,--binary-path\033[0m
+	-bp,--binary-path
 		specify the path to the Wireshark binaries. By default it
 		is in $binary_path
-	\033[1m-p,--plist\033[0m
+	-p,--plist
 		specify the path to Info.plist. Info.plist can be found
 		in the base directory of the source code once configure
 		has been run
 
-\033[1mEXAMPLE\033[0m
+EXAMPLE
 	$0 -s -l /opt/local -bp ../../Build/bin -p Info.plist
 "
 }
@@ -118,7 +118,7 @@ do
 	shift 1
 done
 
-echo -e "\n\033[1mCREATE WIRESHARK APP BUNDLE\033[0m\n"
+echo -e "\nCREATE WIRESHARK APP BUNDLE\n"
 
 # Safety tests
 if [ ! -e "$LIBPREFIX" ]; then
@@ -197,7 +197,7 @@ mkdir -p "$startup_dir"
 	unset CC
 
 	cd "$resdir/ScriptExec"
-	echo -e "\033[1mBuilding launcher...\033[0m\n"
+	echo -e "Building launcher...\n"
 	xcodebuild $XCODEFLAGS clean build
 )
 cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Wireshark"
@@ -205,7 +205,7 @@ cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Wireshark"
 
 # Copy all files into the bundle
 #----------------------------------------------------------
-echo -e "\n\033[1mFilling app bundle and utility directory...\033[0m\n"
+echo -e "\nFilling app bundle and utility directory...\n"
 
 # Wireshark executables
 for binary in $binary_list ; do
@@ -300,7 +300,7 @@ lib_dep_search_list="
 	$pkgbin/*-bin
 	"
 while $endl; do
-	echo -e "\033[1mLooking for dependencies.\033[0m Round" $a
+	echo -e "Looking for dependencies. Round" $a
 	libs="`otool -L $lib_dep_search_list 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`"
 	cp -f $libs "$pkglib"
 	let "a+=1"
@@ -321,7 +321,7 @@ done
 # Strip libraries and executables if requested
 #----------------------------------------------------------
 if [ "$strip" = "true" ]; then
-	echo -e "\n\033[1mStripping debugging symbols...\033[0m\n"
+	echo -e "\nStripping debugging symbols...\n"
 	chmod +w "$pkglib"/*.dylib
 	strip -x "$pkglib"/*.dylib
 	strip -ur "$binpath"

packaging/macosx/osx-build.sh

@@ -42,42 +42,42 @@ help()
 echo -e "
 Compilation script for Wireshark on Mac OS X.
 
-\033[1mUSAGE\033[0m
+USAGE
   $0 [options] action[s]
 
-\033[1mACTIONS & OPTIONS\033[0m
-  \033[1mh,help\033[0m
+ACTIONS & OPTIONS
+  h,help
     display this help message
-  \033[1mu,up,update\033[0m
+  u,up,update
     update an existing checkout from svn (run svn up)
-  \033[1ma,auto,autogen\033[0m
+  a,auto,autogen
     prepare configure script (run autogen.sh). This is only necessary
     for a fresh svn checkout or after make distclean.
-  \033[1mc,conf,configure\033[0m
+  c,conf,configure
     configure the build (run configure). Edit your configuration
     options in $0
-    \033[1m-p,--prefix\033[0m	specify install prefix (configure step only)
-  \033[1mb,build\033[0m
+    -p,--prefix	specify install prefix (configure step only)
+  b,build
     build Wireshark (run make)
-  \033[1mi,install\033[0m
+  i,install
     install the build products locally, inside the source
     directory (run make install)
-  \033[1mp,pack,package\033[0m
+  p,pack,package
     package Wireshark in a double clickable .app bundle
-    \033[1m-s,--strip\033[0m	remove debugging information in Wireshark package
-    \033[1m-py,--with-python\033[0m	specify python modules path for inclusion into the app bundle
-  \033[1md,dist,distrib\033[0m
+    -s,--strip	remove debugging information in Wireshark package
+    -py,--with-python	specify python modules path for inclusion into the app bundle
+  d,dist,distrib
     store Wireshark.app in a disk image (dmg) for distribution
-  \033[1mput,upload\033[0m
+  put,upload
     upload the dmg and the associate info file on Modevia server
-  \033[1mall\033[0m
+  all
     do everything (update, configure, build, install, package, distribute)
 
-\033[1mEXAMPLES\033[0m
-  \033[1m$0 conf build install\033[0m
+EXAMPLES
+  $0 conf build install
     configure, build and install a dowloaded version of Wireshark in the default
     directory, keeping debugging information.
-  \033[1m$0 u a c b -p ~ i -s -py ~/site-packages/ p d\033[0m
+  $0 u a c b -p ~ i -s -py ~/site-packages/ p d
     update an svn checkout, prepare configure script, configure,
     build and install Wireshark in the user home directory (~).
     Then package Wireshark without debugging information,

packaging/macosx/osx-dmg.sh

@@ -55,15 +55,15 @@ help()
 echo -e "
 Create a custom dmg file to distribute Wireshark
 
-\033[1mUSAGE\033[0m
+USAGE
 	$0 [-s] -p /path/to/Wireshark.app
 
-\033[1mOPTIONS\033[0m
-	\033[1m-h,--help\033[0m
+OPTIONS
+	-h,--help
 		display this help message
-	\033[1m-s\033[0m
+	-s
 		set a new apperance (do not actually creates a bundle)
-	\033[1m-p,--package\033[0m
+	-p,--package
 		set the path to the Wireshark.app that should be copie
 		in the dmg
 "
@@ -99,7 +99,7 @@ if [ ! -e "$utilities" ]; then
 	echo "Cannot find utilities: $utilities"
 	exit 1
 fi
-echo -e "\n\033[1mCREATE WIRESHARK DISK IMAGE\033[0m\n"
+echo -e "\nCREATE WIRESHARK DISK IMAGE\n"
 
 # Get the architecture
 case `uname -p` in
@@ -127,7 +127,7 @@ img_name="$volume_name $version $architecture.dmg"
 rm -rf "$tmp_dir"
 mkdir "$tmp_dir"
 
-echo -e "\033[1mCopying files to temp directory\033[0m"
+echo -e "Copying files to temp directory"
 # Wireshark itself
 # Copy Wireshark.app
 cp -rf "$package" "$tmp_dir"/
@@ -153,7 +153,7 @@ if [ ${set_ds_store} = "false" ]; then
 fi
 
 # Create a new RW image from the temp directory.
-echo -e "\033[1mCreating a temporary disk image\033[0m"
+echo -e "Creating a temporary disk image"
 rm -f "$rw_name"
 /usr/bin/hdiutil create -srcfolder "$tmp_dir" -volname "$volume_name" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "$rw_name"
 
@@ -203,7 +203,7 @@ fi
 hdiutil detach "$DEV_NAME"
 
 # Create the offical release image by compressing the RW one.
-echo -e "\033[1mCompressing the final disk image\033[0m"
+echo -e "Compressing the final disk image"
 
 # TODO make this a command line option
 if [ -e "$img_name" ]; then