From b2334715cf9ddc754add796eb3342334660af1af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 22:05:17 +0100 Subject: Try to put all platform stuff in platform/ --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b5676ba5b..86ed07b1b 100644 --- a/wscript +++ b/wscript @@ -192,7 +192,7 @@ def build(bld): bld.recurse('src') bld.recurse('test') if bld.env.TARGET_WINDOWS: - bld.recurse('windows') + bld.recurse('platform/windows') d = { 'PREFIX' : '${PREFIX' } -- cgit v1.2.3 From 5a2526a4df638d0330a06938b7d0f307d93bd0c9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 May 2013 13:06:38 +0100 Subject: Try to add desktop link for GUI encode server (#151). --- servomatic.desktop.in | 10 ++++++++++ wscript | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 servomatic.desktop.in (limited to 'wscript') diff --git a/servomatic.desktop.in b/servomatic.desktop.in new file mode 100644 index 000000000..572b4c64c --- /dev/null +++ b/servomatic.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/servomatic_gui +Name=DVD-o-matic Encode Server +Icon=dvdomatic +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/wscript b/wscript index 86ed07b1b..9a7cedab9 100644 --- a/wscript +++ b/wscript @@ -206,7 +206,12 @@ def build(bld): obj.target = 'dvdomatic_batch.desktop' obj.dict = d - bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop']) + obj = bld(features = 'subst') + obj.source = 'servomatic.desktop.in' + obj.target = 'servomatic.desktop' + obj.dict = d + + bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop']) for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From 260747962d87ed12115e940f7a9e86fcf7983ea4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 May 2013 20:02:01 +0100 Subject: Try to move Linux desktop files into platform/ --- dvdomatic.desktop.in | 10 --------- dvdomatic_batch.desktop.in | 10 --------- platform/linux/dvdomatic.desktop.in | 10 +++++++++ platform/linux/dvdomatic_batch.desktop.in | 10 +++++++++ platform/linux/servomatic.desktop.in | 10 +++++++++ platform/linux/wscript | 19 +++++++++++++++++ servomatic.desktop.in | 10 --------- wscript | 35 ++++++++++--------------------- 8 files changed, 60 insertions(+), 54 deletions(-) delete mode 100644 dvdomatic.desktop.in delete mode 100644 dvdomatic_batch.desktop.in create mode 100644 platform/linux/dvdomatic.desktop.in create mode 100644 platform/linux/dvdomatic_batch.desktop.in create mode 100644 platform/linux/servomatic.desktop.in create mode 100644 platform/linux/wscript delete mode 100644 servomatic.desktop.in (limited to 'wscript') diff --git a/dvdomatic.desktop.in b/dvdomatic.desktop.in deleted file mode 100644 index 65067eb3b..000000000 --- a/dvdomatic.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/dvdomatic -Name=DVD-o-matic -Icon=dvdomatic -Comment=DCP generator -Categories=AudioVideo;Video diff --git a/dvdomatic_batch.desktop.in b/dvdomatic_batch.desktop.in deleted file mode 100644 index 8150fe849..000000000 --- a/dvdomatic_batch.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/dvdomatic_batch -Name=DVD-o-matic Batch Converter -Icon=dvdomatic -Comment=Batch DCP generator -Categories=AudioVideo;Video diff --git a/platform/linux/dvdomatic.desktop.in b/platform/linux/dvdomatic.desktop.in new file mode 100644 index 000000000..65067eb3b --- /dev/null +++ b/platform/linux/dvdomatic.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/dvdomatic +Name=DVD-o-matic +Icon=dvdomatic +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/dvdomatic_batch.desktop.in b/platform/linux/dvdomatic_batch.desktop.in new file mode 100644 index 000000000..8150fe849 --- /dev/null +++ b/platform/linux/dvdomatic_batch.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/dvdomatic_batch +Name=DVD-o-matic Batch Converter +Icon=dvdomatic +Comment=Batch DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/servomatic.desktop.in b/platform/linux/servomatic.desktop.in new file mode 100644 index 000000000..572b4c64c --- /dev/null +++ b/platform/linux/servomatic.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/servomatic_gui +Name=DVD-o-matic Encode Server +Icon=dvdomatic +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript new file mode 100644 index 000000000..1d9054b32 --- /dev/null +++ b/platform/linux/wscript @@ -0,0 +1,19 @@ +def build(bld): + d = { 'PREFIX' : '${PREFIX' } + + obj = bld(features = 'subst') + obj.source = 'dvdomatic.desktop.in' + obj.target = 'dvdomatic.desktop' + obj.dict = d + + obj = bld(features = 'subst') + obj.source = 'dvdomatic_batch.desktop.in' + obj.target = 'dvdomatic_batch.desktop' + obj.dict = d + + obj = bld(features = 'subst') + obj.source = 'servomatic.desktop.in' + obj.target = 'servomatic.desktop' + obj.dict = d + + bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop']) diff --git a/servomatic.desktop.in b/servomatic.desktop.in deleted file mode 100644 index 572b4c64c..000000000 --- a/servomatic.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/servomatic_gui -Name=DVD-o-matic Encode Server -Icon=dvdomatic -Comment=DCP generator -Categories=AudioVideo;Video diff --git a/wscript b/wscript index 9a7cedab9..fb2a838df 100644 --- a/wscript +++ b/wscript @@ -9,12 +9,13 @@ def options(opt): opt.load('compiler_cxx') opt.load('winres') - opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation') - opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools') - opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows') - opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg') - opt.add_option('--magickpp-config', action='store', default='Magick++-config', help = 'path to Magick++-config') - opt.add_option('--wx-config', action='store', default='wx-config', help = 'path to wx-config') + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') + opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') + opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') + opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') + opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') + opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') + opt.add_option('--osx', action='store_true', default=False, help='build on OS X') def configure(conf): conf.load('compiler_cxx') @@ -51,6 +52,8 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION + conf.env.TARGET_OSX = conf.options.osx + conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) @@ -193,25 +196,9 @@ def build(bld): bld.recurse('test') if bld.env.TARGET_WINDOWS: bld.recurse('platform/windows') + if bld.env.TARGET_LINUX: + bld.recurse('platform/linux') - d = { 'PREFIX' : '${PREFIX' } - - obj = bld(features = 'subst') - obj.source = 'dvdomatic.desktop.in' - obj.target = 'dvdomatic.desktop' - obj.dict = d - - obj = bld(features = 'subst') - obj.source = 'dvdomatic_batch.desktop.in' - obj.target = 'dvdomatic_batch.desktop' - obj.dict = d - - obj = bld(features = 'subst') - obj.source = 'servomatic.desktop.in' - obj.target = 'servomatic.desktop' - obj.dict = d - - bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop']) for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From 8addb24445410285e404138d39c90467137eb8f6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 May 2013 21:41:32 +0100 Subject: OS X version can at least build a working .app. --- platform/osx/Info.plist.in | 35 ++++++++++++++++++++ platform/osx/make_dmg.sh | 79 +++++++++++++++++++++++++++++++++++++++++++--- platform/osx/wscript | 2 ++ wscript | 2 ++ 4 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 platform/osx/Info.plist.in create mode 100644 platform/osx/wscript (limited to 'wscript') diff --git a/platform/osx/Info.plist.in b/platform/osx/Info.plist.in new file mode 100644 index 000000000..3f4ab60ef --- /dev/null +++ b/platform/osx/Info.plist.in @@ -0,0 +1,35 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + dvdomatic + CFBundleGetInfoString + DCP generator + CFBundleIconFile + appIcon.icns + CFBundleIdentifier + net.carlh.dvdomatic + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + DVD-o-matic + CFBundlePackageType + APPL + CFBundleShortVersions + @VERSION@ + CFBundleSignature + DOMC + CFBundleVersion + @VERSION@ + LSUIElement + 0 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + @ENV@ + + diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 90e5f9e4a..52db90575 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,15 +1,86 @@ #!/bin/bash -VERSION=@version@ +VERSION=$1 +if [ "$VERSION" == "" ]; then + echo "Syntax: $0 " + exit 1 +fi # DMG size in megabytes DMG_SIZE=64 +WORK=build/platform/osx +ENV=/Users/carl/Environments/osx/10.8 +DEPS=/Users/carl/cdist -dmg_name="dvdomatic-$VERSION" +dmg_name="DVD-o-matic-$VERSION" +appdir="DVD-o-matic.app" +approot=$appdir/Contents +libs=$approot/lib +macos=$approot/MacOS -mkdir -p build/platform/osx/mnt +rm -rf $WORK/$appdir +mkdir -p $WORK/$macos +mkdir -p $WORK/$libs + +cp build/src/tools/dvdomatic $WORK/$macos/ +cp build/src/lib/libdvdomatic.dylib $WORK/$libs/ +cp build/src/wx/libdvdomatic-wx.dylib $WORK/$libs/ +cp $DEPS/lib/libdcp.dylib $WORK/$libs/ +cp $DEPS/lib/libasdcp-libdcp.dylib $WORK/$libs/ +cp $DEPS/lib/libkumu-libdcp.dylib $WORK/$libs/ +cp $DEPS/lib/libopenjpeg*.dylib $WORK/$libs/ +cp $DEPS/lib/libavformat*.dylib $WORK/$libs/ +cp $DEPS/lib/libavfilter*.dylib $WORK/$libs/ +cp $DEPS/lib/libavutil*.dylib $WORK/$libs/ +cp $DEPS/lib/libavcodec*.dylib $WORK/$libs/ +cp $DEPS/lib/libswscale*.dylib $WORK/$libs/ +cp $DEPS/lib/libpostproc*.dylib $WORK/$libs/ +cp $DEPS/lib/libswresample*.dylib $WORK/$libs/ +cp $ENV/lib/libboost_system.dylib $WORK/$libs/ +cp $ENV/lib/libboost_filesystem.dylib $WORK/$libs/ +cp $ENV/lib/libboost_thread.dylib $WORK/$libs/ +cp $ENV/lib/libboost_date_time.dylib $WORK/$libs/ +cp $ENV/lib/libssl*.dylib $WORK/$libs/ +cp $ENV/lib/libcrypto*.dylib $WORK/$libs/ +cp $ENV/lib/libxml++-2.6*.dylib $WORK/$libs/ +cp $ENV/lib/libxml2*.dylib $WORK/$libs/ +cp $ENV/lib/libglibmm-2.4*.dylib $WORK/$libs/ +cp $ENV/lib/libgobject*.dylib $WORK/$libs/ +cp $ENV/lib/libgthread*.dylib $WORK/$libs/ +cp $ENV/lib/libgmodule*.dylib $WORK/$libs/ +cp $ENV/lib/libsigc*.dylib $WORK/$libs/ +cp $ENV/lib/libglib-2*.dylib $WORK/$libs/ +cp $ENV/lib/libintl*.dylib $WORK/$libs/ +cp $ENV/lib/libsndfile*.dylib $WORK/$libs/ +cp $ENV/lib/libMagick++*.dylib $WORK/$libs/ +cp $ENV/lib/libMagickCore*.dylib $WORK/$libs/ +cp $ENV/lib/libMagickWand*.dylib $WORK/$libs/ +cp $ENV/lib/libssh*.dylib $WORK/$libs/ +cp $ENV/lib/libwx*.dylib $WORK/$libs/ +cp $ENV/lib/libfontconfig*.dylib $WORK/$libs/ +cp $ENV/lib/libfreetype*.dylib $WORK/$libs/ +cp $ENV/lib/libexpat*.dylib $WORK/$libs/ + +for obj in $WORK/$macos/dvdomatic $WORK/$libs/*.dylib; do + deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh)"` + changes="" + for dep in $deps; do + base=`basename $dep` + changes="$changes -change $dep @executable_path/../lib/$base" + done + if test "x$changes" != "x"; then + install_name_tool $changes $obj + fi +done + + +cp build/platform/osx/Info.plist $WORK/$approot + +exit 0 + +mkdir -p $WORK/mnt hdiutil create -megabytes $DMG_SIZE build/platform/osx/dvdomatic.dmg device=$(hdid -nomount build/platform/osx/dvdomatic.dmg | grep Apple_HFS | cut -f 1 -d ' ') newfs_hfs -v "$dmg_name" "$device" -mount -t hfs "${device}" build/platform/osx/mnt +mount -t hfs "$device" build/platform/osx/mnt diff --git a/platform/osx/wscript b/platform/osx/wscript new file mode 100644 index 000000000..d79c95bb5 --- /dev/null +++ b/platform/osx/wscript @@ -0,0 +1,2 @@ +def build(bld): + bld.new_task_gen(features='subst', source='Info.plist.in', target='Info.plist', version=bld.env.VERSION) diff --git a/wscript b/wscript index fb2a838df..6114796e1 100644 --- a/wscript +++ b/wscript @@ -198,6 +198,8 @@ def build(bld): bld.recurse('platform/windows') if bld.env.TARGET_LINUX: bld.recurse('platform/linux') + if bld.env.TARGET_OSX: + bld.recurse('platform/osx') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From 4bf87ab3f1b6df68ea5ccdaca9ad1fecd74256a5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 00:59:14 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 051f5ea2d..c25e5a2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-31 Carl Hetherington + + * Version 0.94beta1 released. + 2013-05-31 Carl Hetherington * Fix ridiculous 100-frame limit on trim diff --git a/debian/changelog b/debian/changelog index eb6061bdb..37185dbb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.94beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 31 May 2013 00:59:14 +0100 + dvdomatic (0.93-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 6114796e1..1d471f043 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.94pre' +VERSION = '0.94beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3