[Hdrflow-svn] SF.net SVN: hdrflow: [306] trunk/unity.sh

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

Revision: 306
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=306&view=rev
Author:   glslang
Date:     2007-09-16 10:48:14 -0700 (Sun, 16 Sep 2007)

Log Message:
-----------
+ build fixes

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

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-09-16 16:20:54 UTC (rev 305)
+++ trunk/unity.sh	2007-09-16 17:48:14 UTC (rev 306)
@@ -464,6 +464,21 @@
 					HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so
 			done
 		done
+		
+		for j in $fmwklist
+		do	if [ $j == "HDRFlowPlugin" ] 
+			then continue
+			fi
+			libraries=`ls HDRFlow.framework/Frameworks/$j.framework/PlugIns/*.dylib`
+			for lib in $libraries
+			do	depname=`otool -L $lib | grep $i | cut -d ' ' -f 1`
+				for k in $depname
+				do	base=`basename $k`
+					install_name_tool -change $k \
+						$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base $lib
+				done
+			done
+		done
 	done
 	
 	update_umbrella_framework_install_names "HDRFlowPlugin"
@@ -513,7 +528,7 @@
 {
 	if [ "$strip_symbols" -eq 1 ]
 	then
-		echo -n "    Stripping symbols..."
+		echo -n "        Stripping symbols..."
 		strip -x HDRFlow.framework/HDRFlow &&
 		strip -x HDRFlow.framework/Libraries/* &&
 		strip -x HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/HDRFlowPlugin &&
@@ -531,6 +546,16 @@
 	fi
 }
 
+make_framework_libraries_unique( )
+{
+	libraries=`ls HDRFlow.framework/Versions/$framework_version/Libraries/*.dylib`
+	for i in $libraries
+	do	if [ -e HDRFlow.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i` ]
+		then rm -rf HDRFlow.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i`
+		fi
+	done
+}
+
 if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ] 
 then
 	echo "Building OS/X Frameworks..."
@@ -547,7 +572,10 @@
 	then  echo "    Building Umbrella Framework..."
 		  echo -n "        HDRFlow..."
 		  make_umbrella_framework &&
-		  strip_framework_symbols
+		  strip_framework_symbols &&
+		  make_framework_libraries_unique "HDRFlowPlugin" &&
+		  make_framework_libraries_unique "HDRFlowImage" &&
+		  make_framework_libraries_unique "HDRFlowMedia"
 		  check_status $?
 	fi
 


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