[Hdrflow-svn] SF.net SVN: hdrflow: [234] trunk

[<gl...@us...>]

Revision: 234
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=234&view=rev
Author:   glslang
Date:     2007-08-06 13:40:06 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
+installer updates

Modified Paths:
--------------
    trunk/HDRFlowFramework.pmproj
    trunk/unity.sh

Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-08-06 19:38:42 UTC (rev 233)
+++ trunk/unity.sh	2007-08-06 20:40:06 UTC (rev 234)
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh -
 # Copyright (c) 2007 Goncalo de Carvalho.
 # Released under the GPLv2 or later.
 # Unification of build and distribution:
@@ -19,7 +19,7 @@
 
 if [ $# -eq "0" ]
 then
-	echo "usage: `basename $0` options (-evbfioxup)"
+	echo "usage: `basename $0` options (-evbfioxupas)"
 	exit 1
 fi
 
@@ -35,10 +35,11 @@
 build_application=0
 framework_version="A"
 install_name_prefix="/Library/Frameworks"
+strip_symbols=0
 
 output_directory="."
 
-while getopts "v:b:efi:o:x:upa" option
+while getopts "v:b:efi:o:x:upas" option
 do
 	case $option in
 		e ) update_boost_version=1;;
@@ -51,6 +52,7 @@
 		u ) build_umbrella=1;;
 		p ) build_installer=1;;
 		a ) build_application=1;;
+		s ) strip_symbols=1;;
 	esac
 done
 
@@ -172,7 +174,7 @@
 	then	plugins=`ls $2/../plugins`
 			for i in $plugins
 			do	if [ -d $2/../plugins/$i ]
-				then cp -R $2/../plugins/$i/*.opl $1.framework/Resources
+				then cp $2/../plugins/$i/*.opl $1.framework/Resources
 				fi
 			done
 	fi
@@ -408,9 +410,10 @@
 	cp -R ./app/HDRFlow/build/Release/HDRFlow.app .
 }
 
-make_pkg_installer( )
+make_installer( )
 {
-    /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg
+    /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg &&
+	hdiutil create -ov -srcfolder HDRFlowFramework.pkg HDRFlowFramework.dmg -fs HFS+ -volname "HDRFlowFramework"
 }
 
 if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ] 
@@ -441,7 +444,7 @@
 	
 	if [ "$build_installer" -eq 1 ]
 	then	echo "    Building packages..."
-			make_pkg_installer
+			make_installer
 			check_status $?
 	fi
 fi


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