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

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

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.