Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [132] trunk
Status: Pre-Alpha
Brought to you by:
glslang
|
From: <gl...@us...> - 2007-05-20 22:06:31
|
Revision: 132
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=132&view=rev
Author: glslang
Date: 2007-05-20 15:06:27 -0700 (Sun, 20 May 2007)
Log Message:
-----------
+ proper svn repo
Added Paths:
-----------
trunk/app/
trunk/unity.sh
Removed Paths:
-------------
app/
lib/
unity.sh
Added: trunk/unity.sh
===================================================================
--- trunk/unity.sh (rev 0)
+++ trunk/unity.sh 2007-05-20 22:06:27 UTC (rev 132)
@@ -0,0 +1,37 @@
+#!/bin/sh -x
+# Unification of build and distribution:
+# recurses into lib and app directories, building each in turn.
+# updates Boost version in VC8 project files.
+
+if [ $# -eq "0" ]
+then
+ echo "usage: `basename $0` options (-evb)"
+ exit 1
+fi
+
+update_boost_version=0
+boost_old_version=1_33_1
+boost_new_version=1_34
+
+while getopts "v:b:e" option
+do
+ case $option in
+ e ) update_boost_version=1;;
+ v ) boost_old_version="$OPTARG";;
+ b ) boost_new_version="$OPTARG";;
+ esac
+done
+
+shift $(($OPTIND - 1))
+
+if [ "$update_boost_version" -eq 1 ]
+then
+ find . -type f -name '*.vcproj' -print | while read i
+ do cp $i $i.unity.bak &&
+ sed -e "s|boost-$boost_old_version|boost-$boost_new_version|g" -e "s|$boost_old_version.lib|$boost_new_version.lib|g" $i.unity.bak > $i &&
+ rm $i.unity.bak
+ done
+fi
+
+exit 0
+
Property changes on: trunk/unity.sh
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: unity.sh
===================================================================
--- unity.sh 2007-05-20 21:16:23 UTC (rev 131)
+++ unity.sh 2007-05-20 22:06:27 UTC (rev 132)
@@ -1,37 +0,0 @@
-#!/bin/sh -x
-# Unification of build and distribution:
-# recurses into lib and app directories, building each in turn.
-# updates Boost version in VC8 project files.
-
-if [ $# -eq "0" ]
-then
- echo "usage: `basename $0` options (-evb)"
- exit 1
-fi
-
-update_boost_version=0
-boost_old_version=1_33_1
-boost_new_version=1_34
-
-while getopts "v:b:e" option
-do
- case $option in
- e ) update_boost_version=1;;
- v ) boost_old_version="$OPTARG";;
- b ) boost_new_version="$OPTARG";;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-if [ "$update_boost_version" -eq 1 ]
-then
- find . -type f -name '*.vcproj' -print | while read i
- do cp $i $i.unity.bak &&
- sed -e "s|boost-$boost_old_version|boost-$boost_new_version|g" -e "s|$boost_old_version.lib|$boost_new_version.lib|g" $i.unity.bak > $i &&
- rm $i.unity.bak
- done
-fi
-
-exit 0
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-20 22:48:59
|
Revision: 133
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=133&view=rev
Author: glslang
Date: 2007-05-20 15:48:57 -0700 (Sun, 20 May 2007)
Log Message:
-----------
+ proper SVN repo checkin
Added Paths:
-----------
trunk/lib/
trunk/lib/extras/
trunk/lib/extras/AUTHORS
trunk/lib/extras/COPYING
trunk/lib/extras/ChangeLog
trunk/lib/extras/INSTALL
trunk/lib/extras/Makefile.am
trunk/lib/extras/NEWS
trunk/lib/extras/README
trunk/lib/extras/bootstrap
trunk/lib/extras/configure.ac
trunk/lib/extras/extras_vc8.sln
trunk/lib/extras/m4/
trunk/lib/extras/m4/aclocal.m4
trunk/lib/extras/m4/boost.m4
trunk/lib/extras/m4/cg.m4
trunk/lib/extras/m4/fast_math.m4
trunk/lib/extras/m4/glew.m4
trunk/lib/extras/m4/ofx.m4
trunk/lib/extras/m4/opengl.m4
trunk/lib/extras/m4/quicktime.m4
trunk/lib/extras/m4/universal_binary.m4
trunk/lib/extras/src/
trunk/lib/extras/src/Makefile.am
trunk/lib/extras/src/noise/
trunk/lib/extras/src/panoramic/
trunk/lib/extras/src/panoramic/Makefile.am
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
trunk/lib/extras/src/raw/
trunk/lib/extras/src/raw/Makefile.am
trunk/lib/extras/src/raw/dcraw.c
trunk/lib/extras/src/raw/dcraw_vc8.vcproj
trunk/lib/extras/src/raw/raw.cpp
trunk/lib/extras/src/raw/raw_vc8.vcproj
trunk/lib/openlibraries/
trunk/lib/openlibraries/AUTHORS
trunk/lib/openlibraries/COPYING
trunk/lib/openlibraries/ChangeLog
trunk/lib/openlibraries/INSTALL
trunk/lib/openlibraries/Makefile.am
trunk/lib/openlibraries/NEWS
trunk/lib/openlibraries/README
trunk/lib/openlibraries/bootstrap
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/effects/
trunk/lib/openlibraries/effects/Makefile.am
trunk/lib/openlibraries/effects/shaders/
trunk/lib/openlibraries/effects/shaders/channel_selector.cg
trunk/lib/openlibraries/effects/shaders/channel_selector.frag
trunk/lib/openlibraries/effects/shaders/fixed_function.vert
trunk/lib/openlibraries/effects/shaders/histogram.cg
trunk/lib/openlibraries/effects/shaders/histogram.frag
trunk/lib/openlibraries/effects/shaders/passthrough.cg
trunk/lib/openlibraries/effects/shaders/passthrough.vert
trunk/lib/openlibraries/effects/shaders/rgb_to_yuv444.frag
trunk/lib/openlibraries/effects/shaders/sepia.cg
trunk/lib/openlibraries/effects/shaders/sepia.frag
trunk/lib/openlibraries/effects/shaders/yuv444_to_rgb.cg
trunk/lib/openlibraries/effects/shaders/yuv444_to_rgb.frag
trunk/lib/openlibraries/effects/shaders/yuv444_to_rgb_deinterlace.cg
trunk/lib/openlibraries/effects/shaders/yuv444_to_rgb_deinterlace.frag
trunk/lib/openlibraries/installer/
trunk/lib/openlibraries/installer/add_to_path.nsh
trunk/lib/openlibraries/installer/openlibraries.bmp
trunk/lib/openlibraries/installer/openlibraries_lib32.spec
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/installer/write_env_str.nsh
trunk/lib/openlibraries/m4/
trunk/lib/openlibraries/m4/boost.m4
trunk/lib/openlibraries/m4/bzip2.m4
trunk/lib/openlibraries/m4/cg.m4
trunk/lib/openlibraries/m4/fast_math.m4
trunk/lib/openlibraries/m4/gelato.m4
trunk/lib/openlibraries/m4/glew.m4
trunk/lib/openlibraries/m4/gpl.m4
trunk/lib/openlibraries/m4/ofx.m4
trunk/lib/openlibraries/m4/openal.m4
trunk/lib/openlibraries/m4/opengl.m4
trunk/lib/openlibraries/m4/openimagelib.m4
trunk/lib/openlibraries/m4/pkg.m4
trunk/lib/openlibraries/m4/python.m4
trunk/lib/openlibraries/m4/qt.m4
trunk/lib/openlibraries/m4/quicktime.m4
trunk/lib/openlibraries/m4/sqlite.m4
trunk/lib/openlibraries/m4/universal_binary.m4
trunk/lib/openlibraries/m4/zlib.m4
trunk/lib/openlibraries/media/
trunk/lib/openlibraries/media/Makefile.am
trunk/lib/openlibraries/media/models/
trunk/lib/openlibraries/media/models/complex_glass.x3d
trunk/lib/openlibraries/media/models/disco_lighting.x3d
trunk/lib/openlibraries/media/models/glittering.x3d
trunk/lib/openlibraries/media/models/plastic.x3d
trunk/lib/openlibraries/media/models/ptm.x3d
trunk/lib/openlibraries/media/models/reflections_refractions.x3d
trunk/lib/openlibraries/media/models/shl_per_pixel.x3d
trunk/lib/openlibraries/media/shaders/
trunk/lib/openlibraries/media/shaders/complex_glass_0.frag
trunk/lib/openlibraries/media/shaders/complex_glass_0.vert
trunk/lib/openlibraries/media/shaders/complex_glass_1.frag
trunk/lib/openlibraries/media/shaders/complex_glass_1.vert
trunk/lib/openlibraries/media/shaders/disco_lighting_0.frag
trunk/lib/openlibraries/media/shaders/disco_lighting_0.vert
trunk/lib/openlibraries/media/shaders/disco_lighting_1.frag
trunk/lib/openlibraries/media/shaders/disco_lighting_1.vert
trunk/lib/openlibraries/media/shaders/disco_lighting_2.frag
trunk/lib/openlibraries/media/shaders/disco_lighting_2.vert
trunk/lib/openlibraries/media/shaders/glittering_0.frag
trunk/lib/openlibraries/media/shaders/glittering_0.vert
trunk/lib/openlibraries/media/shaders/plastic_0.frag
trunk/lib/openlibraries/media/shaders/plastic_0.vert
trunk/lib/openlibraries/media/shaders/ptm_0.frag
trunk/lib/openlibraries/media/shaders/ptm_0.vert
trunk/lib/openlibraries/media/shaders/reflections_refractions_0.frag
trunk/lib/openlibraries/media/shaders/reflections_refractions_0.vert
trunk/lib/openlibraries/media/shaders/reflections_refractions_1.frag
trunk/lib/openlibraries/media/shaders/reflections_refractions_1.vert
trunk/lib/openlibraries/media/shaders/shl_per_pixel_0.frag
trunk/lib/openlibraries/media/shaders/shl_per_pixel_0.vert
trunk/lib/openlibraries/media/textures/
trunk/lib/openlibraries/media/textures/Bonita.exr
trunk/lib/openlibraries/media/textures/Fieldstone.tga
trunk/lib/openlibraries/media/textures/FieldstoneBumpDOT3.tga
trunk/lib/openlibraries/media/textures/LightCube.dds
trunk/lib/openlibraries/media/textures/NoiseVolume.dds
trunk/lib/openlibraries/media/textures/Rainbow.tga
trunk/lib/openlibraries/media/textures/Snow.dds
trunk/lib/openlibraries/media/textures/Tiles.dds
trunk/lib/openlibraries/media/textures/TilesDOT3.tga
trunk/lib/openlibraries/media/textures/tablet_a012.tga
trunk/lib/openlibraries/media/textures/tablet_a345.tga
trunk/lib/openlibraries/media/textures/tablet_rgb.tga
trunk/lib/openlibraries/openlibraries.pc.in
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/
trunk/lib/openlibraries/src/Makefile.am
trunk/lib/openlibraries/src/openassetlib/
trunk/lib/openlibraries/src/openassetlib/Makefile.am
trunk/lib/openlibraries/src/openassetlib/al/
trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
trunk/lib/openlibraries/src/openassetlib/al/al.cpp
trunk/lib/openlibraries/src/openassetlib/al/al.hpp
trunk/lib/openlibraries/src/openassetlib/al/al_plugin.cpp
trunk/lib/openlibraries/src/openassetlib/al/al_plugin.hpp
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/al/asset.cpp
trunk/lib/openlibraries/src/openassetlib/al/asset.hpp
trunk/lib/openlibraries/src/openassetlib/al/base64_codec.cpp
trunk/lib/openlibraries/src/openassetlib/al/base64_codec.hpp
trunk/lib/openlibraries/src/openassetlib/al/config.hpp
trunk/lib/openlibraries/src/openassetlib/al/guid.cpp
trunk/lib/openlibraries/src/openassetlib/al/guid.hpp
trunk/lib/openlibraries/src/openassetlib/al/set.cpp
trunk/lib/openlibraries/src/openassetlib/al/set.hpp
trunk/lib/openlibraries/src/openassetlib/plugins/
trunk/lib/openlibraries/src/openassetlib/plugins/Makefile.am
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/config.hpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/database.cpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/database.hpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite-vc71-d-3_2_7.lib
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite-vc71-r-3_2_7.lib
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3.h
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/py/
trunk/lib/openlibraries/src/openassetlib/py/Makefile.am
trunk/lib/openlibraries/src/openassetlib/py/asset.cpp
trunk/lib/openlibraries/src/openassetlib/py/guid.cpp
trunk/lib/openlibraries/src/openassetlib/py/openassetlib.cpp
trunk/lib/openlibraries/src/openassetlib/py/plugin.cpp
trunk/lib/openlibraries/src/openassetlib/py/py.cpp
trunk/lib/openlibraries/src/openassetlib/py/py.hpp
trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/py/python.hpp
trunk/lib/openlibraries/src/openassetlib/py/set.cpp
trunk/lib/openlibraries/src/openeffectslib/
trunk/lib/openlibraries/src/openeffectslib/Makefile.am
trunk/lib/openlibraries/src/openeffectslib/plugins/
trunk/lib/openlibraries/src/openeffectslib/plugins/Makefile.am
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/Makefile.am
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/
trunk/lib/openlibraries/src/openimagelib/Makefile.am
trunk/lib/openlibraries/src/openimagelib/il/
trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
trunk/lib/openlibraries/src/openimagelib/il/compression_traits.hpp
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
trunk/lib/openlibraries/src/openimagelib/il/il.cpp
trunk/lib/openlibraries/src/openimagelib/il/il.hpp
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/il/rgb_traits.hpp
trunk/lib/openlibraries/src/openimagelib/il/traits.hpp
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
trunk/lib/openlibraries/src/openimagelib/il/yuv_traits.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/
trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/exr/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/
trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/psd/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/
trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
trunk/lib/openlibraries/src/openimagelib/py/il.cpp
trunk/lib/openlibraries/src/openimagelib/py/py.cpp
trunk/lib/openlibraries/src/openimagelib/py/py.hpp
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/
trunk/lib/openlibraries/src/openmedialib/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/
trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp
trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
trunk/lib/openlibraries/src/openmedialib/ml/ml.cpp
trunk/lib/openlibraries/src/openmedialib/ml/ml.hpp
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/ml/openmedialib_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/ml/openmedialib_plugin.hpp
trunk/lib/openlibraries/src/openmedialib/ml/store.hpp
trunk/lib/openlibraries/src/openmedialib/ml/utilities.cpp
trunk/lib/openlibraries/src/openmedialib/ml/utilities.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/
trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/caca/
trunk/lib/openlibraries/src/openmedialib/plugins/caca/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/caca/caca_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/caca/caca_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/glew/
trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/
trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/openal/
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_audiotrack.h
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_store.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_store.h
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_track.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_track.h
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_videotrack.h
trunk/lib/openlibraries/src/openmedialib/plugins/template/
trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/
trunk/lib/openlibraries/src/openmedialib/py/Makefile.am
trunk/lib/openlibraries/src/openmedialib/py/ml.cpp
trunk/lib/openlibraries/src/openmedialib/py/py.cpp
trunk/lib/openlibraries/src/openmedialib/py/py.hpp
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/
trunk/lib/openlibraries/src/openobjectlib/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/config.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/actions/
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/xml_value_tokenizer.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/config.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/spirit.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/
trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/appearance.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/bbox_volume.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/bbox_volume.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/calculate_tangent_space.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/calculate_tangent_space.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/config.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/constant_time_dispatcher.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/core.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/graph_updater.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/graph_updater.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/hw_GL_renderer.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/hw_GL_renderer.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/lexical_cast.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/meshes.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/meshes.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/openobjectlib_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/openobjectlib_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/render_buffer.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/render_buffer.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/scene.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/scene.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/sg.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/sg.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/sg/shaders.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/shaders.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/spatial.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/spatial.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/spirit.hpp
trunk/lib/openlibraries/src/openpluginlib/
trunk/lib/openlibraries/src/openpluginlib/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/allocatorstringstorage.h
trunk/lib/openlibraries/src/openpluginlib/pl/bind_info.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/bind_info.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/cg.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/cg.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/content_ha...
[truncated message content] |
|
From: <gl...@us...> - 2007-05-27 17:42:13
|
Revision: 142
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=142&view=rev
Author: glslang
Date: 2007-05-27 10:42:12 -0700 (Sun, 27 May 2007)
Log Message:
-----------
+Initial Framework support
Modified Paths:
--------------
trunk/unity.sh
Added Paths:
-----------
trunk/lib/openlibraries/Info.plist.template
trunk/lib/openlibraries/InfoPlist.strings.template
Added: trunk/lib/openlibraries/Info.plist.template
===================================================================
--- trunk/lib/openlibraries/Info.plist.template (rev 0)
+++ trunk/lib/openlibraries/Info.plist.template 2007-05-27 17:42:12 UTC (rev 142)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleName</key>
+ <string>HDRFlow OpenLibraries</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.cryogenicgraphics.openlibraries</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleSignature</key>
+ <string>FLOW</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>NSPrincipalClass</key>
+ <string></string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright (c) VM Inc. Parts Copyright (c) Goncalo de Carvalho</string>
+ <key>CFBundleGetInfoString</key>
+ <string>HDRFlow OpenLibraries - A framework for rich-media applications.</string>
+</dict>
+</plist>
Added: trunk/lib/openlibraries/InfoPlist.strings.template
===================================================================
(Binary files differ)
Property changes on: trunk/lib/openlibraries/InfoPlist.strings.template
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-05-26 19:00:16 UTC (rev 141)
+++ trunk/unity.sh 2007-05-27 17:42:12 UTC (rev 142)
@@ -1,24 +1,50 @@
#!/bin/sh -x
+# Copyright (c) 2007 Goncalo de Carvalho.
+# Released under the GPLv2 or later.
# Unification of build and distribution:
# recurses into lib and app directories, building each in turn.
-# updates Boost version in VC8 project files.
+# updates Boost version in VC project files.
+# builds OS/X frameworks
+check_status( )
+{
+ if [ $1 = 0 ]
+ then
+ echo " succeeded."
+ else
+ echo " failed. Aborting..."
+ exit 1
+ fi
+}
+
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evb)"
+ echo "usage: `basename $0` options (-evbfiox)"
exit 1
fi
+PLATFORM=`uname -s`
+
update_boost_version=0
boost_old_version=1_33_1
boost_new_version=1_34
-while getopts "v:b:e" option
+build_frameworks=0
+framework_version="A"
+install_name_prefix="/Library/Frameworks"
+
+output_directory="."
+
+while getopts "v:b:efi:o:x:" option
do
case $option in
e ) update_boost_version=1;;
v ) boost_old_version="$OPTARG";;
b ) boost_new_version="$OPTARG";;
+ f ) build_frameworks=1;;
+ x ) framework_version="$OPTARG";;
+ o ) output_directory="$OPTARG";;
+ i ) install_name_prefix="$OPTARG";;
esac
done
@@ -29,9 +55,98 @@
find . -type f -name '*.vcproj' -print | while read i
do cp $i $i.unity.bak &&
sed -e "s|boost-$boost_old_version|boost-$boost_new_version|g" -e "s|$boost_old_version.lib|$boost_new_version.lib|g" $i.unity.bak > $i &&
- rm $i.unity.bak
+ rm -f $i.unity.bak
done
fi
+make_framework_dir( )
+{
+ framework_dir="$output_directory/$1.framework"
+ mkdir -p "$framework_dir" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Headers" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Resources/English.lproj/Documentation" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Resources/Portuguese.lproj/Documentation" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Libraries" &&
+ ln -sf "$framework_version" "$framework_dir/Versions/Current" &&
+ ln -sf "Versions/Current/Headers" "$framework_dir/Headers" &&
+ ln -sf "Versions/Current/Resources" "$framework_dir/Resources" &&
+ ln -sf "Versions/Current/Libraries" "$framework_dir/Libraries"
+}
+
+make_framework_headers( )
+{
+ tl=`cat -n $1/Makefile.am | cut -f 1 | tail -n 1` &&
+ hl=`cat -n $1/Makefile.am | grep HEADERS | cut -f 1` &&
+ headers=`cat $1/Makefile.am | tail -n $((tl-hl)) | cut -f 2` &&
+ for i in $headers
+ do basedir=`dirname $1/$i | sed -e "s|$1||g"` &&
+ mkdir -p $2.framework/Versions/Current/Headers/$basedir &&
+ cp -R $1/$i $2.framework/Versions/Current/Headers/$basedir
+ done
+}
+
+make_framework_libs( )
+{
+ libs=`ls $2/.libs/*.?.dylib`
+ for i in $libs
+ do if [ ! -L $i ]
+ then ln -sf Versions/Current/$1 $1.framework/$1 &&
+ cp $i $1.framework/Versions/Current/$1 &&
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
+ fi
+ done
+}
+
+make_framework_deps( )
+{
+ deplist="GLEW boost"
+ for i in $deplist
+ do depname=`otool -L $1.framework/$1 | grep $i | cut -d ' ' -f 1`
+ for j in $depname
+ do depdir=`dirname $j`
+ libname="$j"
+ if [ $depdir == "." ]
+ then libname="/usr/local/lib/$depdir/$j"
+ fi
+ base=`basename $j`
+ cp $libname $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
+ install_name_tool -change $j $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1
+ done
+ done
+}
+
+make_framework_resources( )
+{
+ cp ./lib/openlibraries/Info.plist.template $1.framework/Resources/Info.plist &&
+ cp ./lib/openlibraries/InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings
+}
+
+make_framework_plugins( )
+{
+ echo $1
+}
+
+make_framework( )
+{
+ make_framework_dir $1 &&
+ make_framework_headers $2 $1 &&
+ make_framework_libs $1 $2 &&
+ make_framework_resources $1
+ make_framework_deps $1
+}
+
+if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
+then
+ echo "Building OS/X Frameworks..."
+
+ echo " HDRFlowPlugin..." &&
+ make_framework "HDRFlowPlugin" "./lib/openlibraries/src/openpluginlib/pl" &&
+ echo " HDRFlowImage..." &&
+ make_framework "HDRFlowImage" "./lib/openlibraries/src/openimagelib/il" &&
+ echo -n " HDRFlowMedia..." &&
+ make_framework "HDRFlowMedia" "./lib/openlibraries/src/openmedialib/ml"
+ check_status $?
+fi
+
exit 0
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <gl...@us...> - 2007-06-14 20:34:52
|
Revision: 151
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=151&view=rev
Author: glslang
Date: 2007-06-14 13:34:49 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
+ os/x framework mods
Modified Paths:
--------------
trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
trunk/unity.sh
Removed Paths:
-------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser
Deleted: trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 2007-06-14 20:34:49 UTC (rev 151)
@@ -1,1330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>ActivePerspectiveName</key>
- <string>Project</string>
- <key>AllowedModules</key>
- <array>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Name</key>
- <string>Groups and Files Outline View</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Name</key>
- <string>Editor</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCTaskListModule</string>
- <key>Name</key>
- <string>Task List</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Name</key>
- <string>File and Smart Group Detail Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Name</key>
- <string>Detailed Build Results Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Name</key>
- <string>Project Batch Find Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXRunSessionModule</string>
- <key>Name</key>
- <string>Run Log</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXBookmarksModule</string>
- <key>Name</key>
- <string>Bookmarks Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXClassBrowserModule</string>
- <key>Name</key>
- <string>Class Browser</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXCVSModule</string>
- <key>Name</key>
- <string>Source Code Control Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXDebugBreakpointsModule</string>
- <key>Name</key>
- <string>Debug Breakpoints Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDockableInspector</string>
- <key>Name</key>
- <string>Inspector</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXOpenQuicklyModule</string>
- <key>Name</key>
- <string>Open Quickly Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Name</key>
- <string>Debugger</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Name</key>
- <string>Debug Console</string>
- </dict>
- </array>
- <key>Description</key>
- <string>DefaultDescriptionKey</string>
- <key>DockingSystemVisible</key>
- <false/>
- <key>Extension</key>
- <string>mode1</string>
- <key>FavBarConfig</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>6785B4070C0B3E08008277DB</string>
- <key>XCBarModuleItemNames</key>
- <dict/>
- <key>XCBarModuleItems</key>
- <array/>
- </dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>com.apple.perspectives.project.mode1</string>
- <key>MajorVersion</key>
- <integer>31</integer>
- <key>MinorVersion</key>
- <integer>1</integer>
- <key>Name</key>
- <string>Default</string>
- <key>Notifications</key>
- <array/>
- <key>OpenEditors</key>
- <array/>
- <key>PerspectiveWidths</key>
- <array>
- <integer>-1</integer>
- <integer>-1</integer>
- </array>
- <key>Perspectives</key>
- <array>
- <dict>
- <key>ChosenToolbarItems</key>
- <array>
- <string>active-target-popup</string>
- <string>active-buildstyle-popup</string>
- <string>action</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>buildOrClean</string>
- <string>build-and-runOrDebug</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
- <string>get-info</string>
- <string>toggle-editor</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>com.apple.pbx.toolbar.searchfield</string>
- </array>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProjectWithEditor</string>
- <key>Identifier</key>
- <string>perspective.project</string>
- <key>IsVertical</key>
- <false/>
- <key>Layout</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <true/>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>29B97314FDCFA39411CA2CEA</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 338}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <true/>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 356}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>203pt</string>
- </dict>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20306471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20406471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {482, 0}}</string>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>0pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20506471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Detail</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 5}, {482, 351}}</string>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Proportion</key>
- <string>351pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>482pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project</string>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- <string>XCModuleDock</string>
- <string>PBXNavigatorGroup</string>
- <string>XCDetailModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>6785B4050C0B3E08008277DB</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>6785B4060C0B3E08008277DB</string>
- <string>1CE0B20306471E060097A5F4</string>
- <string>1CE0B20506471E060097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.default</string>
- </dict>
- <dict>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProject</string>
- <key>Identifier</key>
- <string>perspective.morph</string>
- <key>IsVertical</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>11E0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>29B97314FDCFA39411CA2CEA</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 337}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <integer>1</integer>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 355}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>373 269 690 397 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Morph</string>
- <key>PreferredWidth</key>
- <integer>300</integer>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>11E0B1FE06471DED0097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.default.short</string>
- </dict>
- </array>
- <key>PerspectivesBarVisible</key>
- <false/>
- <key>ShelfIsVisible</key>
- <false/>
- <key>SourceDescription</key>
- <string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TimeStamp</key>
- <real>0.0</real>
- <key>ToolbarDisplayMode</key>
- <integer>1</integer>
- <key>ToolbarIsVisible</key>
- <true/>
- <key>ToolbarSizeMode</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Perspectives</string>
- <key>UpdateMessage</key>
- <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
- <key>WindowJustification</key>
- <integer>5</integer>
- <key>WindowOrderList</key>
- <array>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <string>6785B4080C0B3E08008277DB</string>
- <string>/Users/goncalo/src/hdrflow/trunk/app/HDRFlow/HDRFlow.xcodeproj</string>
- </array>
- <key>WindowString</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- <key>WindowTools</key>
- <array>
- <dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>windowTool.build</string>
- <key>IsVertical</key>
- <true/>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528F0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string></string>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {500, 218}}</string>
- <key>RubberWindowFrame</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>218pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>XCMainBuildResultsModuleGUID</string>
- <key>PBXProjectModuleLabel</key>
- <string>Build</string>
- <key>XCBuildResultsTrigger_Collapse</key>
- <integer>1021</integer>
- <key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 223}, {500, 236}}</string>
- <key>RubberWindowFrame</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Proportion</key>
- <string>236pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>459pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Build Results</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXBuildResultsModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TableOfContents</key>
- <array>
- <string>6785B4080C0B3E08008277DB</string>
- <string>6785B4090C0B3E08008277DB</string>
- <string>1CD0528F0623707200166675</string>
- <string>XCMainBuildResultsModuleGUID</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.build</string>
- <key>WindowString</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- <key>WindowToolGUID</key>
- <string>6785B4080C0B3E08008277DB</string>
- <key>WindowToolIsVisible</key>
- <false/>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debugger</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>Debugger</key>
- <dict>
- <key>HorizontalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {317, 164}}</string>
- <string>{{317, 0}, {377, 164}}</string>
- </array>
- </dict>
- <key>VerticalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {694, 164}}</string>
- <string>{{0, 164}, {694, 216}}</string>
- </array>
- </dict>
- </dict>
- <key>LauncherConfigVersion</key>
- <string>8</string>
- <key>PBXProjectModuleGUID</key>
- <string>1C162984064C10D400B95A72</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debug - GLUTExamples (Underwater)</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>DebugConsoleDrawerSize</key>
- <string>{100, 120}</string>
- <key>DebugConsoleVisible</key>
- <string>None</string>
- <key>DebugConsoleWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>DebugSTDIOWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>Frame</key>
- <string>{{0, 0}, {694, 380}}</string>
- <key>RubberWindowFrame</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugSessionModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>1C0AD2AB069F1E9B00FABCE6</string>
- <string>1C162984064C10D400B95A72</string>
- <string>1C0AD2AC069F1E9B00FABCE6</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.debug</string>
- <key>WindowString</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1CD10A99069EF8BA00B06720</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.find</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CDD528C0622207200134675</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528D0623707200166675</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {781, 167}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>781pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528E0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>Project Find</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{8, 0}, {773, 254}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>428pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project Find</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXProjectFindModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C530D57069F1CE1000CFCEE</string>
- <string>1C530D58069F1CE1000CFCEE</string>
- <string>1C530D59069F1CE1000CFCEE</string>
- <string>1CDD528C0622207200134675</string>
- <string>1C530D5A069F1CE1000CFCEE</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>1CD0528E0623707200166675</string>
- </array>
- <key>WindowString</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1C530D57069F1CE1000CFCEE</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>MENUSEPARATOR</string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debuggerConsole</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAAC065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debugger Console</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {440, 358}}</string>
- <key>RubberWindowFrame</key>
- <string>650 41 440 400 0 0 1280 1002 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger Console</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugCLIModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C78EAAD065D492600B07095</string>
- <string>1C78EAAE065D492600B07095</string>
- <string>1C78EAAC065D492600B07095</string>
- </array>
- <key>WindowString</key>
- <string>650 41 440 400 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>windowTool.run</string>
- <key>IsVertical</key>
- <true/>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>LauncherConfigVersion</key>
- <string>3</string>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528B0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>Run</string>
- <key>Runner</key>
- <dict>
- <key>HorizontalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {493, 167}}</string>
- <string>{{0, 176}, {493, 267}}</string>
- </array>
- </dict>
- <key>VerticalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {405, 443}}</string>
- <string>{{414, 0}, {514, 443}}</string>
- </array>
- </dict>
- </dict>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {459, 159}}</string>
- <key>RubberWindowFrame</key>
- <string>316 534 459 200 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXRunSessionModule</string>
- <key>Proportion</key>
- <string>159pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>159pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Run Log</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXRunSessionModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TableOfContents</key>
- <array>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <string>6785B40A0C0B3E08008277DB</string>
- <string>1CD0528B0623707200166675</string>
- <string>6785B40B0C0B3E08008277DB</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.run</string>
- <key>WindowString</key>
- <string>316 534 459 200 0 0 1280 778 </string>
- <key>WindowToolGUID</key>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <key>WindowToolIsVisible</key>
- <false/>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.scm</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB2065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB3065D492600B07095</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- ...
[truncated message content] |
|
From: <gl...@us...> - 2007-06-16 22:00:20
|
Revision: 153
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=153&view=rev
Author: glslang
Date: 2007-06-16 15:00:18 -0700 (Sat, 16 Jun 2007)
Log Message:
-----------
+ os/x package maker project
Modified Paths:
--------------
trunk/unity.sh
Added Paths:
-----------
trunk/HDRFlowFramework.pmproj
Added: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowFramework.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-15 21:39:08 UTC (rev 152)
+++ trunk/unity.sh 2007-06-16 22:00:18 UTC (rev 153)
@@ -326,6 +326,20 @@
find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
}
+make_installer( )
+{
+ TMP="/var/tmp"
+ FMWK="/var/tmp/dstroot$$"
+
+ mkdir -p $FMWK &&
+ cp -R ./HDRFlow.framework $FMWK
+
+ #/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p $TMP/HDRFlowFramework.pkg \
+ # -f $TMP/dstroot$$ -i $PWD/dist/$PLATFORM/core-Info.plist -d $PWD/dist/$PLATFORM/core-desc.plist -ds -v &&
+
+ rm -rf $FMWK
+}
+
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
then
echo "Building OS/X Frameworks..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 18:20:52
|
Revision: 160
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=160&view=rev
Author: glslang
Date: 2007-06-24 11:20:51 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+distibution script fixes and updates
Modified Paths:
--------------
trunk/HDRFlow.pmproj
trunk/HDRFlowFramework.pmproj
trunk/app/HDRFlow/English.lproj/InfoPlist.strings
trunk/app/HDRFlow/Info.plist
trunk/unity.sh
Added Paths:
-----------
trunk/HDRFlowApp.pmproj
Modified: trunk/HDRFlow.pmproj
===================================================================
(Binary files differ)
Added: trunk/HDRFlowApp.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowApp.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/Info.plist
===================================================================
--- trunk/app/HDRFlow/Info.plist 2007-06-24 16:43:23 UTC (rev 159)
+++ trunk/app/HDRFlow/Info.plist 2007-06-24 18:20:51 UTC (rev 160)
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.HDRFlow</string>
+ <string>com.cryogenicgraphics.hdrflow</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>????</string>
+ <string>HDRF</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>0.1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-24 16:43:23 UTC (rev 159)
+++ trunk/unity.sh 2007-06-24 18:20:51 UTC (rev 160)
@@ -333,6 +333,11 @@
echo "not implemented"
}
+make_app( )
+{
+ cp -R ./app/HDRFlow/build/Release/HDRFlow.app .
+}
+
make_pkg_installer( )
{
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg
@@ -354,14 +359,18 @@
then echo " Building Umbrella Framework..."
echo -n " HDRFlow..."
make_umbrella_framework
- check_status $?
-
- if [ "$build_installer -eq 1 ]
- then echo " Building packages..."
- make_pkg_installer
- check_status $?
- fi
+ check_status $?
fi
+
+ echo -n " HDRFlow application..."
+ make_app
+ check_status $?
+
+ if [ "$build_installer" -eq 1 ]
+ then echo " Building packages..."
+ make_pkg_installer
+ check_status $?
+ fi
fi
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-12 22:11:49
|
Revision: 183
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=183&view=rev
Author: glslang
Date: 2007-07-12 15:11:47 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
+olibs integration
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/app/HDRFlow/ScriptEngine.hpp
trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
trunk/unity.sh
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-12 22:11:47 UTC (rev 183)
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */; };
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
@@ -30,6 +31,7 @@
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
+ 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HDRFlow.framework; path = /Library/Frameworks/HDRFlow.framework; sourceTree = "<absolute>"; };
671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
@@ -55,6 +57,7 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */,
67A8A6EA0C41836600DB3F1B /* Python.framework in Frameworks */,
+ 67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -79,6 +82,7 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
+ 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */,
67A8A6E90C41836600DB3F1B /* Python.framework */,
67DC62170C2EC0D9005CFE6E /* OpenGL.framework */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
@@ -277,6 +281,10 @@
buildSettings = {
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ /usr/include/python2.3,
+ );
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
@@ -287,6 +295,10 @@
buildSettings = {
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ /usr/include/python2.3,
+ );
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-12 22:11:47 UTC (rev 183)
@@ -7,11 +7,15 @@
#include "ScriptEngine.hpp"
+namespace py = boost::python;
+
namespace hdrflow {
ScriptEngine::ScriptEngine( )
{
Py_Initialize( );
+
+ main_module_ = py::object( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
}
ScriptEngine::~ScriptEngine( )
Modified: trunk/app/HDRFlow/ScriptEngine.hpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.hpp 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/ScriptEngine.hpp 2007-07-12 22:11:47 UTC (rev 183)
@@ -8,7 +8,7 @@
#ifndef SCRIPT_ENGINE_INC_
#define SCRIPT_ENGINE_INC_
-#include <Python/python.h>
+#include <HDRFlow/openlibraries.hpp>
namespace hdrflow {
@@ -21,6 +21,7 @@
bool eval( );
private:
+ boost::python::object main_module_;
};
}
Modified: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-07-12 22:11:47 UTC (rev 183)
@@ -11,14 +11,18 @@
openlibraries.cpp \
openlibraries.hpp
-libumbrella_framework_la_CXXFLAGS = \
- $(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+libumbrella_framework_la_CXXFLAGS = \
+ $(OLIB_CXXFLAGS) \
+ $(BOOST_INCLUDE_PATH) \
+ $(GLEW_INCLUDE_PATH) \
+ $(PYTHON_INCLUDE_PATH)
libumbrella_framework_la_LIBADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- $(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
+ $(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
+ $(BOOST_PYTHON_LIBS) \
+ $(GLEW_LIBS)
libumbrella_framework_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-12 22:11:47 UTC (rev 183)
@@ -8,6 +8,8 @@
#ifndef OPENLIBRARIES_INC_
#define OPENLIBRARIES_INC_
+#include <boost/python.hpp>
+
#include <openpluginlib/pl/openpluginlib.hpp>
#endif
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/unity.sh 2007-07-12 22:11:47 UTC (rev 183)
@@ -323,7 +323,7 @@
done
# Copy Boost headers
- cp -R /usr/local/include/boost-1_35/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ cp -R /usr/local/include/boost-$boost_new_version/boost 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 ''
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-14 23:36:27
|
Revision: 184
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=184&view=rev
Author: glslang
Date: 2007-07-14 16:36:02 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
+Python interpreter initial implementation
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/keyedobjects.nib
trunk/app/HDRFlow/ScriptEditorController.h
trunk/app/HDRFlow/ScriptEditorController.mm
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/app/HDRFlow/ScriptEngine.hpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
Modified: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib 2007-07-14 23:36:02 UTC (rev 184)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 49 356 240 0 0 1280 778 </string>
+ <string>81 58 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
Modified: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/ScriptEditorController.h
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.h 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/app/HDRFlow/ScriptEditorController.h 2007-07-14 23:36:02 UTC (rev 184)
@@ -7,13 +7,21 @@
#import <Cocoa/Cocoa.h>
+// forward declaration
+namespace hdrflow { class ScriptEngine; }
+
@interface ScriptEditorController : NSWindowController
{
IBOutlet NSTextView* scriptEdit_;
IBOutlet NSTextView* scriptOutput_;
IBOutlet NSTextField* scriptStatus_;
+
+ hdrflow::ScriptEngine* engine_;
}
+- ( void ) executeScript;
+- ( void ) clearScript;
+
- ( IBAction ) executeScript: ( id ) sender;
- ( IBAction ) clearScript: ( id ) sender;
Modified: trunk/app/HDRFlow/ScriptEditorController.mm
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-14 23:36:02 UTC (rev 184)
@@ -7,16 +7,64 @@
#import "ScriptEditorController.h"
+#import "ScriptEngine.hpp"
+
@implementation ScriptEditorController
+#pragma mark ---- IB actions ----
+
- ( IBAction ) executeScript: ( id ) sender
{
+ [ self executeScript ];
}
- ( IBAction ) clearScript: ( id ) sender
{
- [ scriptEdit_ setString: @""];
- [ scriptEdit_ setNeedsDisplay: YES];
+ [ self clearScript ];
}
+- ( id ) initWithWindowNibName: ( NSString* ) windowNibName
+{
+ engine_ = new hdrflow::ScriptEngine( );
+ return [ super initWithWindowNibName: windowNibName ];
+}
+
+- ( void ) dealloc
+{
+ delete engine_;
+ [ super dealloc ];
+}
+
+- ( void ) executeScript
+{
+ NSString* script = [ scriptEdit_ string ];
+ NSString* output = [ scriptOutput_ string ];
+
+ if( engine_->eval( [ script UTF8String ] ) )
+ {
+ output = [ output stringByAppendingString: script ];
+ output = [ output stringByAppendingString: @"\n" ];
+ [ scriptStatus_ setStringValue: @"Script successful." ];
+ }
+ else
+ {
+ output = [ output stringByAppendingString: @"Error in script:\n\t" ];
+ [ scriptStatus_ setStringValue: @"Script failed." ];
+ }
+
+ NSString* out = [ [ [ NSString alloc ] initWithUTF8String: engine_->result( ).c_str( ) ] autorelease ];
+ output = [ output stringByAppendingString: out ];
+
+ [ scriptOutput_ setString: output ];
+ [ scriptOutput_ setNeedsDisplay: YES ];
+
+ [ self clearScript ];
+}
+
+- ( void ) clearScript
+{
+ [ scriptEdit_ setString: @"" ];
+ [ scriptEdit_ setNeedsDisplay: YES ];
+}
+
@end
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-14 23:36:02 UTC (rev 184)
@@ -8,14 +8,27 @@
#include "ScriptEngine.hpp"
namespace py = boost::python;
+namespace pl = olib::openpluginlib;
namespace hdrflow {
+namespace
+{
+ pl::string error_to_result( PyObject* obj )
+ {
+ if( obj )
+ {
+ py::extract<std::string> extract( obj );
+ if( extract.check( ) ) return extract( );
+ }
+
+ return pl::string( );
+ }
+}
+
ScriptEngine::ScriptEngine( )
{
Py_Initialize( );
-
- main_module_ = py::object( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
}
ScriptEngine::~ScriptEngine( )
@@ -23,9 +36,49 @@
Py_Finalize( );
}
-bool ScriptEngine::eval( )
+bool ScriptEngine::eval( const pl::string& str )
{
- return false;
+ py::object main_module( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
+ py::object main_namespace = main_module.attr( "__dict__" );
+
+ result_.clear( );
+
+ try
+ {
+ py::handle<> handle;
+ if( !( handle = py::handle<>(
+ py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) ) ) )
+ {
+ PyErr_Clear( );
+ handle = py::handle<>( PyRun_String( str.c_str( ), Py_file_input, main_namespace.ptr( ), main_namespace.ptr( ) ) );
+ }
+
+ py::object strobj( py::handle<>( PyObject_Str( py::object( handle ).ptr( ) ) ) );
+ if( strobj )
+ result_ = PyString_AsString( strobj.ptr( ) ) + pl::string( "\n" );
+ }
+ catch( py::error_already_set )
+ {
+ PyObject* error_type;
+ PyObject* error_data;
+ PyObject* error_traceback;
+
+ PyErr_Fetch( &error_type, &error_data, &error_traceback );
+
+ result_ += error_to_result( error_type );
+ result_ += error_to_result( error_data );
+ result_ += error_to_result( error_traceback );
+ result_ += "\n";
+
+ return false;
+ }
+
+ return true;
}
+pl::string ScriptEngine::result( ) const
+{
+ return result_;
}
+
+}
Modified: trunk/app/HDRFlow/ScriptEngine.hpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.hpp 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/app/HDRFlow/ScriptEngine.hpp 2007-07-14 23:36:02 UTC (rev 184)
@@ -18,10 +18,11 @@
explicit ScriptEngine( );
~ScriptEngine( );
- bool eval( );
+ bool eval( const olib::openpluginlib::string& str );
+ olib::openpluginlib::string result( ) const;
private:
- boost::python::object main_module_;
+ olib::openpluginlib::string result_;
};
}
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-12 22:11:47 UTC (rev 183)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-14 23:36:02 UTC (rev 184)
@@ -8,7 +8,9 @@
#ifndef OPENLIBRARIES_INC_
#define OPENLIBRARIES_INC_
+#ifndef __OBJC__
#include <boost/python.hpp>
+#endif
#include <openpluginlib/pl/openpluginlib.hpp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-15 18:44:51
|
Revision: 187
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=187&view=rev
Author: glslang
Date: 2007-07-15 11:44:50 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
+ Python modules within HDRFlow framework
Modified Paths:
--------------
trunk/app/HDRFlow/ScriptEditorController.mm
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/unity.sh
Modified: trunk/app/HDRFlow/ScriptEditorController.mm
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-15 18:34:09 UTC (rev 186)
+++ trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-15 18:44:50 UTC (rev 187)
@@ -38,7 +38,7 @@
- ( void ) executeScript
{
NSString* script = [ scriptEdit_ string ];
- NSString* output = [ scriptOutput_ string ];
+ NSString* output = [ [ [ NSString alloc ] initWithString: @"" ] autorelease ];
if( engine_->eval( [ script UTF8String ] ) )
{
@@ -54,6 +54,7 @@
NSString* out = [ [ [ NSString alloc ] initWithUTF8String: engine_->result( ).c_str( ) ] autorelease ];
output = [ output stringByAppendingString: out ];
+ output = [ output stringByAppendingString: @"\n" ];
[ scriptOutput_ setString: output ];
[ scriptOutput_ setNeedsDisplay: YES ];
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-15 18:34:09 UTC (rev 186)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-15 18:44:50 UTC (rev 187)
@@ -18,8 +18,10 @@
{
if( obj )
{
- py::extract<std::string> extract( obj );
- if( extract.check( ) ) return extract( );
+ py::object strobj( py::handle<>( PyObject_Str( obj ) ) );
+ py::extract<std::string> extract( strobj );
+ if( extract.check( ) )
+ return extract( );
}
return pl::string( );
@@ -46,16 +48,20 @@
try
{
py::handle<> handle;
- if( !( handle = py::handle<>(
- py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) ) ) )
+ if( !( handle =
+ py::handle<>( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) ) ) )
{
+ // clear all errors so the call below has a chance to succeed.
PyErr_Clear( );
handle = py::handle<>( PyRun_String( str.c_str( ), Py_file_input, main_namespace.ptr( ), main_namespace.ptr( ) ) );
}
py::object strobj( py::handle<>( PyObject_Str( py::object( handle ).ptr( ) ) ) );
if( strobj )
- result_ = PyString_AsString( strobj.ptr( ) ) + pl::string( "\n" );
+ {
+ result_ = PyString_AsString( strobj.ptr( ) );
+ if( result_ == "None" ) result_.clear( );
+ }
}
catch( py::error_already_set )
{
@@ -64,12 +70,18 @@
PyObject* error_traceback;
PyErr_Fetch( &error_type, &error_data, &error_traceback );
-
+
result_ += error_to_result( error_type );
result_ += error_to_result( error_data );
- result_ += error_to_result( error_traceback );
- result_ += "\n";
+ result_ += error_to_result( error_traceback );
+
+ if( result_.empty( ) )
+ result_ = "<no info available>";
+ Py_XDECREF( error_type );
+ Py_XDECREF( error_data );
+ Py_XDECREF( error_traceback );
+
return false;
}
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-07-15 18:34:09 UTC (rev 186)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-07-15 18:44:50 UTC (rev 187)
@@ -81,6 +81,7 @@
$(BOOST_FILESYSTEM_LIBS) \
$(BOOST_REGEX_LIBS) \
$(BOOST_THREAD_LIBS) \
+ $(BOOST_IOSTREAMS_LIBS) \
$(GLEW_LIBS) \
$(XML2_LIBS) \
$(OFX_LIBS)
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-07-15 18:34:09 UTC (rev 186)
+++ trunk/unity.sh 2007-07-15 18:44:50 UTC (rev 187)
@@ -32,12 +32,13 @@
build_frameworks=0
build_umbrella=0
build_installer=0
+build_application=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
output_directory="."
-while getopts "v:b:efi:o:x:up" option
+while getopts "v:b:efi:o:x:upa" option
do
case $option in
e ) update_boost_version=1;;
@@ -49,6 +50,7 @@
i ) install_name_prefix="$OPTARG";;
u ) build_umbrella=1;;
p ) build_installer=1;;
+ a ) build_application=1;;
esac
done
@@ -105,9 +107,23 @@
cp $i $1.framework/Versions/Current/$1 &&
install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
fi
- done
+ done
}
+make_framework_python_libs( )
+{
+ if [ -d $2 ]
+ then
+ libs=`ls $2/.libs/*.?.dylib`
+ for i in $libs
+ do if [ ! -L $i ]
+ then cp $i $1.framework/Versions/$framework_version/PlugIns/$1.so &&
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
+ fi
+ done
+ fi
+}
+
make_framework_deps( )
{
deplist="GLEW boost"
@@ -247,51 +263,60 @@
make_framework_dir $1 &&
make_framework_headers $2 $1 &&
make_framework_libs $1 $2 &&
- 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_python_libs $1 "$2/../py" &&
+ make_framework_resources $1 $2 &&
+ make_framework_deps $1 &&
+ make_framework_plugins $2 $1 &&
+ make_framework_interdeps $1 &&
+ make_framework_plugins_deps $1 &&
make_framework_libs_deps $1
}
-make_umbrella_framework( )
+make_umbrella_framework_deps( )
{
- 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`
+ do depname=`otool -L $1 | 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
+ $1
;;
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
+ $1
;;
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
+ $1
;;
esac
fi
done
+}
+
+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"
+
+ make_umbrella_framework_deps "HDRFlow.framework/HDRFlow"
+ 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"
+
deplist="GLEW boost"
for i in $deplist
do fmwklist="HDRFlowPlugin HDRFlowImage HDRFlowMedia"
@@ -301,8 +326,17 @@
do base=`basename $k`
install_name_tool -change $k \
$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
- HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/$j
+ HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/$j
done
+
+ # Python modules
+ depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so | 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 \
+ HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/PlugIns/$j.so
+ done
done
done
@@ -362,9 +396,12 @@
check_status $?
fi
- echo -n " HDRFlow application..."
- make_app
- check_status $?
+ if [ "$build_application" -eq 1 ]
+ then
+ echo -n " HDRFlow application..."
+ make_app
+ check_status $?
+ fi
if [ "$build_installer" -eq 1 ]
then echo " Building packages..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-26 21:36:18
|
Revision: 207
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=207&view=rev
Author: glslang
Date: 2007-07-26 14:36:16 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
+ Viewport drawer adjustments and headers added to umbrella framework
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-26 21:36:16 UTC (rev 207)
@@ -16,8 +16,8 @@
<key>IBOpenObjects</key>
<array>
<integer>266</integer>
+ <integer>21</integer>
<integer>29</integer>
- <integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-26 21:36:16 UTC (rev 207)
@@ -11,15 +11,15 @@
<key>12</key>
<string>395 379 650 442 0 0 1440 878 </string>
<key>33</key>
- <string>642 360 401 293 0 0 1440 878 </string>
+ <string>519 453 401 293 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>33</integer>
+ <integer>12</integer>
<integer>5</integer>
- <integer>12</integer>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-26 21:36:16 UTC (rev 207)
@@ -5,6 +5,8 @@
// Released under the GPL.
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+#include <HDRFlow/openlibraries.hpp>
+
#include "ScriptEngine.hpp"
namespace py = boost::python;
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-26 21:36:16 UTC (rev 207)
@@ -12,6 +12,17 @@
#include <boost/python.hpp>
#endif
+#include <GL/glew.h>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/tokenizer.hpp>
+
#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
+#include <openimagelib/il/il.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
+#include <openmedialib/ml/ml.hpp>
+#include <openmedialib/ml/openmedialib_plugin.hpp>
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-27 22:34:38
|
Revision: 208
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=208&view=rev
Author: glslang
Date: 2007-07-27 15:34:36 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-07-26 21:36:16 UTC (rev 207)
+++ trunk/lib/openlibraries/configure.ac 2007-07-27 22:34:36 UTC (rev 208)
@@ -179,7 +179,7 @@
OLIB_LDFLAGS='-Wl,-export-dynamic'
;;
*-apple-darwin*)
- OLIB_LDFLAGS=''
+ OLIB_LDFLAGS='-Wl,-headerpad_max_install_names'
;;
esac
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-07-26 21:36:16 UTC (rev 207)
+++ trunk/unity.sh 2007-07-27 22:34:36 UTC (rev 208)
@@ -26,8 +26,8 @@
PLATFORM=`uname -s`
update_boost_version=0
-boost_old_version=1_33_1
-boost_new_version=1_34
+boost_old_version=1_34
+boost_new_version=1_34_1
build_frameworks=0
build_umbrella=0
@@ -136,8 +136,8 @@
then libname="/usr/local/lib/$depdir/$j"
fi
base=`basename $j`
- cp $libname $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
+ cp $libname $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 &&
install_name_tool -change $j $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1
done
done
@@ -234,7 +234,7 @@
{
deplist="openpluginlib_pl openimagelib_il openmedialib_ml"
for i in $deplist
- do plugins=`ls $1.framework/PlugIns/*.dylib 2> /dev/null`
+ do plugins=`ls $1.framework/PlugIns/*.* 2> /dev/null`
for j in $plugins
do depname=`otool -L $j | grep $i | cut -d ' ' -f 1`
if [ ! -z $depname ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 15:50:47
|
Revision: 225
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=225&view=rev
Author: glslang
Date: 2007-08-04 08:50:45 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ Multiple column PlugIns OutlineView
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
trunk/unity.sh
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 15:50:45 UTC (rev 225)
@@ -9,7 +9,7 @@
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>500 443 439 314 0 0 1440 878 </string>
+ <string>435 427 594 345 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>33</integer>
+ <integer>12</integer>
<integer>10</integer>
<integer>5</integer>
- <integer>33</integer>
- <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 15:50:45 UTC (rev 225)
@@ -81,6 +81,11 @@
{
PlugInsPreferencesOutlineViewNode* child =
[ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->name( ) ).c_str( ) ] ];
+
+ [ child setType: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->type( ) ).c_str( ) ] ];
+ [ child setExtension: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->extension( ) ).c_str( ) ] ];
+ [ child setMerit: [ [ NSString alloc ] initWithFormat: @"%d", I->merit( ) ] ];
+
[ node addChildObject: child ];
}
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-04 15:50:45 UTC (rev 225)
@@ -10,13 +10,24 @@
@interface PlugInsPreferencesOutlineViewNode : NSObject
{
NSMutableArray* children;
+
NSString* itemName;
+ NSString* type;
+ NSString* extension;
+ NSString* merit;
}
- ( id ) initWithString: ( NSString* ) name;
- ( void ) addChildObject: ( id ) childObject;
+
- ( NSString* ) itemName;
+- ( NSString* ) type;
+- ( void ) setType: ( NSString* ) plugInType;
+- ( NSString* ) extension;
+- ( void ) setExtension: ( NSString* ) extensionTypes;
+- ( NSString* ) merit;
+- ( void ) setMerit: ( NSString* ) meritValue;
- ( int ) numberOfChildren;
- ( NSArray* ) children;
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-04 15:50:45 UTC (rev 225)
@@ -22,7 +22,12 @@
- ( void ) dealloc
{
[ children release ];
+
[ itemName release ];
+ [ type release ];
+ [ extension release ];
+ [ merit release ];
+
[ super dealloc ];
}
@@ -36,6 +41,36 @@
return itemName;
}
+- ( NSString* ) type
+{
+ return type;
+}
+
+- ( void ) setType: ( NSString* ) plugInType
+{
+ type = plugInType;
+}
+
+- ( NSString* ) extension
+{
+ return extension;
+}
+
+- ( void ) setExtension: ( NSString* ) extensionTypes
+{
+ extension = extensionTypes;
+}
+
+- ( NSString* ) merit
+{
+ return merit;
+}
+
+- ( void ) setMerit: ( NSString* ) meritValue
+{
+ merit = meritValue;
+}
+
#pragma mark ---- NSTreeController and Bindings ----
- ( int ) numberOfChildren
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/unity.sh 2007-08-04 15:50:45 UTC (rev 225)
@@ -93,9 +93,29 @@
header_path_first=`cut -d '/' -f 5 header_temp.$$`
header_path_second=`cut -d '/' -f 6 header_temp.$$`
header_path="$header_path_first/$header_path_second"
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" $1/$i > $2.framework/Versions/Current/Headers/$i
+
+ cp $1/$i current_header.$$
+
+ deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+ for j in $deplist
+ do case $j in
+ openpluginlib* )
+ sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openimagelib* )
+ sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openmedialib* )
+ sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ esac
+ done
+
+ sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
done
+
rm header_temp.$$
+ rm current_header.$$
}
make_framework_libs( )
@@ -356,8 +376,9 @@
esac
done
- # Copy Boost headers
+ # Copy Boost and GLEW headers
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 ''
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 22:33:31
|
Revision: 228
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=228&view=rev
Author: glslang
Date: 2007-08-04 15:33:23 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ Initialisation with bootstrap script
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/unity.sh
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 22:33:23 UTC (rev 228)
@@ -26,6 +26,7 @@
}
- ( id ) init;
+- ( void ) initScriptEngine;
- ( BOOL ) acceptsFirstResponder;
- ( BOOL ) becomesFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 22:33:23 UTC (rev 228)
@@ -6,7 +6,6 @@
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
#import "ScriptEngine.hpp"
-
#import "HDRFlowController.h"
#import "ViewportOpenGLView.h"
#import "PreferencesController.h"
@@ -17,10 +16,24 @@
- ( id ) init
{
[ super init ];
- engine = new hdrflow::ScriptEngine( );
+ [ self initScriptEngine ];
+
return self;
}
+- ( void ) initScriptEngine
+{
+ NSString* bootstrap;
+
+ engine = new hdrflow::ScriptEngine( );
+
+ NSBundle* bundle = [ NSBundle bundleForClass: [ self class ] ];
+ bootstrap = [ bundle pathForResource: @"bootstrap" ofType: @"py" ];
+ bootstrap = [ NSString stringWithContentsOfFile: bootstrap encoding: NSUTF8StringEncoding error: NULL ];
+
+ engine->eval( [ bootstrap UTF8String ] );
+}
+
- ( void ) dealloc
{
delete engine;
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 22:33:23 UTC (rev 228)
@@ -43,8 +43,6 @@
{
[ super init ];
- opl::init( );
-
plugIns = [ [ NSMutableArray alloc ] init ];
[ self initPlugIns ];
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/unity.sh 2007-08-04 22:33:23 UTC (rev 228)
@@ -319,6 +319,16 @@
done
}
+make_umbrella_framework_python_deps( )
+{
+ install_name_tool -id $install_name_prefix/HDRFlow.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2
+ fmwklist="HDRFlowPlugin HDRFlowImage HDRFlowMedia"
+ for i in $fmwklist
+ do install_name_tool -change /Library/Frameworks/$i.framework/Versions/A/$i \
+ $install_name_prefix/HDRFlow.framework/Frameworks/$i.framework/Versions/A/$i $2
+ done
+}
+
make_umbrella_framework( )
{
rm -rf "./HDRFlow.framework"
@@ -347,19 +357,24 @@
install_name_tool -change $k \
$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/$j
- done
+ done
+ done
- # Python modules
- depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so | grep $i | cut -d ' ' -f 1`
+ for j in $fmwklist
+ do depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so | grep $i | cut -d ' ' -f 1`
for k in $depname
- do base=`basename $k`
+ do base=`basename $k`
install_name_tool -change $k \
$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
- HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/PlugIns/$j.so
+ HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so
done
done
done
+ 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"
+
# Umbrella Framework Header
deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
for i in $deplist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-06 20:40:38
|
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.
|
|
From: <gl...@us...> - 2007-08-08 21:44:24
|
Revision: 238
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=238&view=rev
Author: glslang
Date: 2007-08-08 14:44:20 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
+ build updates
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/m4/umbrella_framework.m4
trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/configure.ac 2007-08-08 21:44:20 UTC (rev 238)
@@ -132,6 +132,9 @@
dnl OFX support
AC_CHECK_OFX( )
+dnl Umbrella Framework
+AC_CHECK_UMBRELLA_FRAMEWORK()
+
dnl Boost support
AC_LANG([C++])
AC_CHECK_BOOST( )
Modified: trunk/lib/openlibraries/m4/umbrella_framework.m4
===================================================================
--- trunk/lib/openlibraries/m4/umbrella_framework.m4 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/m4/umbrella_framework.m4 2007-08-08 21:44:20 UTC (rev 238)
@@ -10,6 +10,7 @@
UMBRELLA_FLAGS=""
+ AC_MSG_CHECKING(if building an umbrella framework)
if test x$enableumbrellaframework = "xyes" ; then
case $host in
*-apple-darwin*)
Modified: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-08-08 21:44:20 UTC (rev 238)
@@ -5,6 +5,8 @@
libdir = $(OPENMEDIALIB_LIBPATH)
+if HAVE_UMBRELLAFRAMEWORK
+
lib_LTLIBRARIES = libumbrella_framework.la
libumbrella_framework_la_SOURCES = \
@@ -33,4 +35,7 @@
library_include_HEADERS = \
openlibraries.hpp
+
+endif
+
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/unity.sh 2007-08-08 21:44:20 UTC (rev 238)
@@ -96,28 +96,32 @@
header_path_second=`cut -d '/' -f 6 header_temp.$$`
header_path="$header_path_first/$header_path_second"
- cp $1/$i current_header.$$
+ if [ -r $1/$i ]
+ then
+ cp $1/$i current_header.$$
- deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
- for j in $deplist
- do case $j in
- openpluginlib* )
- sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- openimagelib* )
- sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- openmedialib* )
- sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- esac
- done
+ deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+ for j in $deplist
+ do case $j in
+ openpluginlib* )
+ sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openimagelib* )
+ sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openmedialib* )
+ sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ esac
+ done
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
- done
-
- rm header_temp.$$
- rm current_header.$$
+ sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+
+ rm current_header.$$
+ fi
+
+ rm header_temp.$$
+ done
}
make_framework_libs( )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-16 20:36:05
|
Revision: 248
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=248&view=rev
Author: glslang
Date: 2007-08-16 13:36:02 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
+ small ui updates
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/lib/openlibraries/Info.plist.template
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-15 22:46:33 UTC (rev 247)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-16 20:36:02 UTC (rev 248)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>33</integer>
<integer>5</integer>
<integer>12</integer>
<integer>10</integer>
- <integer>33</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/lib/openlibraries/Info.plist.template
===================================================================
--- trunk/lib/openlibraries/Info.plist.template 2007-08-15 22:46:33 UTC (rev 247)
+++ trunk/lib/openlibraries/Info.plist.template 2007-08-16 20:36:02 UTC (rev 248)
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.cryogenicgraphics.openlibraries</string>
+ <string>com.cryogenicgraphics.hdrflowfmwk</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 11:06:33
|
Revision: 254
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=254&view=rev
Author: glslang
Date: 2007-08-19 04:06:26 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ separates shared object functions from main code
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
trunk/unity.sh
Added Paths:
-----------
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-19 11:06:26 UTC (rev 254)
@@ -46,6 +46,8 @@
smallstringopt.h \
stream.hpp \
stream.cpp \
+ shlib.hpp \
+ shlib.cpp \
vectorstringstorage.h \
GL_utility.hpp \
GL_utility.cpp \
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -25,6 +25,7 @@
#include <openpluginlib/pl/registry.hpp>
#include <openpluginlib/pl/utf8_utils.hpp>
#include <openpluginlib/pl/opl_importer.hpp>
+#include <openpluginlib/pl/shlib.hpp>
namespace fs = boost::filesystem;
@@ -32,54 +33,7 @@
namespace
{
- // Code replication due to OFX. There are some
- // differences in how OFX plugins are specified.
- // Refactoring is left as an exercise to the reader.
#ifdef WIN32
- typedef HMODULE module_t;
- HMODULE dlopen_( const char* path )
-#elif defined __APPLE__
- typedef CFBundleRef module_t;
- CFBundleRef dlopen_( const char* path )
-#else
- typedef void* module_t;
- void* dlopen_( const char* path )
-#endif
- {
-#ifdef WIN32
- return LoadLibrary( to_wstring( path ).c_str( ) );
-#elif defined __APPLE__
- CFStringRef bundle_str = CFStringCreateWithCString( kCFAllocatorDefault, path, kCFStringEncodingASCII );
- CFURLRef url_ref = CFURLCreateWithFileSystemPath( kCFAllocatorDefault, bundle_str, kCFURLPOSIXPathStyle, true );
-
- CFBundleRef bundle = CFBundleCreate( kCFAllocatorDefault, url_ref );
-
- CFRelease( url_ref );
- CFRelease( bundle_str );
-
- return bundle;
-#else
- return dlopen( path, RTLD_GLOBAL | RTLD_NOW );
-#endif
- }
-
- void* dlsym_( module_t shared, const char* entry_point )
- {
-#ifdef WIN32
- return GetProcAddress( shared, entry_point );
-#elif defined __APPLE__
- CFStringRef entry_str = CFStringCreateWithCString( kCFAllocatorDefault, entry_point, kCFStringEncodingASCII );
-
- void* entry = CFBundleGetFunctionPointerForName( shared, entry_str );
- CFRelease( entry_str );
-
- return entry;
-#else
- return dlsym( shared, entry_point );
-#endif
- }
-
-#ifdef WIN32
// Replicate some of OFX types on Win32 to avoid an include dependency.
// In the unlikely event that they will change then this will have to be
// updated.
Added: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -0,0 +1,70 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#include <openpluginlib/pl/shlib.hpp>
+
+namespace olib { namespace openpluginlib {
+
+// Code replication due to OFX. There are some
+// differences in how OFX plugins are specified.
+// Refactoring is left as an exercise to the reader.
+
+module_t dlopen_( const char* path )
+{
+#ifdef WIN32
+ return LoadLibrary( to_wstring( path ).c_str( ) );
+#elif defined __APPLE__
+ CFStringRef bundle_str = CFStringCreateWithCString( kCFAllocatorDefault, path, kCFStringEncodingASCII );
+ CFURLRef url_ref = CFURLCreateWithFileSystemPath( kCFAllocatorDefault, bundle_str, kCFURLPOSIXPathStyle, true );
+
+ CFBundleRef bundle = CFBundleCreate( kCFAllocatorDefault, url_ref );
+
+ CFRelease( url_ref );
+ CFRelease( bundle_str );
+
+ return bundle;
+#else
+ return dlopen( path, RTLD_GLOBAL | RTLD_NOW );
+#endif
+}
+
+void* dlsym_( module_t shared, const char* entry_point )
+{
+#ifdef WIN32
+ return GetProcAddress( shared, entry_point );
+#elif defined __APPLE__
+ CFStringRef entry_str = CFStringCreateWithCString( kCFAllocatorDefault, entry_point, kCFStringEncodingASCII );
+
+ void* entry = CFBundleGetFunctionPointerForName( shared, entry_str );
+ CFRelease( entry_str );
+
+ return entry;
+#else
+ return dlsym( shared, entry_point );
+#endif
+}
+
+void dlclose_( module_t module )
+{
+#ifdef WIN32
+ FreeLibrary( module );
+#elif defined __APPLE__
+ CFRelease( module );
+#else
+ dlclose( module );
+#endif
+}
+
+} }
Added: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -0,0 +1,27 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef SHLIB_INC_
+#define SHLIB_INC_
+
+namespace olib { namespace openpluginlib {
+
+#ifdef WIN32
+typedef HMODULE module_t;
+#elif defined __APPLE__
+typedef CFBundleRef module_t;
+#else
+typedef void* module_t;
+#endif
+
+module_t dlopen_( const char* path );
+void* dlsym_( module_t shared, const char* entry_point );
+void dlclose_( module_t module );
+
+} }
+
+#endif
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/unity.sh 2007-08-19 11:06:26 UTC (rev 254)
@@ -39,7 +39,7 @@
output_directory="."
-openlibraries_configure_options= "--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
+openlibraries_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking"
while getopts "v:b:efi:o:x:upas" option
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 15:38:30
|
Revision: 257
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=257&view=rev
Author: glslang
Date: 2007-08-19 08:38:29 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ opl awareness of framework embedded plugins
Modified Paths:
--------------
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/lib/extras/src/imf/imf.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-19 15:38:29 UTC (rev 257)
@@ -63,7 +63,7 @@
[ self initNodeMetadata: @"Image" library: @"openimagelib" type: @"" ];
[ self initNodeMetadata: @"Media" library: @"openmedialib" type: @"" ];
[ self initNodeMetadata: @"Effects" library: @"openeffectslib" type: @"" ];
- [ self initNodeMetadata: @"OFX" library: @"" type: @"ofx" ];
+ [ self initNodeMetadata: @"OFX" library: @"OFX" type: @"ofx" ];
}
- ( void ) initNodeMetadata: ( NSString* ) name library: ( NSString* ) library type: ( NSString* ) type
Modified: trunk/lib/extras/src/imf/imf.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf.cpp 2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/extras/src/imf/imf.cpp 2007-08-19 15:38:29 UTC (rev 257)
@@ -15,27 +15,27 @@
// Mandatory entry points
-char* program = "Wavefront";
-char* version = IMF_PROTOCOL_CURRENT;
-char* type = "image";
-char* imageKey = "com.cryogenicgraphics.dpx";
-char* imageName = "HDRFlow DPX";
-char* imageExtension = ".dpx";
-char* imageFormatString = "%s.%04.4d%s";
-char* imageNameSyntax = "Name.####.Ext";
-int imageAddExtension = TRUE;
-int imageUsage = IMF_C_GENERIC;
-int imageOrientation = IMF_C_ORIENT_BOT_LEFT;
-int imageNumberOfLuts = 0;
-U_INT imageBitsPerLut = 0x00000000;
-int imageNumberOfChannels = 4;
-U_INT imageBitsPerChannel = 0x00000080;
-int imageNumberOfMattes = 1;
-U_INT imageBitsPerMatte = 0x00000080;
-int imageNumberOfZChannels = 0;
-U_INT imageBitsPerZChannel = 0x00000000;
-int imageSupportsActiveWindow= FALSE;
-U_INT imageAccess = IMF_C_READ_RANDOM | IMF_C_WRITE;
+char* program = "Wavefront";
+char* version = IMF_PROTOCOL_CURRENT;
+char* type = "image";
+char* imageKey = "com.cryogenicgraphics.dpx";
+char* imageName = "HDRFlow DPX";
+char* imageExtension = ".dpx";
+char* imageFormatString = "%s.%04.4d%s";
+char* imageNameSyntax = "Name.####.Ext";
+int imageAddExtension = TRUE;
+int imageUsage = IMF_C_GENERIC;
+int imageOrientation = IMF_C_ORIENT_BOT_LEFT;
+int imageNumberOfLuts = 0;
+U_INT imageBitsPerLut = 0x00000000;
+int imageNumberOfChannels = 4;
+U_INT imageBitsPerChannel = 0x00000080;
+int imageNumberOfMattes = 0;
+U_INT imageBitsPerMatte = 0x00000000;
+int imageNumberOfZChannels = 0;
+U_INT imageBitsPerZChannel = 0x00000000;
+int imageSupportsActiveWindow = FALSE;
+U_INT imageAccess = IMF_C_READ_RANDOM | IMF_C_WRITE;
int imageInit( void )
{
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-08-19 15:38:29 UTC (rev 257)
@@ -12,6 +12,10 @@
#include <shlobj.h>
#endif
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
#include <algorithm>
#include <cassert>
#include <functional>
@@ -147,12 +151,16 @@
{
# ifdef WIN32
el_reg.insert( plugins_path( ) );
-# else
+# elif !defined HAVE_UMBRELLAFRAMEWORK
el_reg.insert( OPENIMAGELIB_PLUGINS );
el_reg.insert( OPENMEDIALIB_PLUGINS );
el_reg.insert( OPENOBJECTLIB_PLUGINS );
el_reg.insert( OPENASSETLIB_PLUGINS );
el_reg.insert( OPENEFFECTSLIB_PLUGINS );
+# elif defined __APPLE__ && defined HAVE_UMBRELLAFRAMEWORK
+ el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/Resources" );
+ el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowMedia.framework/Resources" );
+ el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowEffects.framework/Resources" );
# endif
}
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 15:38:29 UTC (rev 257)
@@ -157,7 +157,7 @@
item.category = to_wstring( plugin->pluginApi );
item.context = plugin;
- db_.insert( container::value_type( L"openeffectslib", item ) );
+ db_.insert( container::value_type( L"OFX", item ) );
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-27 15:47:35
|
Revision: 270
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=270&view=rev
Author: glslang
Date: 2007-08-25 08:15:53 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
+ icons file updates
Modified Paths:
--------------
trunk/app/HDRFlow/Images/hdrflow.icns
trunk/lib/extras/src/imf/mfn/mfn.cpp
Modified: trunk/app/HDRFlow/Images/hdrflow.icns
===================================================================
(Binary files differ)
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-08-25 14:52:35 UTC (rev 269)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-08-25 15:15:53 UTC (rev 270)
@@ -5,3 +5,11 @@
// Released under the GPL.
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+#include <maya/MPxImageFile.h>
+#include <maya/MImageFileInfo.h>
+#include <maya/MImage.h>
+#include <maya/MFnPlugin.h>
+#include <maya/MStringArray.h>
+#include <maya/MIOStream.h>
+#include <maya/MGlobal.h>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-27 15:52:35
|
Revision: 267
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=267&view=rev
Author: glslang
Date: 2007-08-25 07:24:21 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
+ installer background
Modified Paths:
--------------
trunk/HDRFlowApp.pmproj
Added Paths:
-----------
trunk/app/HDRFlow/Images/installer-background.tif
Modified: trunk/HDRFlowApp.pmproj
===================================================================
(Binary files differ)
Added: trunk/app/HDRFlow/Images/installer-background.tif
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/installer-background.tif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-27 17:40:55
|
Revision: 268
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=268&view=rev
Author: glslang
Date: 2007-08-25 07:27:50 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
+ installer updates
Modified Paths:
--------------
trunk/HDRFlowApp.pmproj
trunk/HDRFlowDependencies.pmproj
trunk/HDRFlowFramework.pmproj
Modified: trunk/HDRFlowApp.pmproj
===================================================================
(Binary files differ)
Modified: trunk/HDRFlowDependencies.pmproj
===================================================================
(Binary files differ)
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-27 18:24:22
|
Revision: 283
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=283&view=rev
Author: glslang
Date: 2007-08-27 11:24:17 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
+initial installers for maya plugins
Modified Paths:
--------------
trunk/HDRFlow.pmproj
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/unity.sh
Added Paths:
-----------
trunk/HDRFlowMaya.pmproj
Modified: trunk/HDRFlow.pmproj
===================================================================
(Binary files differ)
Added: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowMaya.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-08-27 15:15:50 UTC (rev 282)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-08-27 18:24:17 UTC (rev 283)
@@ -55,9 +55,6 @@
class image_reader : public MPxImageFile
{
public:
- explicit image_reader( );
- virtual ~image_reader( );
-
static void* creator( );
virtual MStatus open( MString pathname, MImageFileInfo* info );
@@ -68,12 +65,6 @@
il::image_type_ptr im_;
};
-image_reader::image_reader( )
-{ }
-
-image_reader::~image_reader( )
-{ }
-
void* image_reader::creator( )
{
return new image_reader;
@@ -123,10 +114,10 @@
#endif
}
#ifndef NDEBUG
- else
- {
- MGlobal::displayInfo( "HDRFlow: plugin is null." );
- }
+ else
+ {
+ MGlobal::displayInfo( "HDRFlow: plugin is null." );
+ }
#endif
}
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-27 15:15:50 UTC (rev 282)
+++ trunk/unity.sh 2007-08-27 18:24:17 UTC (rev 283)
@@ -1,6 +1,6 @@
#!/bin/sh -
# Copyright (c) 2007 Goncalo de Carvalho.
-# Released under the GPLv2 or later.
+# Released under the GPLv3 or later.
# Unification of build and distribution:
# recurses into lib and app directories, building each in turn.
# updates Boost version in VC project files.
@@ -19,7 +19,22 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfioxupas)"
+ echo "usage: `basename $0` options (-evbfioxupasm)"
+ echo " -e ) update_boost_version"
+ echo " -v ) boost_old_version"
+ echo " -b ) boost_new_version"
+ echo " -f ) build OS/X frameworks"
+ echo " -x ) framework version"
+ echo " -o ) output_directory"
+ echo " -i ) install_name_prefix"
+ echo " -u ) build OS/X umbrella framework"
+ echo " -p ) build installer"
+ echo " -a ) build application"
+ echo " -s ) strip symbols"
+ echo " -m ) package maya plugins"
+ echo
+ echo " Examples:"
+ echo " sh ./unity.sh -fu - build OS/X umbrella framework"
exit 1
fi
@@ -33,6 +48,7 @@
build_umbrella=0
build_installer=0
build_application=0
+build_maya_plugins=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
strip_symbols=0
@@ -42,7 +58,7 @@
openlibraries_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking"
-while getopts "v:b:efi:o:x:upas" option
+while getopts "v:b:efi:o:x:upasm" option
do
case $option in
e ) update_boost_version=1;;
@@ -56,6 +72,7 @@
p ) build_installer=1;;
a ) build_application=1;;
s ) strip_symbols=1;;
+ m ) build_maya_plugins=1;;
esac
done
@@ -191,7 +208,7 @@
then plugins=`ls $2/../plugins`
for i in $plugins
do if [ -d $2/../plugins/$i ]
- then cp $2/../plugins/$i/*.opl $1.framework/Resources
+ then cp $2/../plugins/$i/*.opl $1.framework/PlugIns
fi
done
fi
@@ -305,12 +322,12 @@
make_framework_headers $2 $1 &&
make_framework_libs $1 $2 &&
make_framework_python_libs $1 "$2/../py" &&
- make_framework_resources $1 $2 &&
make_framework_deps $1 &&
make_framework_plugins $2 $1 &&
make_framework_interdeps $1 &&
make_framework_plugins_deps $1 &&
- make_framework_libs_deps $1
+ make_framework_libs_deps $1 &&
+ make_framework_resources $1 $2
}
make_umbrella_framework_deps( )
@@ -363,10 +380,11 @@
cp -R "./HDRFlowImage.framework" "$framework_dir/Versions/$framework_version/Frameworks"
cp -R "./HDRFlowMedia.framework" "$framework_dir/Versions/$framework_version/Frameworks"
- make_umbrella_framework_deps "HDRFlow.framework/HDRFlow"
- 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/HDRFlow" &&
+ 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
@@ -431,8 +449,8 @@
make_installer( )
{
- /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"
+ /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj $1.pmproj -p $1.pkg &&
+ hdiutil create -ov -srcfolder $1.pkg $1.dmg -fs HFS+ -volname "$1"
}
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
@@ -463,9 +481,29 @@
if [ "$build_installer" -eq 1 ]
then echo " Building packages..."
- make_installer
+ make_installer HDRFlowFramework
check_status $?
fi
fi
+if [ "$build_maya_plugins" -eq 1 ]
+then
+ echo "Building Maya plugins..."
+
+ rm -rf HDRFlowMaya
+ mkdir -p HDRFlowMaya
+
+ if [ "$PLATFORM" = "Darwin" ]
+ then cp lib/extras/src/imf/mfn/.libs/libhdrflow_extras_mfn.?.dylib HDRFlowMaya/HDRFlowMayaImageReaders.bundle &&
+ install_name_tool -id HDRFlowMayaImageReaders.bundle HDRFlowMaya/HDRFlowMayaImageReaders.bundle &&
+ make_umbrella_framework_deps HDRFlowMaya/HDRFlowMayaImageReaders.bundle
+
+ if [ "$build_installer" -eq 1 ]
+ then echo " Building packages..."
+ make_installer HDRFlowMaya
+ fi
+ check_status $?
+ fi
+fi
+
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <gl...@us...> - 2007-09-14 20:25:11
|
Revision: 301
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=301&view=rev
Author: glslang
Date: 2007-09-14 13:25:06 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
+ gcc visibility updates, ppm plugin (raw conversion), build updates
Modified Paths:
--------------
trunk/HDRFlowFramework.pmproj
trunk/app/HDRFlow/Viewer.cpp
trunk/app/HDRFlow/Viewer.hpp
trunk/app/HDRFlow/ViewportOpenGLView.mm
trunk/lib/extras/configure.ac
trunk/lib/extras/src/Makefile.am
trunk/lib/extras/src/imf/imf_common.cpp
trunk/lib/extras/src/imf/imf_common.hpp
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/raw/Makefile.am
trunk/lib/extras/src/raw/raw.cpp
trunk/lib/extras/src/raw/raw_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
trunk/unity.sh
Added Paths:
-----------
trunk/lib/extras/src/ppm/
trunk/lib/extras/src/ppm/Makefile.am
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/extras/src/ppm/ppm_plugin.opl
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/Viewer.cpp
===================================================================
--- trunk/app/HDRFlow/Viewer.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/app/HDRFlow/Viewer.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -9,11 +9,104 @@
namespace hdrflow {
+namespace
+{
+ void paint_image( il::image_type_ptr im, int width, int height )
+ {
+ int phy_w = im->width( );
+ int phy_h = im->height( );
+
+ GLenum target;
+ float tex_w, tex_h;
+ if( !pl::texture_target( phy_w, phy_h, target, tex_w, tex_h ) )
+ return;
+
+ GLint internal_format;
+ GLenum format, type;
+
+ if( !pl::pf_to_gl_format( im->pf( ), internal_format, format, type ) )
+ {
+ im = il::convert( im, L"b8g8r8a8" );
+
+ internal_format = GL_RGBA;
+ format = GL_BGRA_EXT;
+ type = GL_UNSIGNED_BYTE;
+ }
+
+ glPixelStorei( GL_UNPACK_ALIGNMENT, 4 );
+ glEnable( target );
+
+ GLuint id;
+ glGenTextures( 1, &id );
+
+ glTexParameteri( target, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+ glTexParameteri( target, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+ glTexParameteri( target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ glTexParameteri( target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+ glTexImage2D( target, 0, internal_format, phy_w, phy_h, 0, format, type, im->data( ) );
+
+ float off_x = width * 0.5f - phy_w * 0.5f;
+ float off_y = height * 0.5f - phy_h * 0.5f;
+
+ glMatrixMode( GL_PROJECTION );
+ glPushMatrix( );
+ glLoadIdentity( );
+ gluOrtho2D( 0.0f, width, 0.0f, height );
+
+ glMatrixMode( GL_MODELVIEW );
+ glPushMatrix( );
+ glLoadIdentity( );
+
+ glTranslatef( off_x, off_y, 0.0f );
+
+ if( !im->is_flipped( ) )
+ {
+ glBegin( GL_QUADS );
+ glTexCoord2f( 0.0f, 0.0f );
+ glVertex2f( 0.0f, 0.0f );
+ glTexCoord2f( tex_w, 0.0f );
+ glVertex2f( phy_w, 0.0f );
+ glTexCoord2f( tex_w, tex_h );
+ glVertex2f( phy_w, phy_h );
+ glTexCoord2f( 0.0f, tex_h );
+ glVertex2f( 0.0f, phy_h );
+ glEnd( );
+ }
+ else
+ {
+ glBegin( GL_QUADS );
+ glTexCoord2f( 0.0f, tex_h );
+ glVertex2f( 0.0f, 0.0f );
+ glTexCoord2f( tex_w, tex_h );
+ glVertex2f( phy_w, 0.0f );
+ glTexCoord2f( tex_w, 0.0f );
+ glVertex2f( phy_w, phy_h );
+ glTexCoord2f( 0.0f, 0.0f );
+ glVertex2f( 0.0f, phy_h );
+ glEnd( );
+ }
+
+ glMatrixMode( GL_MODELVIEW );
+ glPopMatrix( );
+
+ glMatrixMode( GL_PROJECTION );
+ glPopMatrix( );
+
+ glDisable( target );
+ }
+}
+
Viewer::Viewer( const pl::string& uri )
- : default_( new Track( uri ) )
+ : default_( new TrackHolder( TrackPtr( new Track( uri ) ) ) )
{
}
+Viewer::TrackHolder::~TrackHolder( )
+{
+ if( id_ )
+ glDeleteTextures( 1, &id_ );
+}
+
void Viewer::initialise( )
{
glClearColor( 0.0, 0.0, 0.0, 0.0 );
@@ -30,29 +123,7 @@
il::image_type_ptr im = media->get_image( );
if( !im ) return;
- int phy_w = im->width( );
- int phy_h = im->height( );
-
- GLenum target;
- float tex_w, tex_h;
- if( !pl::texture_target( phy_w, phy_h, target, tex_w, tex_h ) )
- return;
-
- GLint internal_format;
- GLenum format, type;
-
- if( !pl::pf_to_gl_format( im->pf( ), internal_format, format, type ) )
- {
- im = il::convert( im, L"b8g8r8a8" );
-
- internal_format = GL_RGBA;
- format = GL_BGRA_EXT;
- }
-
- glPixelStorei( GL_UNPACK_ALIGNMENT, 4 );
- glEnable( target );
-
-
+ paint_image( im, width, height );
}
}
Modified: trunk/app/HDRFlow/Viewer.hpp
===================================================================
--- trunk/app/HDRFlow/Viewer.hpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/app/HDRFlow/Viewer.hpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -14,6 +14,48 @@
class Viewer
{
+private:
+ class TrackHolder
+ {
+ public:
+ explicit TrackHolder( TrackPtr track )
+ : track_( track )
+ , phy_w( 0 )
+ , phy_h( 0 )
+ , id_( 0 )
+ { }
+
+ ~TrackHolder( );
+
+ public:
+ BucketPtr media( int position )
+ { return track_->media( position ); }
+
+ // OpenGL associated member functions.
+ public:
+ GLuint id( ) const
+ { return id_; }
+ void set_id( GLuint id )
+ { id_ = id; }
+
+ GLenum target( ) const
+ { return target_; }
+ void set_target( GLenum target )
+ { target_ = target; }
+
+ private:
+ TrackPtr track_;
+ int phy_w;
+ int phy_h;
+
+ // OpenGL associated member data.
+ private:
+ GLuint id_;
+ GLenum target_;
+ };
+
+ typedef boost::shared_ptr<TrackHolder> TrackHolderPtr;
+
public:
explicit Viewer( const pl::string& uri );
@@ -21,7 +63,7 @@
void display( int width, int height );
private:
- TrackPtr default_;
+ TrackHolderPtr default_;
};
}
Modified: trunk/app/HDRFlow/ViewportOpenGLView.mm
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.mm 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/app/HDRFlow/ViewportOpenGLView.mm 2007-09-14 20:25:06 UTC (rev 301)
@@ -67,6 +67,9 @@
- ( void ) prepareOpenGL
{
+ glewExperimental = GL_TRUE;
+ glewInit( );
+
viewer_->initialise( );
// Sync to vertical retrace
Modified: trunk/lib/extras/configure.ac
===================================================================
--- trunk/lib/extras/configure.ac 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/configure.ac 2007-09-14 20:25:06 UTC (rev 301)
@@ -144,6 +144,24 @@
INCLUDES='-I$(top_srcdir)/src'
AC_SUBST(INCLUDES)
+dnl OpenLibraries common flags
+dnl NOTE: we could use $(var) instead of @var@ if we want late-expansion in the generated makefiles.
+EXTRAS_CXXFLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
+AC_SUBST(EXTRAS_CXXFLAGS)
+
+EXTRAS_LDFLAGS=''
+
+case $host in
+ *-*-linux*)
+ EXTRAS_LDFLAGS='-Wl,-export-dynamic'
+ ;;
+ *-apple-darwin*)
+ EXTRAS_LDFLAGS='-Wl,-headerpad_max_install_names'
+ ;;
+esac
+
+AC_SUBST(EXTRAS_LDFLAGS)
+
dnl Universal Binary Support (OS X only)
AC_CHECK_UNIVERSAL_BINARY_SUPPORT( )
@@ -176,6 +194,7 @@
src/imf/hdr/Makefile
src/imf/mfn/Makefile
src/panoramic/Makefile
+src/ppm/Makefile
src/raw/Makefile
])
AC_OUTPUT
Modified: trunk/lib/extras/src/Makefile.am
===================================================================
--- trunk/lib/extras/src/Makefile.am 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/Makefile.am 2007-09-14 20:25:06 UTC (rev 301)
@@ -3,4 +3,4 @@
#
#
-SUBDIRS = panoramic raw imf
+SUBDIRS = imf panoramic ppm raw
Modified: trunk/lib/extras/src/imf/imf_common.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/imf/imf_common.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -3,7 +3,7 @@
// Copyright (c) 2007 Goncalo N. M. de Carvalho
// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+// For more information, see http://www.hdrflow.com.
#include <cstdio>
Modified: trunk/lib/extras/src/imf/imf_common.hpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.hpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/imf/imf_common.hpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -3,7 +3,7 @@
// Copyright (c) 2007 Goncalo N. M. de Carvalho
// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+// For more information, see http://www.hdrflow.com.
#ifndef IMF_COMMON_INC_
#define IMF_COMMON_INC_
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -3,7 +3,7 @@
// Copyright (c) 2007 Goncalo N. M. de Carvalho
// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+// For more information, see http://www.hdrflow.com.
#ifdef __APPLE__
#include <maya/OpenMayaMac.h>
@@ -135,7 +135,13 @@
#endif
im_ = il::convert( im_, L"r32g32b32a32f" );
- if( !im_ ) return MS::kFailure;
+ if( !im_ )
+ {
+#ifndef NDEBUG
+ MGlobal::displayInfo( "HDRFlow: Internal Error: conversion to floating point format failed. Please report to su...@cr...." );
+#endif
+ return MS::kFailure;
+ }
int width = im_->width( );
int height = im_->height( );
@@ -173,20 +179,22 @@
extern "C" MStatus initializePlugin( MObject obj )
{
-#ifndef NDEBUG
- MGlobal::displayInfo( "HDRFlow: initialising ..." );
-#endif
-
MFnPlugin plugin( obj, "com.cryogenicgraphics", "8.0", "Any" );
MStringArray extensions;
extensions.append( "hdr" );
extensions.append( "exr" );
extensions.append( "tiff" );
extensions.append( "tif" );
+ extensions.append( "cr2" );
+ extensions.append( "raw" );
CHECK_MSTATUS( plugin.registerImageFile( "HDRFlow", hdrflow::extras::mfn::image_reader::creator, extensions ) );
pl::init( );
+#ifndef NDEBUG
+ MGlobal::displayInfo( "HDRFlow: initialised ..." );
+#endif
+
return MS::kSuccess;
}
@@ -194,6 +202,10 @@
{
MFnPlugin plugin( obj );
CHECK_MSTATUS( plugin.deregisterImageFile( "HDRFlow" ) );
+
+#ifndef NDEBUG
+ MGlobal::displayInfo( "HDRFlow: uninitialised ..." );
+#endif
return MS::kSuccess;
}
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -2,8 +2,8 @@
// panoramic - Panoramic transformations plugin.
// Copyright (C) 2007 Goncalo N. M. de Carvalho
-// Released under the LGPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
Added: trunk/lib/extras/src/ppm/Makefile.am
===================================================================
--- trunk/lib/extras/src/ppm/Makefile.am (rev 0)
+++ trunk/lib/extras/src/ppm/Makefile.am 2007-09-14 20:25:06 UTC (rev 301)
@@ -0,0 +1,28 @@
+
+#
+#
+#
+
+libdir = $(EXTRAS_PLUGINPATH)
+
+lib_LTLIBRARIES = libhdrflow_extras_ppm.la
+
+libhdrflow_extras_ppm_la_SOURCES = \
+ ppm_plugin.cpp
+
+libhdrflow_extras_ppm_la_CXXFLAGS = \
+ $(EXTRAS_CXXFLAGS) \
+ $(BOOST_INCLUDE_PATH) \
+ -I$(top_builddir)/../openlibraries/src
+
+libhdrflow_extras_ppm_la_LIBADD = \
+ $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+
+libhdrflow_extras_ppm_la_LDFLAGS = \
+ $(EXTRAS_LDFLAGS)
+
+libhdrflow_extras_ppm_ladir = $(EXTRAS_PLUGINPATH)
+libhdrflow_extras_ppm_la_DATA = ppm_plugin.opl
+
+nobase_dist_libhdrflow_extras_ppm_la_DATA = ppm_plugin.opl
Property changes on: trunk/lib/extras/src/ppm/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp (rev 0)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -0,0 +1,110 @@
+
+// ppm - A PPM reader/writer plugin.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef WIN32
+# define PPM_DECLSPEC __declspec( dllexport )
+#else
+# define PPM_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+#endif
+
+#include <openimagelib/il/openimagelib_plugin.hpp>
+
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
+
+namespace hdrflow {
+
+namespace
+{
+ il::image_type_ptr load_ppm( pl::stream_ptr stream )
+ {
+ char buffer[ 128 ];
+
+ if( !stream->getline( buffer, 128 ) )
+ return il::image_type_ptr( );
+
+ if( buffer[ 0 ] != 'P' && buffer[ 1 ] != '6' )
+ return il::image_type_ptr( );
+
+ if( !stream->getline( buffer, 128 ) )
+ return il::image_type_ptr( );
+
+ int width, height;
+ if( sscanf( buffer, "%d %d", &width, &height ) < 2 )
+ return il::image_type_ptr( );
+
+ if( !stream->getline( buffer, 128 ) )
+ return il::image_type_ptr( );
+
+ il::image_type_ptr im = il::allocate( L"r32g32b32a32f", width, height );
+ if( !im )
+ return il::image_type_ptr( );
+
+ const unsigned short* data = reinterpret_cast<const unsigned short*>( stream->data( ) );
+ il::image_type::pointer texels = im->data( );
+
+ for( int i = 0; i < height; ++i )
+ {
+ for( int j = 0; j < width; ++j )
+ {
+ ( ( float* ) texels )[ 0 ] = *data++;
+ ( ( float* ) texels )[ 1 ] = *data++;
+ ( ( float* ) texels )[ 2 ] = *data++;
+ ( ( float* ) texels )[ 3 ] = 1.0f;
+
+ texels += 4 * sizeof( float );
+ }
+
+ texels += ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
+ }
+
+ return im;
+ }
+}
+
+struct PPM_DECLSPEC ppm_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( pl::stream_ptr stream )
+ { return load_ppm( stream ); }
+
+ virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ { return false; }
+};
+
+}
+
+extern "C"
+{
+ PPM_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ PPM_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ PPM_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new hdrflow::ppm_plugin;
+ return true;
+ }
+
+ PPM_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<hdrflow::ppm_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Property changes on: trunk/lib/extras/src/ppm/ppm_plugin.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/ppm/ppm_plugin.opl
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.opl (rev 0)
+++ trunk/lib/extras/src/ppm/ppm_plugin.opl 2007-09-14 20:25:06 UTC (rev 301)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openlibraries version="1.0">
+ <openimagelib name="oil" version="0.2.0">
+ <plugin name="HDRFlow ppm plugin" type="input" in_filter="*.ppm" extension='".*\.ppm"' merit="0" filename='"libhdrflow_extras_ppm.so", "libhdrflow_extras_ppm.dylib", "hdrflow_extras_ppm-vc80-d-0_1_0.dll", "hdrflow_extras_ppm-vc80-r-0_1_0.dll"'/>
+ </openimagelib>
+</openlibraries>
Modified: trunk/lib/extras/src/raw/Makefile.am
===================================================================
--- trunk/lib/extras/src/raw/Makefile.am 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/raw/Makefile.am 2007-09-14 20:25:06 UTC (rev 301)
@@ -12,6 +12,7 @@
dcraw.c
libhdrflow_extras_raw_la_CXXFLAGS = \
+ $(EXTRAS_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
-I$(top_builddir)/../openlibraries/src
@@ -23,6 +24,9 @@
$(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
$(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+libhdrflow_extras_raw_la_LDFLAGS = \
+ $(EXTRAS_LDFLAGS)
+
libhdrflow_extras_raw_ladir = $(EXTRAS_PLUGINPATH)
libhdrflow_extras_raw_la_DATA = raw_plugin.opl
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -2,10 +2,16 @@
// raw - A camera raw processing plugin.
// Copyright (C) 2007 Goncalo N. M. de Carvalho
-// Released under the LGPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
#ifdef WIN32
+# define RAW_DECLSPEC __declspec( dllexport )
+#else
+# define RAW_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+#endif
+
+#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#define STRICT
#include <windows.h>
@@ -50,14 +56,12 @@
il::image_type_ptr dcraw( pcos::property_container properties ) // TODO: change to ptr when pcos moves to proper copy semantics
{
pl::string linear_output = properties.get_property_with_key( pcos::key::from_string( "linear_output" ) ).value<pl::string>( );
- pl::string tiff = properties.get_property_with_key( pcos::key::from_string( "tiff_output" ) ).value<pl::string>( );
pl::string path = properties.get_property_with_key( pcos::key::from_string( "path" ) ).value<pl::string>( );
pl::string output_path = properties.get_property_with_key( pcos::key::from_string( "output_path" ) ).value<pl::string>( );
std::vector<const char*> args;
args.push_back( "dcraw" );
args.push_back( linear_output.c_str( ) );
- args.push_back( tiff.c_str( ) );
args.push_back( "-Z" );
args.push_back( output_path.c_str( ) );
args.push_back( path.c_str( ) );
@@ -82,7 +86,7 @@
}
}
-class raw_plugin : public il::openimagelib_plugin
+class RAW_DECLSPEC raw_plugin : public il::openimagelib_plugin
{
public:
explicit raw_plugin( )
@@ -156,7 +160,7 @@
tempdir = "/var/tmp/";
#endif
- raw_props_.append( output_path_ = tempdir + pl::string( "hdrflow_extras_raw_.tiff" ) );
+ raw_props_.append( output_path_ = tempdir + pl::string( "hdrflow_extras_raw_.ppm" ) );
}
private:
@@ -187,12 +191,6 @@
} } }
-#ifdef WIN32
-# define RAW_DECLSPEC __declspec( dllexport )
-#else
-# define RAW_DECLSPEC __attribute__( ( visibility( "default" ) ) )
-#endif
-
extern "C"
{
RAW_DECLSPEC bool openplugin_init( void )
@@ -212,7 +210,7 @@
}
RAW_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
- {
+ {
delete static_cast<hdrflow::extras::raw::raw_plugin*>( plug );
}
}
Modified: trunk/lib/extras/src/raw/raw_plugin.opl
===================================================================
--- trunk/lib/extras/src/raw/raw_plugin.opl 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/extras/src/raw/raw_plugin.opl 2007-09-14 20:25:06 UTC (rev 301)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openlibraries version="1.0">
- <!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="HDRFlow Raw plugin" type="input" in_filter="*.raw *.cr2" extension='".*\.raw", ".*\.cr2"' merit="0" filename='"libhdrflow_raw.so", "libhdrflow_raw.dylib", "hdrflow_raw-vc80-d-0_1_0.dll", "hdrflow_raw-vc80-r-0_1_0.dll"'/>
+ <plugin name="HDRFlow Raw plugin" type="input" in_filter="*.raw *.cr2" extension='".*\.raw", ".*\.cr2"' merit="0" filename='"libhdrflow_extras_raw.so", "libhdrflow_extras_raw.dylib", "hdrflow_extras_raw-vc80-d-0_1_0.dll", "hdrflow_extras_raw-vc80-r-0_1_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -84,7 +84,7 @@
*/
}
-class lightmap3D_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC lightmap3D_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -16,7 +16,7 @@
{
}
-struct bmp_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC bmp_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr )
{ return il::image_type_ptr( ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -200,7 +200,7 @@
}
}
-struct dds_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC dds_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_dds( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -834,7 +834,7 @@
}
}
-struct dpx_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC dpx_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_dpx( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -56,7 +56,7 @@
}
}
-struct exr_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC exr_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_exr( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -144,7 +144,7 @@
*/
}
-class gdi_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC gdi_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -275,7 +275,7 @@
}
}
-struct hdr_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC hdr_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_hdr( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -289,7 +289,7 @@
}
}
-class jpg_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC jpg_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -97,7 +97,7 @@
}
}
-struct png_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC png_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_png( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -70,7 +70,7 @@
return il::image_type_ptr( );
}
-class psd_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC psd_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -115,7 +115,7 @@
}
}
-struct qt_plugin : public il::openimagelib_plugin
+struct IL_DECLSPEC qt_plugin : public il::openimagelib_plugin
{
virtual il::image_type_ptr load( pl::stream_ptr stream )
{ return load_quicktime( stream ); }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -261,7 +261,7 @@
}
}
-class sgi_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC sgi_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -219,7 +219,7 @@
#undef TGA_TYPE_GRAY_RLE
}
-class tga_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC tga_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-14 20:25:06 UTC (rev 301)
@@ -143,7 +143,7 @@
}
}
-class tiff_plugin : public il::openimagelib_plugin
+class IL_DECLSPEC tiff_plugin : public il::openimagelib_plugin
{
public:
virtual il::image_type_ptr load( pl::stream_ptr stream )
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-13 17:58:41 UTC (rev 300)
+++ trunk/unity.sh 2007-09-14 20:25:06 UTC (rev 301)
@@ -56,8 +56,10 @@
output_directory="."
openlibraries_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
-extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking"
+extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-mayadir=/Applications/Autodesk/ma...
[truncated message content] |