Merge master.

[dcpomatic.git] / platform / osx / make_dmg.sh

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 01e9b0aefb8dc131970dd3e4b5923aef163f96db..1174f966a07e0c34071d61c1ad4d240e3baf21f1 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -15,7 +15,7 @@ WORK=build/platform/osx
 ENV=/Users/carl/Environments/osx/10.6
 ROOT=$1
 
 ENV=/Users/carl/Environments/osx/10.6
 ROOT=$1
 

-appdir="DCP-o-matic.app"
+appdir="DCP-o-matic 2.app"

 approot="$appdir/Contents"
 libs="$approot/lib"
 macos="$approot/MacOS"
 approot="$appdir/Contents"
 libs="$approot/lib"
 macos="$approot/MacOS"


@@ -53,6 +53,18 @@ function universal_copy_lib {
     relink="$relink|$2"
 }
 
     relink="$relink|$2"
 }
 

+<<<<<<< HEAD
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$WORK/$libs"
+universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$WORK/$libs"
+universal_copy_lib $ROOT libcxml "$WORK/$libs"
+universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libasdcp-libdcp-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
+=======

 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic "$WORK/$macos"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli "$WORK/$macos"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli "$WORK/$macos"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic "$WORK/$macos"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli "$WORK/$macos"
 universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli "$WORK/$macos"


@@ -63,6 +75,7 @@ universal_copy_lib $ROOT libcxml "$WORK/$libs"
 universal_copy_lib $ROOT libdcp "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libdcp "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libdcp "$WORK/$libs"
 universal_copy_lib $ROOT libdcp "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libdcp "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libdcp "$WORK/$libs"

+>>>>>>> origin/master

 universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
 universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"


@@ -108,10 +121,11 @@ universal_copy_lib $ENV libcairo "$WORK/$libs"
 
 relink=`echo $relink | sed -e "s/\+//g"`
 
 
 relink=`echo $relink | sed -e "s/\+//g"`
 

-for obj in "$WORK/$macos/dcpomatic" "$WORK/$macos/dcpomatic_batch" "$WORK/$macos/dcpomatic_cli" "$WORK/$macos/dcpomatic_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
+for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do

   deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
   changes=""
   for dep in $deps; do
   deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
   changes=""
   for dep in $deps; do

+      echo "Relinking $dep into $obj"

       base=`basename $dep`
       # $dep will be a path within 64/; make a 32/ path too
       dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
       base=`basename $dep`
       # $dep will be a path within 64/; make a 32/ path too
       dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`


@@ -129,6 +143,7 @@ cp icons/defaults.png "$WORK/$resources"
 cp icons/kdm_email.png "$WORK/$resources"
 cp icons/servers.png "$WORK/$resources"
 cp icons/tms.png "$WORK/$resources"
 cp icons/kdm_email.png "$WORK/$resources"
 cp icons/servers.png "$WORK/$resources"
 cp icons/tms.png "$WORK/$resources"

+cp icons/keys.png "$WORK/$resources"

 
 # i18n: DCP-o-matic .mo files
 for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
 
 # i18n: DCP-o-matic .mo files
 for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do


@@ -169,7 +184,7 @@ echo '
            set theViewOptions to the icon view options of container window
            set arrangement of theViewOptions to not arranged
            set icon size of theViewOptions to 64
            set theViewOptions to the icon view options of container window
            set arrangement of theViewOptions to not arranged
            set icon size of theViewOptions to 64

-           set position of item "DCP-o-matic.app" of container window to {90, 80}
+           set position of item "DCP-o-matic 2.app" of container window to {90, 80}

            set position of item "Applications" of container window to {310, 80}
            close
            open
            set position of item "Applications" of container window to {310, 80}
            close
            open