From: Carl Hetherington <cth@carlh.net>
Date: Sat, 4 May 2013 20:05:12 +0000 (+0100)
Subject: Try to make batch converter install work.
X-Git-Tag: v2.0.48~1337^2~385^2~12
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=6fe5c1a9ef940372206e37c960f48781aea56f3d;p=dcpomatic.git

Try to make batch converter install work.
---

diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index ac68ac88b..b73e4f345 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -83,6 +83,7 @@ File "%deps%/bin/libbz2.dll"
 File "%binaries%/src/wx/dvdomatic-wx.dll"
 File "%binaries%/src/lib/dvdomatic.dll"
 File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/tools/dvdomatic_batch.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
@@ -111,11 +112,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
+CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
  
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
@@ -131,6 +134,7 @@ Section "Uninstall"
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
 Delete "$DESKTOP\DVD-o-matic.lnk"
+Delete "$DESKTOP\DVD-o-matic bach converter.lnk"
 Delete "$DESKTOP\DVD-o-matic encode server.lnk"
 Delete "$SMPROGRAMS\DVD-o-matic\*.*"
 RmDir  "$SMPROGRAMS\DVD-o-matic"
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 233d7f65e..f499c46c2 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -93,6 +93,7 @@ File "%deps%/bin/libbz2.dll"
 File "%binaries%/src/wx/dvdomatic-wx.dll"
 File "%binaries%/src/lib/dvdomatic.dll"
 File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/tools/dvdomatic_batch.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
@@ -121,11 +122,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
+CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
  
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
@@ -141,6 +144,7 @@ Section "Uninstall"
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
 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"
diff --git a/wscript b/wscript
index 097474563..331ebce8e 100644
--- a/wscript
+++ b/wscript
@@ -228,6 +228,11 @@ def build(bld):
     obj.target = 'dvdomatic.desktop'
     obj.dict = d
 
+    obj = bld(features = 'subst')
+    obj.source = 'dvdomatic_batch.desktop.in'
+    obj.target = 'dvdomatic_batch.desktop'
+    obj.dict = d
+
     bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop')
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
         bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)