From d3e2e0dfd6f840f01a86590cca3ba3315c146710 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 19:58:06 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 521bc54f9..d0cf0c029 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.49')) + ('libdcp', 'v0.51')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From f1633689739cc77f81e14365c862b5832d19da76 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 21:50:24 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index d0cf0c029..427cd8e56 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.51')) + ('libdcp', 'v0.52')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 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/ --- builds/control-12.04-32 | 24 ----- builds/control-12.04-64 | 24 ----- builds/control-12.10-32 | 23 ----- builds/control-12.10-64 | 24 ----- cscript | 16 ++-- platform/linux/control-12.04-32 | 24 +++++ platform/linux/control-12.04-64 | 24 +++++ platform/linux/control-12.10-32 | 23 +++++ platform/linux/control-12.10-64 | 24 +++++ platform/windows/.gtkrc-2.0 | 6 ++ platform/windows/dvdomatic.bmp | Bin 0 -> 343254 bytes platform/windows/dvdomatic.ico | Bin 0 -> 9662 bytes platform/windows/dvdomatic.rc | 3 + platform/windows/dvdomatic_taskbar.ico | Bin 0 -> 1150 bytes platform/windows/installer.nsi.32.in | 144 ++++++++++++++++++++++++++++++ platform/windows/installer.nsi.64.in | 154 +++++++++++++++++++++++++++++++++ platform/windows/wscript | 4 + windows/.gtkrc-2.0 | 6 -- windows/dvdomatic.bmp | Bin 343254 -> 0 bytes windows/dvdomatic.ico | Bin 9662 -> 0 bytes windows/dvdomatic.rc | 3 - windows/dvdomatic_taskbar.ico | Bin 1150 -> 0 bytes windows/installer.nsi.32.in | 144 ------------------------------ windows/installer.nsi.64.in | 154 --------------------------------- windows/wscript | 4 - wscript | 2 +- 26 files changed, 415 insertions(+), 415 deletions(-) delete mode 100644 builds/control-12.04-32 delete mode 100644 builds/control-12.04-64 delete mode 100644 builds/control-12.10-32 delete mode 100644 builds/control-12.10-64 create mode 100644 platform/linux/control-12.04-32 create mode 100644 platform/linux/control-12.04-64 create mode 100644 platform/linux/control-12.10-32 create mode 100644 platform/linux/control-12.10-64 create mode 100755 platform/windows/.gtkrc-2.0 create mode 100644 platform/windows/dvdomatic.bmp create mode 100644 platform/windows/dvdomatic.ico create mode 100644 platform/windows/dvdomatic.rc create mode 100644 platform/windows/dvdomatic_taskbar.ico create mode 100644 platform/windows/installer.nsi.32.in create mode 100644 platform/windows/installer.nsi.64.in create mode 100644 platform/windows/wscript delete mode 100755 windows/.gtkrc-2.0 delete mode 100644 windows/dvdomatic.bmp delete mode 100644 windows/dvdomatic.ico delete mode 100644 windows/dvdomatic.rc delete mode 100644 windows/dvdomatic_taskbar.ico delete mode 100644 windows/installer.nsi.32.in delete mode 100644 windows/installer.nsi.64.in delete mode 100644 windows/wscript (limited to 'cscript') diff --git a/builds/control-12.04-32 b/builds/control-12.04-32 deleted file mode 100644 index 0f52d03ae..000000000 --- a/builds/control-12.04-32 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/builds/control-12.04-64 b/builds/control-12.04-64 deleted file mode 100644 index fa4b4476e..000000000 --- a/builds/control-12.04-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/builds/control-12.10-32 b/builds/control-12.10-32 deleted file mode 100644 index 0e5fc1f46..000000000 --- a/builds/control-12.10-32 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. diff --git a/builds/control-12.10-64 b/builds/control-12.10-64 deleted file mode 100644 index 24e16b4b5..000000000 --- a/builds/control-12.10-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/cscript b/cscript index 521bc54f9..d004edac0 100644 --- a/cscript +++ b/cscript @@ -26,20 +26,20 @@ def build(env, target): def package(env, target, version): if target.platform == 'windows': - shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) - env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) - env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) - env.command('makensis build/windows/installer2.%s.nsi' % target.bits) - return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0]) + shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) + env.command('sed -i "s~%%resources%%~%s/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) + env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) + env.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) + return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' else: cpu = 'amd64' - shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') + shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control') env.command('./waf dist') f = open('debian/files', 'w') print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) diff --git a/platform/linux/control-12.04-32 b/platform/linux/control-12.04-32 new file mode 100644 index 000000000..0f52d03ae --- /dev/null +++ b/platform/linux/control-12.04-32 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.04-64 b/platform/linux/control-12.04-64 new file mode 100644 index 000000000..fa4b4476e --- /dev/null +++ b/platform/linux/control-12.04-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.10-32 b/platform/linux/control-12.10-32 new file mode 100644 index 000000000..0e5fc1f46 --- /dev/null +++ b/platform/linux/control-12.10-32 @@ -0,0 +1,23 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. diff --git a/platform/linux/control-12.10-64 b/platform/linux/control-12.10-64 new file mode 100644 index 000000000..24e16b4b5 --- /dev/null +++ b/platform/linux/control-12.10-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/windows/.gtkrc-2.0 b/platform/windows/.gtkrc-2.0 new file mode 100755 index 000000000..0ea1d69c9 --- /dev/null +++ b/platform/windows/.gtkrc-2.0 @@ -0,0 +1,6 @@ +gtk-theme-name = "MS-Windows" +style "user-font" +{ + font_name="Tahoma 8" +} +widget_class "*" style "user-font" diff --git a/platform/windows/dvdomatic.bmp b/platform/windows/dvdomatic.bmp new file mode 100644 index 000000000..0a196f7a0 Binary files /dev/null and b/platform/windows/dvdomatic.bmp differ diff --git a/platform/windows/dvdomatic.ico b/platform/windows/dvdomatic.ico new file mode 100644 index 000000000..225008cfe Binary files /dev/null and b/platform/windows/dvdomatic.ico differ diff --git a/platform/windows/dvdomatic.rc b/platform/windows/dvdomatic.rc new file mode 100644 index 000000000..17790cf0d --- /dev/null +++ b/platform/windows/dvdomatic.rc @@ -0,0 +1,3 @@ +id ICON "dvdomatic.ico" +taskbar_icon ICON "dvdomatic_taskbar.ico" +#include "wx-2.9/wx/msw/wx.rc" diff --git a/platform/windows/dvdomatic_taskbar.ico b/platform/windows/dvdomatic_taskbar.ico new file mode 100644 index 000000000..f4489fa14 Binary files /dev/null and b/platform/windows/dvdomatic_taskbar.ico differ diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in new file mode 100644 index 000000000..b73e4f345 --- /dev/null +++ b/platform/windows/installer.nsi.32.in @@ -0,0 +1,144 @@ +!include "MUI2.nsh" +Name "DVD-o-matic" + +RequestExecutionLevel admin + +outFile "DVD-o-matic @version@ 32-bit Installer.exe" +!define MUI_ICON "%resources%/dvdomatic.ico" +!define MUI_UNICON "%resources%/dvdomatic.ico" +!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" + +InstallDir "$PROGRAMFILES\DVD-o-matic" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +Section "install" "Installation info" + +SetOutPath "$INSTDIR\bin" + +File "%deps%/bin/asdcp-libdcp.dll" +File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avfilter-3.dll" +File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/dcp.dll" +File "%deps%/bin/libintl-8.dll" +File "%deps%/bin/kumu-libdcp.dll" +File "%deps%/bin/libboost_chrono-mt.dll" +File "%deps%/bin/libboost_filesystem-mt.dll" +File "%deps%/bin/libboost_system-mt.dll" +File "%deps%/bin/libboost_thread_win32-mt.dll" +File "%deps%/bin/libboost_date_time-mt.dll" +File "%deps%/bin/libeay32.dll" +File "%deps%/bin/libgcc_s_sjlj-1.dll" +File "%deps%/bin/libgio-2.0-0.dll" +File "%deps%/bin/libglib-2.0-0.dll" +File "%deps%/bin/libgobject-2.0-0.dll" +File "%deps%/bin/libiconv-2.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/libMagick++-5.dll" +File "%deps%/bin/libMagickCore-5.dll" +File "%deps%/bin/libMagickWand-5.dll" +File "%deps%/bin/libopenjpeg-1.dll" +File "%deps%/bin/libpng15-15.dll" +File "%deps%/bin/libsigc-2.0-0.dll" +File "%deps%/bin/libsndfile-1.dll" +File "%deps%/bin/libssh.dll" +File "%deps%/bin/libstdc++-6.dll" +File "%deps%/bin/postproc-52.dll" +File "%deps%/bin/swresample-0.dll" +File "%deps%/bin/swscale-2.dll" +File "%deps%/bin/zlib1.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%deps%/bin/libcairo-2.dll" +File "%deps%/bin/libfreetype-6.dll" +File "%deps%/bin/libgthread-2.0-0.dll" +File "%deps%/bin/libpango-1.0-0.dll" +File "%deps%/bin/libgmodule-2.0-0.dll" +File "%deps%/bin/libpangocairo-1.0-0.dll" +File "%deps%/bin/libpangowin32-1.0-0.dll" +File "%deps%/bin/libtiff-5.dll" +File "%deps%/bin/libglibmm-2.4-1.dll" +File "%deps%/bin/libxml++-2.6-2.dll" +File "%deps%/bin/libxml2-2.dll" +File "%deps%/bin/libpixman-1-0.dll" +File "%deps%/bin/libfontconfig-1.dll" +File "%deps%/bin/libexpat-1.dll" +File "%deps%/bin/libbz2.dll" + +File "%binaries%/src/wx/dvdomatic-wx.dll" +File "%binaries%/src/lib/dvdomatic.dll" +File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" +File "%binaries%/src/tools/servomatic_cli.exe" +File "%binaries%/src/tools/servomatic_gui.exe" + +# I don't know why, but sometimes it seems that +# delegates.xml must be in with the binaries, and +# sometimes in the $PROFILE. Meh. +File "%deps%/etc/ImageMagick/delegates.xml" +SetOutPath "$PROFILE\.magick" +File "%deps%/etc/ImageMagick/delegates.xml" + +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" +File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" +File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" +File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" +File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" +File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" +File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" +File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" + +CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" + +CreateDirectory "$SMPROGRAMS\DVD-o-matic" +CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 + +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" + +WriteUninstaller "$INSTDIR\Uninstall.exe" + +SectionEnd + + +Section "Uninstall" + +RMDir /r "$INSTDIR\*.*" +RMDir "$INSTDIR" +Delete "$DESKTOP\DVD-o-matic.lnk" +Delete "$DESKTOP\DVD-o-matic bach converter.lnk" +Delete "$DESKTOP\DVD-o-matic encode server.lnk" +Delete "$SMPROGRAMS\DVD-o-matic\*.*" +RmDir "$SMPROGRAMS\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" + +SectionEnd diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in new file mode 100644 index 000000000..f499c46c2 --- /dev/null +++ b/platform/windows/installer.nsi.64.in @@ -0,0 +1,154 @@ +!include "MUI2.nsh" +!include "x64.nsh" + +Name "DVD-o-matic" + +RequestExecutionLevel admin + +outFile "DVD-o-matic @version@ 64-bit Installer.exe" +!define MUI_ICON "%resources%/dvdomatic.ico" +!define MUI_UNICON "%resources%/dvdomatic.ico" +!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" + +InstallDir "$PROGRAMFILES\DVD-o-matic" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +Section "install" "Installation info" + +${If} ${RunningX64} + DetailPrint "Installer running on 64-bit host" + ; disable registry redirection (enable access to 64-bit portion of registry) + SetRegView 64 + ; change install dir + StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic" +${EndIf} + +SetOutPath "$INSTDIR\bin" + +File "%deps%/bin/asdcp-libdcp.dll" +File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avfilter-3.dll" +File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/dcp.dll" +File "%deps%/bin/libintl-8.dll" +File "%deps%/bin/kumu-libdcp.dll" +File "%deps%/bin/libboost_chrono-mt.dll" +File "%deps%/bin/libboost_filesystem-mt.dll" +File "%deps%/bin/libboost_system-mt.dll" +File "%deps%/bin/libboost_thread_win32-mt.dll" +File "%deps%/bin/libboost_date_time-mt.dll" +File "%deps%/bin/libeay32.dll" +File "%deps%/bin/libgcc_s_sjlj-1.dll" +File "%deps%/bin/libgio-2.0-0.dll" +File "%deps%/bin/libglib-2.0-0.dll" +File "%deps%/bin/libgobject-2.0-0.dll" +File "%deps%/bin/libiconv-2.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/libMagick++-5.dll" +File "%deps%/bin/libMagickCore-5.dll" +File "%deps%/bin/libMagickWand-5.dll" +File "%deps%/bin/libopenjpeg-1.dll" +File "%deps%/bin/libpng15-15.dll" +File "%deps%/bin/libsigc-2.0-0.dll" +File "%deps%/bin/libsndfile-1.dll" +File "%deps%/bin/libssh.dll" +File "%deps%/bin/libstdc++-6.dll" +File "%deps%/bin/postproc-52.dll" +File "%deps%/bin/swresample-0.dll" +File "%deps%/bin/swscale-2.dll" +File "%deps%/bin/zlib1.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%deps%/bin/libcairo-2.dll" +File "%deps%/bin/libfreetype-6.dll" +File "%deps%/bin/libgthread-2.0-0.dll" +File "%deps%/bin/libpango-1.0-0.dll" +File "%deps%/bin/libgmodule-2.0-0.dll" +File "%deps%/bin/libpangocairo-1.0-0.dll" +File "%deps%/bin/libpangowin32-1.0-0.dll" +File "%deps%/bin/libtiff-5.dll" +File "%deps%/bin/libglibmm-2.4-1.dll" +File "%deps%/bin/libxml++-2.6-2.dll" +File "%deps%/bin/libxml2-2.dll" +File "%deps%/bin/libpixman-1-0.dll" +File "%deps%/bin/libfontconfig-1.dll" +File "%deps%/bin/libexpat-1.dll" +File "%deps%/bin/libbz2.dll" + +File "%binaries%/src/wx/dvdomatic-wx.dll" +File "%binaries%/src/lib/dvdomatic.dll" +File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" +File "%binaries%/src/tools/servomatic_cli.exe" +File "%binaries%/src/tools/servomatic_gui.exe" + +# I don't know why, but sometimes it seems that +# delegates.xml must be in with the binaries, and +# sometimes in the $PROFILE. Meh. +File "%deps%/etc/ImageMagick/delegates.xml" +SetOutPath "$PROFILE\.magick" +File "%deps%/etc/ImageMagick/delegates.xml" + +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" +File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" +File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" +File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" +File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" +File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" +File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" +File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" + +CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" + +CreateDirectory "$SMPROGRAMS\DVD-o-matic" +CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 + +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" + +WriteUninstaller "$INSTDIR\Uninstall.exe" + +SectionEnd + + +Section "Uninstall" + +RMDir /r "$INSTDIR\*.*" +RMDir "$INSTDIR" +Delete "$DESKTOP\DVD-o-matic.lnk" +Delete "$DESKTOP\DVD-o-matic batch converter.lnk" +Delete "$DESKTOP\DVD-o-matic encode server.lnk" +Delete "$SMPROGRAMS\DVD-o-matic\*.*" +RmDir "$SMPROGRAMS\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" + +SectionEnd diff --git a/platform/windows/wscript b/platform/windows/wscript new file mode 100644 index 000000000..585cebef1 --- /dev/null +++ b/platform/windows/wscript @@ -0,0 +1,4 @@ +def build(bld): + bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION) + bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION) + diff --git a/windows/.gtkrc-2.0 b/windows/.gtkrc-2.0 deleted file mode 100755 index 0ea1d69c9..000000000 --- a/windows/.gtkrc-2.0 +++ /dev/null @@ -1,6 +0,0 @@ -gtk-theme-name = "MS-Windows" -style "user-font" -{ - font_name="Tahoma 8" -} -widget_class "*" style "user-font" diff --git a/windows/dvdomatic.bmp b/windows/dvdomatic.bmp deleted file mode 100644 index 0a196f7a0..000000000 Binary files a/windows/dvdomatic.bmp and /dev/null differ diff --git a/windows/dvdomatic.ico b/windows/dvdomatic.ico deleted file mode 100644 index 225008cfe..000000000 Binary files a/windows/dvdomatic.ico and /dev/null differ diff --git a/windows/dvdomatic.rc b/windows/dvdomatic.rc deleted file mode 100644 index 17790cf0d..000000000 --- a/windows/dvdomatic.rc +++ /dev/null @@ -1,3 +0,0 @@ -id ICON "dvdomatic.ico" -taskbar_icon ICON "dvdomatic_taskbar.ico" -#include "wx-2.9/wx/msw/wx.rc" diff --git a/windows/dvdomatic_taskbar.ico b/windows/dvdomatic_taskbar.ico deleted file mode 100644 index f4489fa14..000000000 Binary files a/windows/dvdomatic_taskbar.ico and /dev/null differ diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in deleted file mode 100644 index b73e4f345..000000000 --- a/windows/installer.nsi.32.in +++ /dev/null @@ -1,144 +0,0 @@ -!include "MUI2.nsh" -Name "DVD-o-matic" - -RequestExecutionLevel admin - -outFile "DVD-o-matic @version@ 32-bit Installer.exe" -!define MUI_ICON "%resources%/dvdomatic.ico" -!define MUI_UNICON "%resources%/dvdomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" - -InstallDir "$PROGRAMFILES\DVD-o-matic" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -Section "install" "Installation info" - -SetOutPath "$INSTDIR\bin" - -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-5.dll" -File "%deps%/bin/libMagickCore-5.dll" -File "%deps%/bin/libMagickWand-5.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" - -File "%binaries%/src/wx/dvdomatic-wx.dll" -File "%binaries%/src/lib/dvdomatic.dll" -File "%binaries%/src/tools/dvdomatic.exe" -File "%binaries%/src/tools/dvdomatic_batch.exe" -File "%binaries%/src/tools/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" - -# I don't know why, but sometimes it seems that -# delegates.xml must be in with the binaries, and -# sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick/delegates.xml" - -SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" - -CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" - -CreateDirectory "$SMPROGRAMS\DVD-o-matic" -CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 - -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" - -WriteUninstaller "$INSTDIR\Uninstall.exe" - -SectionEnd - - -Section "Uninstall" - -RMDir /r "$INSTDIR\*.*" -RMDir "$INSTDIR" -Delete "$DESKTOP\DVD-o-matic.lnk" -Delete "$DESKTOP\DVD-o-matic bach converter.lnk" -Delete "$DESKTOP\DVD-o-matic encode server.lnk" -Delete "$SMPROGRAMS\DVD-o-matic\*.*" -RmDir "$SMPROGRAMS\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" - -SectionEnd diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in deleted file mode 100644 index f499c46c2..000000000 --- a/windows/installer.nsi.64.in +++ /dev/null @@ -1,154 +0,0 @@ -!include "MUI2.nsh" -!include "x64.nsh" - -Name "DVD-o-matic" - -RequestExecutionLevel admin - -outFile "DVD-o-matic @version@ 64-bit Installer.exe" -!define MUI_ICON "%resources%/dvdomatic.ico" -!define MUI_UNICON "%resources%/dvdomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" - -InstallDir "$PROGRAMFILES\DVD-o-matic" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -Section "install" "Installation info" - -${If} ${RunningX64} - DetailPrint "Installer running on 64-bit host" - ; disable registry redirection (enable access to 64-bit portion of registry) - SetRegView 64 - ; change install dir - StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic" -${EndIf} - -SetOutPath "$INSTDIR\bin" - -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-5.dll" -File "%deps%/bin/libMagickCore-5.dll" -File "%deps%/bin/libMagickWand-5.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" - -File "%binaries%/src/wx/dvdomatic-wx.dll" -File "%binaries%/src/lib/dvdomatic.dll" -File "%binaries%/src/tools/dvdomatic.exe" -File "%binaries%/src/tools/dvdomatic_batch.exe" -File "%binaries%/src/tools/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" - -# I don't know why, but sometimes it seems that -# delegates.xml must be in with the binaries, and -# sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick/delegates.xml" - -SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" - -CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" - -CreateDirectory "$SMPROGRAMS\DVD-o-matic" -CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 - -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" - -WriteUninstaller "$INSTDIR\Uninstall.exe" - -SectionEnd - - -Section "Uninstall" - -RMDir /r "$INSTDIR\*.*" -RMDir "$INSTDIR" -Delete "$DESKTOP\DVD-o-matic.lnk" -Delete "$DESKTOP\DVD-o-matic batch converter.lnk" -Delete "$DESKTOP\DVD-o-matic encode server.lnk" -Delete "$SMPROGRAMS\DVD-o-matic\*.*" -RmDir "$SMPROGRAMS\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" - -SectionEnd diff --git a/windows/wscript b/windows/wscript deleted file mode 100644 index 585cebef1..000000000 --- a/windows/wscript +++ /dev/null @@ -1,4 +0,0 @@ -def build(bld): - bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION) - bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION) - 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 2adf3ce04f5bff645e40f7e8aca1c7e3c014375a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 11:34:44 +0100 Subject: Install on OS X too. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index a3898aa6e..8a229cc73 100644 --- a/cscript +++ b/cscript @@ -20,7 +20,7 @@ def build(env, target): env.command('./waf') - if target.platform == 'linux': + if target.platform == 'linux' or target.platform == 'osx': env.command('./waf install') -- cgit v1.2.3 From 21b263d8619a20394b994339a8d2987dc30c3bf2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 13:01:05 +0100 Subject: Fix location of windows bits. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8a229cc73..8775cb387 100644 --- a/cscript +++ b/cscript @@ -27,7 +27,7 @@ def build(env, target): def package(env, target, version): if target.platform == 'windows': shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) - env.command('sed -i "s~%%resources%%~%s/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) -- cgit v1.2.3 From d85df1ad15c05665eb1891096c4bf585362a35e3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 23:39:12 +0100 Subject: Try to add OS X package target to cscript. --- cscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 8775cb387..1d75bb8e8 100644 --- a/cscript +++ b/cscript @@ -61,6 +61,9 @@ def package(env, target, version): debs.append(os.path.abspath(p)) return debs + elif target.platform == 'osx': + env.command('build/platform/osx/make_dmg.sh') + return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) def make_pot(env): env.command('./waf pot') -- cgit v1.2.3 From 40e285b0c53a35adb92da972105229ceffdd5980 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 23:53:12 +0100 Subject: cscript typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1d75bb8e8..d6f9b6f94 100644 --- a/cscript +++ b/cscript @@ -62,7 +62,7 @@ def package(env, target, version): return debs elif target.platform == 'osx': - env.command('build/platform/osx/make_dmg.sh') + env.command('platform/osx/make_dmg.sh') return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) def make_pot(env): -- cgit v1.2.3 From 42866530db49e0faf367ad28a55c658be60951bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 1 Jun 2013 00:17:32 +0100 Subject: More OS X packaging tweaks. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index d6f9b6f94..dd39befda 100644 --- a/cscript +++ b/cscript @@ -62,7 +62,7 @@ def package(env, target, version): return debs elif target.platform == 'osx': - env.command('platform/osx/make_dmg.sh') + env.command('bash platform/osx/make_dmg.sh') return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) def make_pot(env): -- cgit v1.2.3