[Hdrflow-svn] SF.net SVN: hdrflow: [295] trunk
Status: Pre-Alpha
Brought to you by:
glslang
|
From: <gl...@us...> - 2007-09-02 22:35:29
|
Revision: 295
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=295&view=rev
Author: glslang
Date: 2007-09-02 15:35:27 -0700 (Sun, 02 Sep 2007)
Log Message:
-----------
+ build script updates (dependencies should be ok now for umbrella frameworks). still some lib redundancies. remove conform since it may not be correct for float data. TBI
Modified Paths:
--------------
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/unity.sh
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-02 15:23:18 UTC (rev 294)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-02 22:35:27 UTC (rev 295)
@@ -89,7 +89,7 @@
#ifndef NDEBUG
MGlobal::displayInfo( "HDRFlow: plugin found ..." );
#endif
- im_ = il::conform( plug->load( pl::make_stream( pathname.asChar( ), std::ios::in ) ), il::flipped );
+ im_ = plug->load( pl::make_stream( pathname.asChar( ), std::ios::in ) );
if( im_ )
{
#ifndef NDEBUG
@@ -180,6 +180,9 @@
MFnPlugin plugin( obj, "com.cryogenicgraphics", "8.0", "Any" );
MStringArray extensions;
extensions.append( "hdr" );
+ extensions.append( "exr" );
+ extensions.append( "tiff" );
+ extensions.append( "tif" );
CHECK_MSTATUS( plugin.registerImageFile( "HDRFlow", hdrflow::extras::mfn::image_reader::creator, extensions ) );
pl::init( );
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-02 15:23:18 UTC (rev 294)
+++ trunk/unity.sh 2007-09-02 22:35:27 UTC (rev 295)
@@ -367,6 +367,39 @@
done
}
+update_umbrella_framework_install_names( )
+{
+ install_name_tool -id $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/$1 \
+ HDRFlow.framework/Versions/A/Frameworks/$1.framework/$1
+
+ libs=`ls HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/*.dylib`
+ for i in $libs
+ do install_name_tool -id $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $i` $i
+ done
+
+ if [ $1 != "HDRFlowPlugin" ]
+ then libs=`ls HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/PlugIns/*.dylib`
+ for i in $libs
+ do install_name_tool -id $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/PlugIns/`basename $i` $i
+ done
+
+ depnames="$install_name_prefix/HDRFlowPlugin.framework $install_name_prefix/HDRFlowImage.framework $install_name_prefix/HDRFlowMedia.framework"
+ for i in $libs
+ do for j in $depnames
+ do deps=`otool -L $i | grep $j | cut -d ' ' -f 1`
+ for k in $deps
+ do if [ `basename $k` != "HDRFlowPlugin" ] && [ `basename $k` != "HDRFlowImage" ] && [ `basename $k` != "HDRFlowMedia" ]
+ then install_name_tool -change $k \
+ $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i
+ else install_name_tool -change $k \
+ $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/`basename $k`.framework/Versions/A/`basename $k` $i
+ fi
+ done
+ done
+ done
+ fi
+}
+
make_umbrella_framework( )
{
rm -rf "./HDRFlow.framework"
@@ -384,7 +417,6 @@
make_umbrella_framework_deps "HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns/HDRFlowPlugin.so" &&
make_umbrella_framework_deps "HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns/HDRFlowImage.so" &&
make_umbrella_framework_deps "HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns/HDRFlowMedia.so"
- check_status $?
deplist="GLEW boost"
for i in $deplist
@@ -410,6 +442,10 @@
done
done
+ update_umbrella_framework_install_names "HDRFlowPlugin"
+ update_umbrella_framework_install_names "HDRFlowImage"
+ update_umbrella_framework_install_names "HDRFlowMedia"
+
make_umbrella_framework_python_deps "HDRFlowPlugin" "HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns/HDRFlowPlugin.so"
make_umbrella_framework_python_deps "HDRFlowImage" "HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns/HDRFlowImage.so"
make_umbrella_framework_python_deps "HDRFlowMedia" "HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns/HDRFlowMedia.so"
@@ -434,7 +470,8 @@
cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
- find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
+ find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
+ check_status $?
}
make_extras_framework( )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|