mkdir -p "$WORK/$libs"
mkdir -p "$WORK/$resources"
-relink=""
+relink="dcpomatic"
function universal_copy {
for f in $1/32/$2; do
ln -s $(readlink $f) "$3/`basename $f`"
else
g=`echo $f | sed -e "s/\/32\//\/64\//g"`
- mkdir -p $3
+ mkdir -p "$3"
lipo -create $f $g -output "$3/`basename $f`"
fi
done
ln -s $(readlink $f) "$3/`basename $f`"
else
g=`echo $f | sed -e "s/\/32\//\/64\//g"`
- mkdir -p $3
+ mkdir -p "$3"
lipo -create $f $g -output "$3/`basename $f`"
fi
done
relink="$relink|$2"
}
-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 $ROOT src/dcpomatic2/build/src/tools/dcpomatic2 "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_server_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_batch "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/lib/libdcpomatic2.dylib "$WORK/$libs"
+universal_copy $ROOT src/dcpomatic2/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_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"
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 libxml++-2.6 "$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"
universal_copy_lib $ENV libglibmm-2.4 "$WORK/$libs"
universal_copy_lib $ENV libgobject "$WORK/$libs"
universal_copy_lib $ENV libcurl "$WORK/$libs"
universal_copy_lib $ENV libffi "$WORK/$libs"
universal_copy_lib $ENV libiconv "$WORK/$libs"
-universal_copy_lib $ENV libpangomm "$WORK/$libs"
-universal_copy_lib $ENV libcairomm "$WORK/$libs"
-universal_copy_lib $ENV libpangocairo "$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"
+
+relink=`echo $relink | sed -e "s/\+//g"`
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)"`
+ deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
changes=""
for dep in $deps; do
- base=`basename $dep`
- # $dep will be a path within 64/; make a 32/ path too
- dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
- changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
+ 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"`
+ changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
done
if test "x$changes" != "x"; then
install_name_tool $changes "$obj"
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 icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/build/platform/osx/Info.plist "$WORK/$approot"
+cp $ROOT/32/src/dcpomatic2/icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
+cp $ROOT/32/src/dcpomatic2/icons/colour_conversions.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/defaults.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/kdm_email.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/servers.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/tms.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/LiberationSans-Regular.ttf "$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/dcpomatic2/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+ cp $ROOT/32/src/dcpomatic2/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+ cp $ROOT/32/src/dcpomatic2/build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
done
# i18n: wxWidgets .mo files
vol_name=DCP-o-matic-$version
mkdir -p $WORK/$vol_name
-cp -r "$WORK/$appdir" $WORK/$vol_name
+cp -a "$WORK/$appdir" $WORK/$vol_name
ln -s /Applications "$WORK/$vol_name/Applications"
rm -f $tmp_dmg "$dmg"