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

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

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.