Merge branch 'ubuntu-build'

4 files changed, 41 insertions, 31 deletions

diff --git a/build-windows b/build-windows
deleted file mode 100755
index a59cd80cb..000000000
--- a/build-windows
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-export MINGW_CXX="i686-w64-mingw32-g++"
-export MINGW_WINDRES="i686-w64-mingw32-windres"
-export MINGW_STRIP="i686-w64-mingw32-strip"
-export MINGW_PREFIX="/usr/i686-w64-mingw32"
-export WINDOWS_PREFIX="/home/carl/Environments/windows"
-
-export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
-
-./waf
-if [ "$?" != "0" ]; then
-  exit 1
-fi
-
-d=`pwd`
-
-cp build/windows/installer.nsi build/windows/installer2.nsi
-
-$MINGW_STRIP build/src/tools/dvdomatic.exe -o build/src/tools/dvdomatic.exe.tmp
-mv build/src/tools/dvdomatic.exe.tmp build/src/tools/dvdomatic.exe
-$MINGW_STRIP build/src/wx/dvdomatic-wx.dll -o build/src/wx/dvdomatic-wx.dll.tmp
-mv build/src/wx/dvdomatic-wx.dll.tmp build/src/wx/dvdomatic-wx.dll
-$MINGW_STRIP build/src/lib/dvdomatic.dll -o build/src/lib/dvdomatic.dll.tmp
-mv build/src/lib/dvdomatic.dll.tmp build/src/lib/dvdomatic.dll
-
-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/builds/ubuntu-12.04-64 b/builds/ubuntu-12.04-64
new file mode 100755
index 000000000..5f0185087
--- /dev/null
+++ b/builds/ubuntu-12.04-64
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+export DEST=dvdomatic-ubuntu-12.04-64
+export ENV=/home/carl/Environments/ubuntu-12.04-64
+
+#./waf clean
+
+export PATH=$ENV/bin:$PATH
+export PKG_CONFIG_LIBDIR=$ENV/lib/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
+
+CXXFLAGS="-I$ENV_PREFIX/include" \
+  LINKFLAGS="-L$ENV_PREFIX/lib" \
+  ./waf configure --enable-debug
+
+./waf
+
+mkdir -p $DEST/bin
+mkdir -p $DEST/lib
+cp build/src/tools/makedcp $DEST/bin/makedcp-bin
+cp build/src/lib/libdvdomatic.so $DEST/lib/
+cp build/src/wx/libdvdomatic-wx.so $DEST/lib/
+cp $ENV/lib/libdcp.so $DEST/lib
+cp $ENV/lib/libasdcp-libdcp.so $DEST/lib
+cp $ENV/lib/libkumu-libdcp.so $DEST/lib
+cp $ENV/lib/libavcodec.so* $DEST/lib
+cp $ENV/lib/libavutil.so* $DEST/lib
+cp $ENV/lib/libavformat.so* $DEST/lib
+cp $ENV/lib/libavfilter.so* $DEST/lib
+cp $ENV/lib/libswscale.so* $DEST/lib
+cp $ENV/lib/libswresample.so* $DEST/lib
+cp $ENV/lib/libopenjpeg.so* $DEST/lib
+cp $ENV/lib/libpostproc.so* $DEST/lib
+cp $ENV/lib/libfaac.so* $DEST/lib
+cp wrapper/makedcp $DEST/bin/
+tar -c $DEST | bzip2 -f -9 > $DEST.tar.bz2
+
diff --git a/rebuild-windows b/builds/windows
index 686641a74..686641a74 100755
--- a/rebuild-windows
+++ b/builds/windows
diff --git a/wrapper/makedcp b/wrapper/makedcp
new file mode 100755
index 000000000..8c3a84efd
--- /dev/null
+++ b/wrapper/makedcp
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+dir=`dirname $0`
+LD_LIBRARY_PATH=$dir/../lib:$LD_LIBRARY_PATH $dir/makedcp-bin $*
+