[Hdrflow-svn] SF.net SVN: hdrflow: [146] trunk
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [146] trunk
|
From: <gl...@us...> - 2007-06-10 13:23:32
|
Revision: 146
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=146&view=rev
Author: glslang
Date: 2007-06-10 06:23:30 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+umbrella framework configuration changes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/Makefile.am
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/lib/openlibraries/configure.ac 2007-06-10 13:23:30 UTC (rev 146)
@@ -1,6 +1,3 @@
-dnl
-dnl Configure.ac for openlibraries
-dnl
AC_INIT
AC_CONFIG_SRCDIR([src/openobjectlib/sg/core.hpp])
@@ -393,6 +390,7 @@
src/openassetlib/py/Makefile
src/openassetlib/plugins/Makefile
src/openassetlib/plugins/sqlite/Makefile
+src/umbrella_framework/Makefile
media/Makefile
effects/Makefile
test/Makefile
Modified: trunk/lib/openlibraries/src/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/Makefile.am 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/lib/openlibraries/src/Makefile.am 2007-06-10 13:23:30 UTC (rev 146)
@@ -2,10 +2,11 @@
#
#
-SUBDIRS = \
+SUBDIRS = \
openpluginlib \
openimagelib \
openmedialib \
openeffectslib \
openobjectlib \
- openassetlib
+ openassetlib \
+ umbrella_framework
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/unity.sh 2007-06-10 13:23:30 UTC (rev 146)
@@ -19,7 +19,7 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfiox)"
+ echo "usage: `basename $0` options (-evbfioxu)"
exit 1
fi
@@ -30,12 +30,13 @@
boost_new_version=1_34
build_frameworks=0
+build_umbrella=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
output_directory="."
-while getopts "v:b:efi:o:x:" option
+while getopts "v:b:efi:o:x:u" option
do
case $option in
e ) update_boost_version=1;;
@@ -45,6 +46,7 @@
x ) framework_version="$OPTARG";;
o ) output_directory="$OPTARG";;
i ) install_name_prefix="$OPTARG";;
+ u ) build_umbrella=1;;
esac
done
@@ -122,8 +124,41 @@
{
cp ./lib/openlibraries/Info.plist.template $1.framework/Resources/Info.plist &&
cp ./lib/openlibraries/InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings
+
+ if [ -d "$2/../plugins" ]
+ 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
+ fi
+ done
+ fi
}
+make_framework_libs_deps( )
+{
+ deplist="/usr/local/lib"
+ for i in $deplist
+ do libs=`ls $1.framework/Libraries`
+ for j in $libs
+ do if [ ! -L $1.framework/Versions/$framework_version/Libraries/$j ]
+ then depname=`otool -L $1.framework/Libraries/$j | grep $i | cut -d ' ' -f 1`
+ for k in $depname
+ do base=`basename $k`
+ if [ ! -e $1.framework/Versions/$framework_version/Libraries/$base ]
+ then cp $k $1.framework/Versions/$framework_version/Libraries
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base \
+ $1.framework/Versions/$framework_version/Libraries/$base
+ fi
+ install_name_tool -change $k \
+ $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base \
+ $1.framework/Versions/$framework_version/Libraries/$j
+ done
+ fi
+ done
+ done
+}
+
make_framework_plugins_deps( )
{
deplist="GLEW boost /usr/local/lib"
@@ -196,7 +231,7 @@
esac
fi
done
- done
+ done
}
make_framework( )
@@ -204,13 +239,57 @@
make_framework_dir $1 &&
make_framework_headers $2 $1 &&
make_framework_libs $1 $2 &&
- make_framework_resources $1
+ make_framework_resources $1 $2
make_framework_deps $1
make_framework_plugins $2 $1
make_framework_plugins_deps $1
make_framework_interdeps $1
+ make_framework_libs_deps $1
}
+update_umbrella_framework_install_names( )
+{
+ echo "not implemented"
+}
+
+make_umbrella_framework( )
+{
+ rm -rf "./HDRFlow.framework"
+ make_framework "HDRFlow" "./lib/openlibraries/src/umbrella_framework"
+
+ framework_dir="$output_directory/HDRFlow.framework"
+ mkdir -p "$framework_dir/Versions/$framework_version/Frameworks"
+ ln -sf "Versions/Current/Frameworks" "$framework_dir/Frameworks"
+
+ cp -R "./HDRFlowPlugin.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+ cp -R "./HDRFlowImage.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+ cp -R "./HDRFlowMedia.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+
+ deplist="openpluginlib_pl openimagelib_il openmedialib_ml"
+ for i in $deplist
+ do depname=`otool -L HDRFlow.framework/HDRFlow | grep $i | cut -d ' ' -f 1`
+ if [ ! -z $depname ]
+ then case $i in
+ openpluginlib_pl )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Versions/$framework_version/HDRFlowPlugin \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ openimagelib_il )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowImage.framework/Versions/$framework_version/HDRFlowImage \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ openmedialib_ml )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowMedia.framework/Versions/$framework_version/HDRFlowMedia \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ esac
+ fi
+ done
+}
+
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
then
echo "Building OS/X Frameworks..."
@@ -222,6 +301,13 @@
echo -n " HDRFlowMedia..." &&
make_framework "HDRFlowMedia" "./lib/openlibraries/src/openmedialib/ml"
check_status $?
+
+ if [ "$build_umbrella" -eq 1 ]
+ then echo " Building Umbrella Framework..."
+ echo -n " HDRFlow..."
+ make_umbrella_framework
+ check_status $?
+ fi
fi
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
