Tweak windows building.

diff --git a/build-windows b/build-windows
new file mode 100755 (executable)
index 0000000..09af254
--- /dev/null
+++ b/build-windows
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+export MINGW_CXX="i686-w64-mingw32-g++"
+export MINGW_WINDRES="i686-w64-mingw32-windres"
+export MINGW_PREFIX="/usr/i686-w64-mingw32"
+export WINDOWS_PREFIX="/home/carl/src/windows"
+
+export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
+
+./waf clean
+export PATH=$WINDOWS_PREFIX/bin:$PATH
+CXX=$MINGW_CXX WINRC=$MINGW_WINDRES \
+  CXXFLAGS="-I$WINDOWS_PREFIX/include -I$MINGW_PREFIX/include" \
+  LINKFLAGS="-L$WINDOWS_PREFIX/lib -L$MINGW_PREFIX/lib" \
+  ./waf configure --target-windows
+./waf
+
+d=`pwd`
+
+cp build/windows/installer.msi build/windows/installer2.msi
+
+sed -i "s~%resources%~$d/windows~g" build/windows/installer2.nsi
+sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.nsi
+sed -i "s~%binaries%~$d/build~g" build/windows/installer2.nsi
+
+makensis build/windows/installer2.nsi

diff --git a/make-installer b/make-installer
deleted file mode 100755 (executable)
index b783b29..0000000
--- a/make-installer
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-OUT=../out
-
-cp -r $OUT/* build/windows
-cp windows/dvdomatic.ico build/windows
-cp windows/dvdomatic.bmp build/windows
-cp windows/.gtkrc-2.0 build/windows
-makensis build/windows/installer.nsi

diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index 980cc379e01f2f5a2aaec5c3d17d69b3a991aee5..fe70153a14f2cdae991a6aa96fa6231eff6c2589 100644 (file)
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -4,9 +4,9 @@ Name "DVD-o-matic"
 RequestExecutionLevel user
 
 outFile "DVD-o-matic @version@ Installer.exe"
-!define MUI_ICON "dvdomatic.ico"
-!define MUI_UNICON "dvdomatic.ico"
-!define MUI_SPECIALBITMAP "dvdomatic.bmp"
+!define MUI_ICON "%resources%/dvdomatic.ico"
+!define MUI_UNICON "%resources%/dvdomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
 
 InstallDir "$PROGRAMFILES\DVD-o-matic"
 
@@ -27,63 +27,64 @@ Section "install" "Installation info"
  
 SetOutPath "$INSTDIR\bin"
 
-File "bin/asdcp-libdcp.dll"
-File "bin/avcodec-54.dll"
-File "bin/avfilter-3.dll"
-File "bin/avformat-54.dll"
-File "bin/avutil-51.dll"
-File "bin/dcp.dll"
-File "bin/dvdomatic-gtk.dll"
-File "bin/dvdomatic.dll"
-File "bin/dvdomatic.exe"
-File "bin/intl.dll"
-File "bin/kumu-libdcp.dll"
-File "bin/libatkmm-1.6-1.dll"
-File "bin/libboost_chrono-mt.dll"
-File "bin/libboost_filesystem-mt.dll"
-File "bin/libboost_system-mt.dll"
-File "bin/libboost_thread_win32-mt.dll"
-File "bin/libcairomm-1.0-1.dll"
-File "bin/libeay32.dll"
-File "bin/libgcc_s_sjlj-1.dll"
-File "bin/libgdk-win32-2.0-0.dll"
-File "bin/libgdkmm-2.4-1.dll"
-File "bin/libgdk_pixbuf-2.0-0.dll"
-File "bin/libgio-2.0-0.dll"
-File "bin/libgiomm-2.4-1.dll"
-File "bin/libglib-2.0-0.dll"
-File "bin/libglibmm-2.4-1.dll"
-File "bin/libgobject-2.0-0.dll"
-File "bin/libgtk-win32-2.0-0.dll"
-File "bin/libgtkmm-2.4-1.dll"
-File "bin/libjpeg-7.dll"
-File "bin/libMagick++-5.dll"
-File "bin/libMagickCore-5.dll"
-File "bin/libMagickWand-5.dll"
-File "bin/libopenjpeg-1.dll"
-File "bin/libpangomm-1.4-1.dll"
-File "bin/libpng14-14.dll"
-File "bin/libsigc-2.0-0.dll"
-File "bin/libsndfile-1.dll"
-File "bin/libssh.dll"
-File "bin/libstdc++-6.dll"
-File "bin/postproc-52.dll"
-File "bin/swresample-0.dll"
-File "bin/swscale-2.dll"
-File "bin/zlib1.dll"
+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-51.dll"
+File "%deps%/bin/dcp.dll"
+File "%deps%/bin/intl.dll"
+File "%deps%/bin/kumu-libdcp.dll"
+File "%deps%/bin/libatkmm-1.6-1.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/libcairomm-1.0-1.dll"
+File "%deps%/bin/libeay32.dll"
+File "%deps%/bin/libgcc_s_sjlj-1.dll"
+File "%deps%/bin/libgdk-win32-2.0-0.dll"
+File "%deps%/bin/libgdkmm-2.4-1.dll"
+File "%deps%/bin/libgdk_pixbuf-2.0-0.dll"
+File "%deps%/bin/libgio-2.0-0.dll"
+File "%deps%/bin/libgiomm-2.4-1.dll"
+File "%deps%/bin/libglib-2.0-0.dll"
+File "%deps%/bin/libglibmm-2.4-1.dll"
+File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libgtk-win32-2.0-0.dll"
+File "%deps%/bin/libgtkmm-2.4-1.dll"
+File "%deps%/bin/libjpeg-7.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/libpangomm-1.4-1.dll"
+File "%deps%/bin/libpng14-14.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 "%binaries%/src/gtk/dvdomatic-gtk.dll"
+File "%binaries%/src/lib/dvdomatic.dll"
+File "%binaries%/src/tools/dvdomatic.exe"
 
 CreateDirectory "$INSTDIR\etc\gtk-2.0"
 SetOutPath "$INSTDIR\etc\gtk-2.0"
-File "etc/gtk-2.0/im-multipress.conf"
-File "etc/gtk-2.0/gtkrc"
-File "etc/gtk-2.0/gtk.immodules"
+File "%deps%/etc/gtk-2.0/im-multipress.conf"
+File "%deps%/etc/gtk-2.0/gtkrc"
+File "%deps%/etc/gtk-2.0/gtk.immodules"
 
 CreateDirectory "$INSTDIR\etc\pango"
 SetOutPath "$INSTDIR\etc\pango"
-File "etc/pango/pango.modules"
+File "%deps%/etc/pango/pango.modules"
 
 SetOutPath "$PROFILE"
-File ".gtkrc-2.0"
+File "%resources%/.gtkrc-2.0"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
  

diff --git a/wscript b/wscript
index 290f00188312bfc4fbb8b4943bcd0b298501d620..531f5ac8e3f8d8869a7d3aa9f2ff149a4f8b70d6 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,5 +1,6 @@
 import subprocess
 import os
+import sys
 
 APPNAME = 'dvdomatic'
 VERSION = '0.30pre'