projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix to OS X build.
[dcpomatic.git] / platform / osx / make_dmg.sh
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 01e9b0aefb8dc131970dd3e4b5923aef163f96db..034df9fb4abd7fa8212b957c80bd991c08615b95 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
 
-appdir="DCP-o-matic.app"
+appdir="DCP-o-matic 2.app"
 approot="$appdir/Contents"
 libs="$approot/lib"
 macos="$approot/MacOS"
@@ -53,16 +53,19 @@ function universal_copy_lib {
     relink="$relink|$2"
 }
 
-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_batch "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib "$WORK/$libs"
-universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib "$WORK/$libs"
+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 "$WORK/$libs"
-universal_copy_lib $ROOT libasdcp-libdcp "$WORK/$libs"
-universal_copy_lib $ROOT libkumu-libdcp "$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_lib $ROOT libsub "$WORK/$libs"
+universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
@@ -70,13 +73,14 @@ universal_copy_lib $ROOT libavfilter "$WORK/$libs"
 universal_copy_lib $ROOT libavutil "$WORK/$libs"
 universal_copy_lib $ROOT libavcodec "$WORK/$libs"
 universal_copy_lib $ROOT libswscale "$WORK/$libs"
-universal_copy_lib $ROOT libswresample "$WORK/$libs"
 universal_copy_lib $ROOT libpostproc "$WORK/$libs"
 universal_copy $ROOT bin/ffprobe "$WORK/$macos"
 universal_copy_lib $ENV libboost_system "$WORK/$libs"
 universal_copy_lib $ENV libboost_filesystem "$WORK/$libs"
 universal_copy_lib $ENV libboost_thread "$WORK/$libs"
 universal_copy_lib $ENV libboost_date_time "$WORK/$libs"
+universal_copy_lib $ENV libboost_locale "$WORK/$libs"
+universal_copy_lib $ENV libboost_regex "$WORK/$libs"
 universal_copy_lib $ENV libxml++ "$WORK/$libs"
 universal_copy_lib $ENV libxslt "$WORK/$libs"
 universal_copy_lib $ENV libxml2 "$WORK/$libs"
@@ -105,13 +109,25 @@ universal_copy_lib $ENV libffi "$WORK/$libs"
 universal_copy_lib $ENV libiconv "$WORK/$libs"
 universal_copy_lib $ENV libpango "$WORK/$libs"
 universal_copy_lib $ENV libcairo "$WORK/$libs"
+universal_copy_lib $ENV libpixman "$WORK/$libs"
+universal_copy_lib $ENV libharfbuzz "$WORK/$libs"
+universal_copy_lib $ENV libsamplerate "$WORK/$libs"
+universal_copy_lib $ENV libicui18n "$WORK/$libs"
+universal_copy_lib $ENV libicudata "$WORK/$libs"
+universal_copy_lib $ENV libicuio "$WORK/$libs"
+universal_copy_lib $ENV libicule "$WORK/$libs"
+universal_copy_lib $ENV libiculx "$WORK/$libs"
+universal_copy_lib $ENV libicutest "$WORK/$libs"
+universal_copy_lib $ENV libicutu "$WORK/$libs"
+universal_copy_lib $ENV libicuuc "$WORK/$libs"
 
 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
-  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
+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|libicu)"`
   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"`
@@ -122,20 +138,23 @@ for obj in "$WORK/$macos/dcpomatic" "$WORK/$macos/dcpomatic_batch" "$WORK/$macos
   fi
 done
 
-cp build/platform/osx/Info.plist "$WORK/$approot"
-cp icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
-cp icons/colour_conversions.png "$WORK/$resources"
-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 $ROOT/32/src/dcpomatic/build/platform/osx/Info.plist "$WORK/$approot"
+cp $ROOT/32/src/dcpomatic/graphics/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
+cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/servers.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/tms.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/LiberationSans-Regular.ttf "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/graphics/splash.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
-  mkdir "$WORK/$resources/$lang"
-  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang"
+for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK; do
+  mkdir -p "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
 done
 
 # i18n: wxWidgets .mo files
@@ -152,6 +171,19 @@ mkdir -p $WORK/$vol_name
 cp -a "$WORK/$appdir" $WORK/$vol_name
 ln -s /Applications "$WORK/$vol_name/Applications"
 
+# KDM creator
+appdir_kdm="DCP-o-matic 2 KDM Creator.app"
+approot_kdm="$appdir_kdm/Contents"
+libs_kdm="$approot_kdm/lib"
+macos_kdm="$approot_kdm/MacOS"
+resources_kdm="$approot_kdm/Resources"
+rm -rf "$WORK/$appdir_kdm"
+mkdir -p "$WORK/$macos_kdm"
+ln -s "../../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
+ln -s "../../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
+universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$WORK/$macos_kdm"
+cp -a "$WORK/$appdir_kdm" $WORK/$vol_name
+
 rm -f $tmp_dmg "$dmg"
 hdiutil create -srcfolder $WORK/$vol_name -volname $vol_name -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $DMG_SIZE $tmp_dmg
 attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_dmg)
@@ -169,7 +201,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 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
2.0 development branch of dcpomatic