Merge master.

8 files changed, 38 insertions, 56 deletions

diff --git a/platform/linux/dvdomatic.desktop.in b/platform/linux/dvdomatic.desktop.in
deleted file mode 100644
index 65067eb3b..000000000
--- a/platform/linux/dvdomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic
-Name=DVD-o-matic
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/dvdomatic_batch.desktop.in b/platform/linux/dvdomatic_batch.desktop.in
deleted file mode 100644
index 8150fe849..000000000
--- a/platform/linux/dvdomatic_batch.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic_batch
-Name=DVD-o-matic Batch Converter
-Icon=dvdomatic
-Comment=Batch DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/servomatic.desktop.in b/platform/linux/servomatic.desktop.in
deleted file mode 100644
index 572b4c64c..000000000
--- a/platform/linux/servomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/servomatic_gui
-Name=DVD-o-matic Encode Server
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 1d9054b32..53a6efeac 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -2,18 +2,18 @@ def build(bld):
     d = { 'PREFIX' : '${PREFIX' }
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic.desktop.in'
-    obj.target = 'dvdomatic.desktop'
+    obj.source = 'dcpomatic.desktop.in'
+    obj.target = 'dcpomatic.desktop'
     obj.dict = d
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic_batch.desktop.in'
-    obj.target = 'dvdomatic_batch.desktop'
+    obj.source = 'dcpomatic_batch.desktop.in'
+    obj.target = 'dcpomatic_batch.desktop'
     obj.dict = d
 
     obj = bld(features = 'subst')
-    obj.source = 'servomatic.desktop.in'
-    obj.target = 'servomatic.desktop'
+    obj.source = 'dcpomatic_server.desktop.in'
+    obj.target = 'dcpomatic_server.desktop'
     obj.dict = d
 
-    bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop'])
+    bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop'])
diff --git a/platform/osx/Info.plist.in b/platform/osx/Info.plist.in
index c904d91dd..0f6774138 100644
--- a/platform/osx/Info.plist.in
+++ b/platform/osx/Info.plist.in
@@ -5,17 +5,17 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>dvdomatic</string>
+	<string>dcpomatic</string>
 	<key>CFBundleGetInfoString</key>
 	<string>DCP generator</string>
 	<key>CFBundleIconFile</key>
-	<string>DVD-o-matic.icns</string>
+	<string>DCP-o-matic.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.carlh.dvdomatic</string>
+	<string>net.carlh.dcpomatic</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>DVD-o-matic</string>
+	<string>DCP-o-matic</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 d9e36c390..1fcdc6d06 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -19,9 +19,9 @@ mkdir -p $WORK/$macos
 mkdir -p $WORK/$libs
 mkdir -p $WORK/$resources
 
-cp build/src/tools/dvdomatic $WORK/$macos/
-cp build/src/lib/libdvdomatic.dylib $WORK/$libs/
-cp build/src/wx/libdvdomatic-wx.dylib $WORK/$libs/
+cp build/src/tools/dcpomatic $WORK/$macos/
+cp build/src/lib/libdcpomatic.dylib $WORK/$libs/
+cp build/src/wx/libdcpomatic-wx.dylib $WORK/$libs/
 cp $DEPS/lib/libdcp.dylib $WORK/$libs/
 cp $DEPS/lib/libasdcp-libdcp.dylib $WORK/$libs/
 cp $DEPS/lib/libkumu-libdcp.dylib $WORK/$libs/
@@ -58,7 +58,7 @@ cp $ENV/lib/libfontconfig*.dylib $WORK/$libs/
 cp $ENV/lib/libfreetype*.dylib $WORK/$libs/
 cp $ENV/lib/libexpat*.dylib $WORK/$libs/
 
-for obj in $WORK/$macos/dvdomatic $WORK/$libs/*.dylib; do
+for obj in $WORK/$macos/dcpomatic $WORK/$libs/*.dylib; do
   deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh)"`
   changes=""
   for dep in $deps; do
@@ -70,13 +70,13 @@ for obj in $WORK/$macos/dvdomatic $WORK/$libs/*.dylib; do
   fi  
 done
 
-
+pwd
 cp build/platform/osx/Info.plist $WORK/$approot
-cp icons/dvdomatic.icns $WORK/$resources/DVD-o-matic.icns
+cp icons/dcpomatic.icns $WORK/$resources/DVD-o-matic.icns
 
-tmp_dmg=$WORK/dvdomatic_tmp.dmg
-dmg="$WORK/DVD-o-matic $version.dmg"
-vol_name=DVD-o-matic-$version
+tmp_dmg=$WORK/dcpomatic_tmp.dmg
+dmg="$WORK/DCP-o-matic $version.dmg"
+vol_name=DCP-o-matic-$version
 
 mkdir -p $WORK/$vol_name
 
@@ -95,13 +95,13 @@ echo '
            set current view of container window to icon view
            set toolbar visible of container window to false
            set statusbar visible of container window to false
-           set the bounds of container window to {400, 200, 800, 440}
+           set the bounds of container window to {400, 200, 790, 410}
            set theViewOptions to the icon view options of container window
            set arrangement of theViewOptions to not arranged
            set icon size of theViewOptions to 64
            make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-           set position of item "DVD-o-matic.app" of container window to {90, 100}
-           set position of item "Applications" of container window to {310, 100}
+           set position of item "DCP-o-matic.app" of container window to {90, 80}
+           set position of item "Applications" of container window to {310, 80}
            close
            open
            update without registering applications
@@ -117,8 +117,8 @@ sync
 umount $device
 hdiutil eject $device
 hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
-sips -i $WORK/$resources/DVD-o-matic.icns
-DeRez -only icns $WORK/$resources/DVD-o-matic.icns > $WORK/$resources/DVD-o-matic.rsrc
-Rez -append $WORK/$resources/DVD-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/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 664904767..3a2cdb9e8 100644
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -85,6 +85,7 @@ File "%binaries%/src/wx/dcpomatic-wx.dll"
 File "%binaries%/src/lib/dcpomatic.dll"
 File "%binaries%/src/tools/dcpomatic.exe"
 File "%binaries%/src/tools/dcpomatic_batch.exe"
+File "%binaries%/src/tools/dcpomatic_cli.exe"
 File "%binaries%/src/tools/dcpomatic_server_cli.exe"
 File "%binaries%/src/tools/dcpomatic_server.exe"
 
@@ -134,6 +135,7 @@ Section "Uninstall"
  
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
+<<<<<<< HEAD
 Delete "$DESKTOP\DCP-o-matic.lnk"
 Delete "$DESKTOP\DCP-o-matic batch converter.lnk"
 Delete "$DESKTOP\DCP-o-matic encode server.lnk"
@@ -141,5 +143,14 @@ 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\DVD-o-matic.lnk"
+Delete "$DESKTOP\DVD-o-matic batch converter.lnk"
+Delete "$DESKTOP\DVD-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\DVD-o-matic\*.*"
+RmDir  "$SMPROGRAMS\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
+>>>>>>> master
  
 SectionEnd
diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index fd1237727..f4f1e9068 100644
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -95,6 +95,7 @@ File "%binaries%/src/wx/dcpomatic-wx.dll"
 File "%binaries%/src/lib/dcpomatic.dll"
 File "%binaries%/src/tools/dcpomatic.exe"
 File "%binaries%/src/tools/dcpomatic_batch.exe"
+File "%binaries%/src/tools/dcpomatic_cli.exe"
 File "%binaries%/src/tools/dcpomatic_server_cli.exe"
 File "%binaries%/src/tools/dcpomatic_server.exe"