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

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

Revision: 2811
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2811&view=rev
Author:   chef_koch
Date:     2009-04-18 10:26:44 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
fixed some issues installing the service itself

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/setup/pages/ServerServiceMode.nsh
    trunk/plugins/IR Server Suite/setup/setup.nsi

Modified: trunk/plugins/IR Server Suite/setup/pages/ServerServiceMode.nsh
===================================================================
--- trunk/plugins/IR Server Suite/setup/pages/ServerServiceMode.nsh	2009-04-18 07:29:45 UTC (rev 2810)
+++ trunk/plugins/IR Server Suite/setup/pages/ServerServiceMode.nsh	2009-04-18 10:26:44 UTC (rev 2811)
@@ -45,7 +45,7 @@
 Function PageServerServiceMode
 
   ; if input service is unselected, skip page
-  ${IfNot} ${SectionIsSelected} ${SectionInputService}
+  ${IfNot} ${SectionIsSelected} SectionInputService
     Abort
   ${EndIf}
 

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2009-04-18 07:29:45 UTC (rev 2810)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2009-04-18 10:26:44 UTC (rev 2811)
@@ -78,9 +78,13 @@
 
 !include "include\*"
 
-; FileFunc macros
-!insertmacro GetParent
 
+!include pages\AddRemovePage.nsh
+!insertmacro AddRemovePage "${REG_UNINSTALL}"
+
+!include pages\ServerServiceMode.nsh
+
+
 ;======================================
 
 Name "${PRODUCT_NAME}"
@@ -160,7 +164,7 @@
 !insertmacro MUI_PAGE_DIRECTORY
 
 !insertmacro MUI_PAGE_INSTFILES
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW FinishShow
+;!define MUI_PAGE_CUSTOMFUNCTION_SHOW FinishShow
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_WELCOME
@@ -386,6 +390,17 @@
   ; Create start menu shortcut
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
 
+  ; Install Server/Service
+  ; $ServerServiceMode 0 = InputService
+  ; $ServerServiceMode 1 = IRServer
+  ${If} $ServerServiceMode == 1
+    ${LOG_TEXT} "INFO" "Adding IRServer to Autostart..."
+    !insertmacro SetAutoRun "IR Server" "$DIR_INSTALL\Input Service\IRServer.exe"
+  ${Else}
+    ${LOG_TEXT} "INFO" "Installing InputService..."
+    ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
+  ${EndIf}
+
 ${MementoSectionEnd}
 !macro Remove_${SectionInputService}
   ${LOG_TEXT} "INFO" "Removing Input Service..."
@@ -1030,20 +1045,7 @@
 
 ;======================================
 ;======================================
-;=======   Additional Pages   =========
-;======================================
-;======================================
 
-
-!include pages\AddRemovePage.nsh
-!insertmacro AddRemovePage "${REG_UNINSTALL}"
-
-!include pages\ServerServiceMode.nsh
-
-
-;======================================
-;======================================
-
 Function .onInit
   ${LOG_OPEN}
 
@@ -1069,19 +1071,8 @@
 
 Function .onInstSuccess
 
-${IfNot} ${SectionIsSelected} ${SectionInputService}
+${If} ${SectionIsSelected} ${SectionInputService}
 
-  ; Install Server/Service
-  ; $ServerServiceMode 0 = InputService
-  ; $ServerServiceMode 1 = IRServer
-  ${If} $ServerServiceMode == 1
-    ${LOG_TEXT} "INFO" "Adding IRServer to Autostart..."
-    !insertmacro SetAutoRun "IR Server" "$DIR_INSTALL\Input Service\IRServer.exe"
-  ${Else}
-    ${LOG_TEXT} "INFO" "Installing InputService..."
-    ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
-  ${EndIf}
-
   ; start Server/Service
   ; $ServerServiceMode 0 = InputService
   ; $ServerServiceMode 1 = IRServer
@@ -1207,7 +1198,7 @@
 FunctionEnd
 
 ;======================================
-
+/*
 Function FinishShow
   ; This function is called, after the Finish Page creation is finished
 
@@ -1217,6 +1208,7 @@
       ShowWindow  $mui.FinishPage.Run ${SW_HIDE}
   ${EndIf}
 FunctionEnd
+*/
 
 ;======================================
 ;======================================


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