diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux/wscript | 10 | ||||
| -rw-r--r-- | platform/osx/Info.plist.in | 4 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 207 | ||||
| -rw-r--r-- | platform/windows/wscript | 102 |
4 files changed, 172 insertions, 151 deletions
diff --git a/platform/linux/wscript b/platform/linux/wscript index 3aab4f7fb..336c1bcb0 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -1,25 +1,25 @@ def build(bld): obj = bld(features='subst') obj.source = 'dcpomatic.desktop.in' - obj.target = 'dcpomatic.desktop' + obj.target = 'dcpomatic2.desktop' obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_batch.desktop.in' - obj.target = 'dcpomatic_batch.desktop' + obj.target = 'dcpomatic2_batch.desktop' obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_server.desktop.in' - obj.target = 'dcpomatic_server.desktop' + obj.target = 'dcpomatic2_server.desktop' obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic.spec.in' - obj.target = 'dcpomatic.spec' + obj.target = 'dcpomatic2.spec' obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION if bld.env.TARGET_CENTOS_6: @@ -27,4 +27,4 @@ def build(bld): elif bld.env.TARGET_CENTOS_7: obj.CENTOS_VERSION = '7' - bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop']) + bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop']) diff --git a/platform/osx/Info.plist.in b/platform/osx/Info.plist.in index f2675e3f6..e420d3620 100644 --- a/platform/osx/Info.plist.in +++ b/platform/osx/Info.plist.in @@ -5,7 +5,7 @@ <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> - <string>dcpomatic</string> + <string>dcpomatic2</string> <key>CFBundleGetInfoString</key> <string>DCP generator</string> <key>CFBundleIconFile</key> @@ -15,7 +15,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>DCP-o-matic</string> + <string>DCP-o-matic 2</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersions</key> diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index c89d2f48f..5500c4267 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -4,7 +4,8 @@ # # e.g. make_dmg.sh /Users/carl/cdist -set -e +# Don't set -e here as egrep (used a few times) returns 1 if no matches +# were found. version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"` @@ -14,114 +15,135 @@ WORK=build/platform/osx ENV=/Users/carl/Environments/osx/10.6 ROOT=$1 -appdir="DCP-o-matic.app" -approot=$appdir/Contents -libs=$approot/lib -macos=$approot/MacOS -resources=$approot/Resources +appdir="DCP-o-matic 2.app" +approot="$appdir/Contents" +libs="$approot/lib" +macos="$approot/MacOS" +resources="$approot/Resources" -rm -rf $WORK/$appdir -mkdir -p $WORK/$macos -mkdir -p $WORK/$libs -mkdir -p $WORK/$resources +rm -rf "$WORK/$appdir" +mkdir -p "$WORK/$macos" +mkdir -p "$WORK/$libs" +mkdir -p "$WORK/$resources" + +relink="dcpomatic" function universal_copy { - echo $2 for f in $1/32/$2; do if [ -h $f ]; then - ln -s $(readlink $f) $3/`basename $f` + ln -s $(readlink $f) "$3/`basename $f`" + else + g=`echo $f | sed -e "s/\/32\//\/64\//g"` + mkdir -p "$3" + lipo -create $f $g -output "$3/`basename $f`" + fi + done +} + +function universal_copy_lib { + for f in $1/32/lib/$2*.dylib; do + if [ -h $f ]; then + ln -s $(readlink $f) "$3/`basename $f`" else - g=`echo $f | sed -e "s/\/32\//\/64\//g"` - mkdir -p $3 - lipo -create $f $g -output $3/`basename $f` + g=`echo $f | sed -e "s/\/32\//\/64\//g"` + mkdir -p "$3" + lipo -create $f $g -output "$3/`basename $f`" fi done + 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 lib/libcxml.dylib $WORK/$libs -universal_copy $ROOT lib/libdcp.dylib $WORK/$libs -universal_copy $ROOT lib/libasdcp-libdcp.dylib $WORK/$libs -universal_copy $ROOT lib/libkumu-libdcp.dylib $WORK/$libs -universal_copy $ROOT lib/libopenjpeg*.dylib $WORK/$libs -universal_copy $ROOT lib/libavdevice*.dylib $WORK/$libs -universal_copy $ROOT lib/libavformat*.dylib $WORK/$libs -universal_copy $ROOT lib/libavfilter*.dylib $WORK/$libs -universal_copy $ROOT lib/libavutil*.dylib $WORK/$libs -universal_copy $ROOT lib/libavcodec*.dylib $WORK/$libs -universal_copy $ROOT lib/libswscale*.dylib $WORK/$libs -universal_copy $ROOT lib/libswresample*.dylib $WORK/$libs -universal_copy $ROOT lib/libpostproc*.dylib $WORK/$libs -universal_copy $ROOT bin/ffprobe $WORK/$macos -universal_copy $ENV lib/libboost_system.dylib $WORK/$libs -universal_copy $ENV lib/libboost_filesystem.dylib $WORK/$libs -universal_copy $ENV lib/libboost_thread.dylib $WORK/$libs -universal_copy $ENV lib/libboost_date_time.dylib $WORK/$libs -universal_copy $ENV lib/libxml++-2.6*.dylib $WORK/$libs -universal_copy $ENV lib/libxml2*.dylib $WORK/$libs -universal_copy $ENV lib/libglibmm-2.4*.dylib $WORK/$libs -universal_copy $ENV lib/libgobject*.dylib $WORK/$libs -universal_copy $ENV lib/libgthread*.dylib $WORK/$libs -universal_copy $ENV lib/libgmodule*.dylib $WORK/$libs -universal_copy $ENV lib/libsigc*.dylib $WORK/$libs -universal_copy $ENV lib/libglib-2*.dylib $WORK/$libs -universal_copy $ENV lib/libintl*.dylib $WORK/$libs -universal_copy $ENV lib/libsndfile*.dylib $WORK/$libs -universal_copy $ENV lib/libMagick++*.dylib $WORK/$libs -universal_copy $ENV lib/libMagickCore*.dylib $WORK/$libs -universal_copy $ENV lib/libMagickWand*.dylib $WORK/$libs -universal_copy $ENV lib/libssh*.dylib $WORK/$libs -universal_copy $ENV lib/libwx*.dylib $WORK/$libs -universal_copy $ENV lib/libfontconfig*.dylib $WORK/$libs -universal_copy $ENV lib/libfreetype*.dylib $WORK/$libs -universal_copy $ENV lib/libexpat*.dylib $WORK/$libs -universal_copy $ENV lib/libltdl*.dylib $WORK/$libs -universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs -universal_copy $ENV lib/libzip*.dylib $WORK/$libs -universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs -universal_copy $ENV lib/libcurl*.dylib $WORK/$libs -universal_copy $ENV lib/libffi*.dylib $WORK/$libs -universal_copy $ENV lib/libiconv*.dylib $WORK/$libs - -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 "(/Users/carl|libboost|libssh|libltdl|libxmlsec)"` +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_lib $ROOT libopenjpeg "$WORK/$libs" +universal_copy_lib $ROOT libavdevice "$WORK/$libs" +universal_copy_lib $ROOT libavformat "$WORK/$libs" +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 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 libgthread "$WORK/$libs" +universal_copy_lib $ENV libgmodule "$WORK/$libs" +universal_copy_lib $ENV libsigc "$WORK/$libs" +universal_copy_lib $ENV libglib-2 "$WORK/$libs" +universal_copy_lib $ENV libintl "$WORK/$libs" +universal_copy_lib $ENV libsndfile "$WORK/$libs" +universal_copy_lib $ENV libMagick++ "$WORK/$libs" +universal_copy_lib $ENV libMagickCore "$WORK/$libs" +universal_copy_lib $ENV libMagickWand "$WORK/$libs" +universal_copy_lib $ENV libssh "$WORK/$libs" +universal_copy_lib $ENV libwx "$WORK/$libs" +universal_copy_lib $ENV libfontconfig "$WORK/$libs" +universal_copy_lib $ENV libfreetype "$WORK/$libs" +universal_copy_lib $ENV libexpat "$WORK/$libs" +universal_copy_lib $ENV libltdl "$WORK/$libs" +universal_copy_lib $ENV libxmlsec1 "$WORK/$libs" +universal_copy_lib $ENV libzip "$WORK/$libs" +universal_copy_lib $ENV libquickmail "$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 libpango "$WORK/$libs" +universal_copy_lib $ENV libcairo "$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)" | 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 + 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 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" # 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 + 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" done # i18n: wxWidgets .mo files for lang in de es fr it sv nl; do - mkdir $WORK/$resources/$lang - cp $ENV/64/share/locale/$lang/LC_MESSAGES/wxstd.mo $WORK/$resources/$lang + mkdir "$WORK/$resources/$lang" + cp $ENV/64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$WORK/$resources/$lang" done tmp_dmg=$WORK/dcpomatic_tmp.dmg @@ -129,8 +151,8 @@ dmg="$WORK/DCP-o-matic $version.dmg" vol_name=DCP-o-matic-$version mkdir -p $WORK/$vol_name -cp -r $WORK/$appdir $WORK/$vol_name -ln -s /Applications $WORK/$vol_name/Applications +cp -a "$WORK/$appdir" $WORK/$vol_name +ln -s /Applications "$WORK/$vol_name/Applications" 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 @@ -149,7 +171,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 @@ -159,13 +181,12 @@ echo ' end tell ' | osascript -chmod -Rf go-w /Volumes/"$vol_name"/$appdir +chmod -Rf go-w /Volumes/"$vol_name"/"$appdir" sync hdiutil eject $device hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg" -sips -i $WORK/$resources/DCP-o-matic.icns -DeRez -only icns $WORK/$resources/DCP-o-matic.icns > $WORK/$resources/DCP-o-matic.rsrc -Rez -append $WORK/$resources/DCP-o-matic.rsrc -o "$dmg" +sips -i "$WORK/$resources/DCP-o-matic.icns" +DeRez -only icns "$WORK/$resources/DCP-o-matic.icns" > "$WORK/$resources/DCP-o-matic.rsrc" +Rez -append "$WORK/$resources/DCP-o-matic.rsrc" -o "$dmg" SetFile -a C "$dmg" - diff --git a/platform/windows/wscript b/platform/windows/wscript index 9ae88ba87..9621ecc6f 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -22,7 +22,7 @@ def write_installer(bits, version): !define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp" !include "Sections.nsh" -InstallDir "$PROGRAMFILES\\DCP-o-matic" +InstallDir "$PROGRAMFILES\\DCP-o-matic 2" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "../../../COPYING" @@ -40,7 +40,7 @@ ${If} ${RunningX64} ; disable registry redirection (enable access to 64-bit portion of registry) SetRegView 64 ; change install dir - StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic" + StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic 2" ${EndIf} """, file=f) @@ -103,23 +103,23 @@ File "%static_deps%/bin/libcurl-4.dll" File "%static_deps%/bin/ssleay32.dll" File "%static_deps%/bin/libzip-2.dll" -File "%cdist_deps%/bin/asdcp-libdcp.dll" -File "%cdist_deps%/bin/kumu-libdcp.dll" +File "%cdist_deps%/bin/asdcp-libdcp-1.0.dll" +File "%cdist_deps%/bin/kumu-libdcp-1.0.dll" File "%cdist_deps%/bin/avcodec-55.dll" File "%cdist_deps%/bin/avfilter-4.dll" File "%cdist_deps%/bin/avformat-55.dll" File "%cdist_deps%/bin/avutil-52.dll" File "%cdist_deps%/bin/avdevice-55.dll" File "%cdist_deps%/bin/postproc-52.dll" -File "%cdist_deps%/bin/dcp.dll" +File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/libopenjpeg-1.dll" File "%cdist_deps%/bin/swresample-0.dll" File "%cdist_deps%/bin/swscale-2.dll" File "%cdist_deps%/bin/cxml.dll" File "%cdist_deps%/bin/ffprobe.exe" -File "%binaries%/src/wx/dcpomatic-wx.dll" -File "%binaries%/src/lib/dcpomatic.dll" +File "%binaries%/src/wx/dcpomatic2-wx.dll" +File "%binaries%/src/lib/dcpomatic2.dll" # I don't know why, but sometimes it seems that # delegates.xml must be in with the binaries, and @@ -129,66 +129,66 @@ SetOutPath "$PROFILE\\.magick" File "%static_deps%/etc/ImageMagick-6/delegates.xml" SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo" +File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/fr_FR/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dcpomatic2.mo" File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo" +File "%binaries%/src/lib/mo/it_IT/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/it_IT/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dcpomatic2.mo" File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo" +File "%binaries%/src/lib/mo/es_ES/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/es_ES/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dcpomatic2.mo" File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" +File "%binaries%/src/lib/mo/sv_SE/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/sv_SE/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dcpomatic2.mo" File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES" -File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo" -File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo" +File "%binaries%/src/lib/mo/de_DE/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/de_DE/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/de_DE/dcpomatic2.mo" File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES" -File "%binaries%/src/lib/mo/nl_NL/libdcpomatic.mo" -File "%binaries%/src/wx/mo/nl_NL/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/nl_NL/dcpomatic.mo" +File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo" File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe" +WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)" +WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe" WriteUninstaller "$INSTDIR\\Uninstall.exe" SectionEnd Section "DCP-o-matic" SEC_MASTER SetOutPath "$INSTDIR\\bin" -CreateDirectory "$SMPROGRAMS\\DCP-o-matic" -File "%binaries%/src/tools/dcpomatic.exe" -File "%binaries%/src/tools/dcpomatic_batch.exe" -File "%binaries%/src/tools/dcpomatic_cli.exe" -CreateShortCut "$DESKTOP\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic.exe" 0 -CreateShortCut "$DESKTOP\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic_batch.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe" +CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2" +File "%binaries%/src/tools/dcpomatic2.exe" +File "%binaries%/src/tools/dcpomatic2_batch.exe" +File "%binaries%/src/tools/dcpomatic2_cli.exe" +CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" "" +CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" "" "$INSTDIR\\bin\\dcpomatic2.exe" 0 +CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe" "" +CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" "" "$INSTDIR\\bin\\dcpomatic2_batch.exe" 0 +CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 +WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)" +WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe" WriteUninstaller "$INSTDIR\\Uninstall.exe" SectionEnd Section "Encode server" SEC_SERVER SetOutPath "$INSTDIR\\bin" -CreateDirectory "$SMPROGRAMS\\DCP-o-matic" -File "%binaries%/src/tools/dcpomatic_server_cli.exe" -File "%binaries%/src/tools/dcpomatic_server.exe" -CreateShortCut "$DESKTOP\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic_server.exe" 0 -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 +CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2" +File "%binaries%/src/tools/dcpomatic2_server_cli.exe" +File "%binaries%/src/tools/dcpomatic2_server.exe" +CreateShortCut "$DESKTOP\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" +CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0 +CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 SectionEnd LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic" @@ -211,13 +211,13 @@ LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic encode server" Section "Uninstall" RMDir /r "$INSTDIR\\*.*" RMDir "$INSTDIR" -Delete "$DESKTOP\\DCP-o-matic.lnk" -Delete "$DESKTOP\\DCP-o-matic batch converter.lnk" -Delete "$DESKTOP\\DCP-o-matic encode server.lnk" -Delete "$SMPROGRAMS\\DCP-o-matic\\*.*" -RmDir "$SMPROGRAMS\\DCP-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" +Delete "$DESKTOP\\DCP-o-matic 2.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 encode server.lnk" +Delete "$SMPROGRAMS\\DCP-o-matic 2\\*.*" +RmDir "$SMPROGRAMS\\DCP-o-matic 2" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic2" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" SectionEnd """, file=f) |