From 43df55b16132c0fd064266c5148c5ac2835c9880 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Wed, 27 Oct 2004 10:55:49 +0000 Subject: [PATCH] Config changes git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@493 d19143bc-622f-0410-bfdd-b5b2a6649095 --- mlt++/configure | 4 ++-- mlt++/swig/configure | 10 ++++++++-- mlt++/swig/ruby/build | 6 +++--- mlt++/swig/ruby/miracle.rb | 14 +++++++++++++- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/mlt++/configure b/mlt++/configure index 54c6c79..557b3da 100755 --- a/mlt++/configure +++ b/mlt++/configure @@ -4,8 +4,8 @@ path=`which mlt-config 2>/dev/null` [ $? != 0 ] && echo "MLT not installed - aborting" && exit 1 # Determine default prefix -prefix=`dirname $path` -prefix=`dirname $prefix` +prefix=`mlt-config --prefix` +[ "$prefix" = "" ] && echo "Can't locate MLT's prefix - please reconfigure MLT." && exit 1 # Allow override from command line [ "$1" != "" ] && prefix="${1#--prefix=}" diff --git a/mlt++/swig/configure b/mlt++/swig/configure index 0977ee2..7c737e6 100755 --- a/mlt++/swig/configure +++ b/mlt++/swig/configure @@ -1,10 +1,10 @@ #!/usr/bin/env sh which swig > /dev/null 2>&1 -[ $? != 0 ] && echo Please install swig +[ $? != 0 ] && echo "Please install swig" && exit 1 which mlt-config > /dev/null 2>&1 -[ $? != 0 ] && echo Please install mlt +[ $? != 0 ] && echo "Please install mlt" && exit 1 if [ "$1" = "all" ] then languages="java perl python ruby tcl" @@ -14,6 +14,11 @@ else echo "Usage: ./configure [ all | language * ]" exit 0 fi +for i in java perl python ruby tcl +do + rm -f .$i +done + for i in $languages do echo -n "Configuring $i ... " @@ -21,6 +26,7 @@ do output=`./build 2>/dev/null` if [ $? == 0 ] then echo "OK" + touch ../.$i elif [ "$output" == "" ] then echo "Failed" diff --git a/mlt++/swig/ruby/build b/mlt++/swig/ruby/build index feee585..46f9cc1 100755 --- a/mlt++/swig/ruby/build +++ b/mlt++/swig/ruby/build @@ -1,8 +1,8 @@ #!/usr/bin/env ruby require 'mkmf' system( "ln -sf ../mltpp.i mltpp.i" ) -system( "swig -c++ -ruby -I/usr/local/include/mlt++ `mlt-config --cflags` mltpp.i" ) -$CFLAGS += " -I/usr/local/include/mlt++ `mlt-config --cflags`" -$LDFLAGS += " -lmlt++" +system( "swig -c++ -ruby -I../../src `mlt-config --cflags` mltpp.i" ) +$CFLAGS += " -I../../src `mlt-config --cflags`" +$LDFLAGS += " -L../../src -lmlt++" create_makefile('mltpp') system( 'make' ) diff --git a/mlt++/swig/ruby/miracle.rb b/mlt++/swig/ruby/miracle.rb index fec8ec7..2b5afc0 100755 --- a/mlt++/swig/ruby/miracle.rb +++ b/mlt++/swig/ruby/miracle.rb @@ -1,5 +1,17 @@ require 'mltpp' -miracle = Mltpp::Miracle.new( "miracle-ruby" ) + +def command + puts "command" +end + +def push + puts "push" +end + +miracle = Mltpp::Miracle.new( "miracle-ruby", 5260 ) miracle.start +miracle.execute( "uadd sdl" ) +listener = Mltpp::Listener.new( miracle, "command-received", method( :command ) ) +listener = Mltpp::Listener.new( miracle, "push-received", method( :push ) ) miracle.wait_for_shutdown -- 1.7.4.4