[Mp-plugins-svn] SF.net SVN: mp-plugins:[2905] trunk/plugins/IR Server Suite/setup

[<che...@us...>]

Revision: 2905
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2905&view=rev
Author:   chef_koch
Date:     2009-06-08 18:19:27 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
installer checks if Translator and TrayLauncher are in AutoRun, If so those will be readded during installation

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/setup/include/IrssSystemRegistry.nsh
    trunk/plugins/IR Server Suite/setup/setup.nsi

Modified: trunk/plugins/IR Server Suite/setup/include/IrssSystemRegistry.nsh
===================================================================
--- trunk/plugins/IR Server Suite/setup/include/IrssSystemRegistry.nsh	2009-06-07 23:01:08 UTC (rev 2904)
+++ trunk/plugins/IR Server Suite/setup/include/IrssSystemRegistry.nsh	2009-06-08 18:19:27 UTC (rev 2905)
@@ -37,4 +37,16 @@
   WriteRegStr ${AutoRunPath} '${name}' ''
 !macroend
 
+!macro GetAutoRun name variable
+  ReadRegStr ${variable} ${AutoRunPath} '${name}'
+!macroend
+
+!macro _IsAutoRun _a _b _t _f
+  !insertmacro _LOGICLIB_TEMP
+
+  !insertmacro GetAutoRun `${_b}` $_LOGICLIB_TEMP
+  IfFileExists $_LOGICLIB_TEMP `${_t}` `${_f}`
+!macroend
+!define IsAutoRun `"" IsAutoRun`
+
 !endif # !IrssSystemRegistry_INCLUDED

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2009-06-07 23:01:08 UTC (rev 2904)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2009-06-08 18:19:27 UTC (rev 2905)
@@ -81,6 +81,9 @@
 Var PREVIOUS_VERSION_STATE
 Var EXPRESS_UPDATE
 
+Var AutoRunTranslator
+Var AutoRunTrayLauncher
+
 Var frominstall
 
 
@@ -836,6 +839,11 @@
   ; create start menu shortcuts
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
 
+
+  ; check if Translator is an autorun app
+  ${If} $AutoRunTranslator == 1
+    !insertmacro SetAutoRun "Translator" "$DIR_INSTALL\Translator\Translator.exe"
+  ${EndIf}
 ${MementoSectionEnd}
 !macro Remove_${SectionTranslator}
   ${LOG_TEXT} "INFO" "Removing Translator..."
@@ -864,6 +872,11 @@
   ; create start menu shortcuts
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
 
+
+  ; check if TrayLauncher is an autorun app
+  ${If} $AutoRunTrayLauncher == 1
+    !insertmacro SetAutoRun "Tray Launcher" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe"
+  ${EndIf}
 ${MementoSectionEnd}
 !macro Remove_${SectionTrayLauncher}
   ${LOG_TEXT} "INFO" "Removing Tray Launcher..."
@@ -1147,6 +1160,21 @@
   
   ; read previous settings
   ReadRegStr $PREVIOUS_ServerServiceMode HKLM "${REG_UNINSTALL}" "ServerServiceMode"
+
+
+  ; check if Translator is an autorun app
+  ${If} ${IsAutoRun} "Translator"
+    StrCpy $AutoRunTranslator 1
+  ${Else}
+    StrCpy $AutoRunTranslator 0
+  ${EndIf}
+
+  ; check if TrayLauncher is an autorun app
+  ${If} ${IsAutoRun} "Tray Launcher"
+    StrCpy $AutoRunTrayLauncher 1
+  ${Else}
+    StrCpy $AutoRunTrayLauncher 0
+  ${EndIf}
 FunctionEnd
 
 Function LoadPreviousSettings


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.