[Hugin-cvs] SF.net SVN: hugin:[3294] hugin/trunk/platforms/mac/scripted_universal_build

[<har...@us...>]

Revision: 3294
          http://hugin.svn.sourceforge.net/hugin/?rev=3294&view=rev
Author:   harryvanderwolf
Date:     2008-08-10 15:09:33 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
[Mac] Minor changes to scripts

Modified Paths:
--------------
    hugin/trunk/platforms/mac/scripted_universal_build/02-Make_bundle.sh
    hugin/trunk/platforms/mac/scripted_universal_build/03-localise-bundle.sh

Modified: hugin/trunk/platforms/mac/scripted_universal_build/02-Make_bundle.sh
===================================================================
--- hugin/trunk/platforms/mac/scripted_universal_build/02-Make_bundle.sh	2008-08-10 13:45:12 UTC (rev 3293)
+++ hugin/trunk/platforms/mac/scripted_universal_build/02-Make_bundle.sh	2008-08-10 15:09:33 UTC (rev 3294)
@@ -14,8 +14,8 @@
 RES_dir="$H_app/Contents/Resources"
 HSP_app="$RES_dir/HuginStitchProject.app"
 HSP_binary="$HSP_app/Contents/MacOS/HuginStitchProject"
-dylib_dir="$REPOSITORY_DIR/lib"
-old_install_name_dirname="$REPOSITORY/lib"
+dylib_dir="$REPOSITORYDIR/lib"
+old_install_name_dirname="$REPOSITORYDIR/lib"
 dylib_install_loc="Libraries"
 new_install_name_dirname="@executable_path/../$dylib_install_loc"
 
@@ -55,7 +55,7 @@
 endl=true
 while $endl; do
   echo "Looking for dependencies. Round " $a
-  libs="`otool -L $dylib_dir/*  $RES_dir/* $H_binary $HSP_app/Contents/MacOS/*  2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $REPOSITORYDIR | sort | uniq`"
+  libs="`otool -L $dylib_dir/*  $RES_dir/* $H_binary $HSP_app/Contents/MacOS/*  2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep "$REPOSITORYDIR" | sort | uniq`"
   cp -f $libs $H_app/Contents/$dylib_install_loc
   let "a+=1"  
   nnfiles=`ls $H_app/Contents/$dylib_install_loc | wc -l`

Modified: hugin/trunk/platforms/mac/scripted_universal_build/03-localise-bundle.sh
===================================================================
--- hugin/trunk/platforms/mac/scripted_universal_build/03-localise-bundle.sh	2008-08-10 13:45:12 UTC (rev 3293)
+++ hugin/trunk/platforms/mac/scripted_universal_build/03-localise-bundle.sh	2008-08-10 15:09:33 UTC (rev 3294)
@@ -22,9 +22,10 @@
 # First patch xrc
 
 rm -fR $resdir/xrc
-echo copying xrc folder to $resdir/xrc
+echo ""
+echo "copying xrc folder to $resdir/xrc"
 cp -R $xrcsrcdir $resdir/
-echo removing extra files from xrc folder
+echo "removing extra files from xrc folder"
 for DIR in $resdir/xrc "$resdir/xrc/??*" "$resdir/xrc/??*/??*"
 do 
  rm -fR $DIR/.svn
@@ -34,12 +35,12 @@
  rm -f $DIR/CMake*
 done
 
-echo patching $resdir/xrc/cp_editor_panel.xrc to use wxChoice instead of wxNotebook
+echo "patching $resdir/xrc/cp_editor_panel.xrc to use wxChoice instead of wxNotebook"
 mv $resdir/xrc/cp_editor_panel.xrc $resdir/xrc/cp_editor_panel.xrc-bk
 sed -e s/wxNotebook/wxChoice/ -e s/cp_editor_left_tab/cp_editor_left_choice/ -e s/cp_editor_right_tab/cp_editor_right_choice/ $resdir/xrc/cp_editor_panel.xrc-bk > $resdir/xrc/cp_editor_panel.xrc
 rm $resdir/xrc/cp_editor_panel.xrc-bk
 
-echo patching $resdir/xrc/main_frame.xrc to have no border around the tab control.
+echo "patching $resdir/xrc/main_frame.xrc to have no border around the tab control."
 mv $resdir/xrc/main_frame.xrc $resdir/xrc/main_frame.xrc-bk
 sed -e s/wxALL// $resdir/xrc/main_frame.xrc-bk > $resdir/xrc/main_frame.xrc
 rm $resdir/xrc/main_frame.xrc-bk
@@ -55,6 +56,8 @@
 
 ########
 # Add localisation
+echo ""
+echo "Adding localisation files to the bundle"
 for lang in "en" $(ls $translationsdir/*.po | sed -e "s/^.*\///g" -e "s/\.po//g")
 do
  
@@ -115,6 +118,7 @@
 
 ########
 # Install and "correct" help files
+echo "Install help files and change src paths"
 for helplang in "en_EN fr_FR"
 do
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.